Also use dh gir addon to properly generate dependencies.

* Convert from cdbs to dh
* Add debian/docs to install AUTHORS NEWS README
2016-08-31 11:41:54 +00:00 · 2016-08-31 08:20:48 +00:00 · 2016-08-30 18:47:50 +00:00 · 2016-05-26 21:42:36 +00:00 · 2016-05-25 03:17:35 +00:00 · 2016-05-23 00:25:09 +00:00
7 changed files with 50 additions and 24 deletions
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,26 @@
+libgtop2 (2.34.1-2) unstable; urgency=medium
+
+  * Also use dh gir addon to properly generate dependencies.
+
+ -- Andreas Henriksson <andreas@fatal.se>  Wed, 31 Aug 2016 13:41:37 +0200
+
+libgtop2 (2.34.1-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Update build-dependencies according to configure.ac changes:
+    - drop intltool
+  * Convert from cdbs to dh
+  * Add debian/docs to install AUTHORS NEWS README
+
+ -- Andreas Henriksson <andreas@fatal.se>  Wed, 31 Aug 2016 10:20:31 +0200
+
+libgtop2 (2.34.0-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Bump Standards-Version to 3.9.8.
+
+ -- Michael Biebl <biebl@debian.org>  Fri, 15 Apr 2016 00:51:56 +0200
+
 libgtop2 (2.32.0-1) unstable; urgency=medium

  * New upstream release.
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Source: libgtop2
 Section: libs
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
-Uploaders: Martin Pitt <mpitt@debian.org>, Michael Biebl <biebl@debian.org>
+Uploaders: Andreas Henriksson <andreas@fatal.se>, Michael Biebl <biebl@debian.org>
 Build-Depends: debhelper (>= 9),
               gettext,
               pkg-config,
@@ -14,9 +14,7 @@ Build-Depends: debhelper (>= 9),
               libglib2.0-dev (>= 2.6.0),
               gnome-pkg-tools (>= 0.10),
               dh-autoreconf,
-               cdbs (>= 0.4.93),
               texinfo,
-               intltool (>= 0.35.0),
               libxt-dev,
               libgeom-dev [kfreebsd-any],
               libdevstat-dev [kfreebsd-any],
@@ -25,9 +23,9 @@ Build-Depends: debhelper (>= 9),
               gtk-doc-tools (>= 1.4),
               gobject-introspection (>= 0.6.7),
               libgirepository1.0-dev (>= 0.10.7-1~)
-Standards-Version: 3.9.6
+Standards-Version: 3.9.8
 Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/libgtop2
-Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/libgtop2
+Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/libgtop2

 Package: libgtop-2.0-10
 Architecture: any
--- a/debian/control.in
+++ b/debian/control.in
@@ -10,9 +10,7 @@ Build-Depends: debhelper (>= 9),
               libglib2.0-dev (>= 2.6.0),
               gnome-pkg-tools (>= 0.10),
               dh-autoreconf,
-               cdbs (>= 0.4.93),
               texinfo,
-               intltool (>= 0.35.0),
               libxt-dev,
               libgeom-dev [kfreebsd-any],
               libdevstat-dev [kfreebsd-any],
@@ -21,9 +19,9 @@ Build-Depends: debhelper (>= 9),
               gtk-doc-tools (>= 1.4),
               gobject-introspection (>= 0.6.7),
               libgirepository1.0-dev (>= 0.10.7-1~)
-Standards-Version: 3.9.6
+Standards-Version: 3.9.8
 Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/libgtop2
-Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/libgtop2
+Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/libgtop2

 Package: libgtop-2.0-10
 Architecture: any
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,7 +3,7 @@ then Martin Schulze <joey@debian.org> in October 1998
 then Ian Lynagh <igloo@debian.org> in November 1998
 then Noel Koethe <noel@debian.org> in December 2001

-It was downloaded from http://ftp.gnome.org/pub/GNOME/sources/libgtop/
+It was downloaded from https://download.gnome.org/sources/libgtop/

 Upstream Authors:
        Martin Baulig (martin@home-of-linux.org)
--- a/debian/docs
+++ b/debian/docs
@@ -0,0 +1,3 @@
+AUTHORS
+NEWS
+README
--- a/debian/rules
+++ b/debian/rules
@@ -1,11 +1,6 @@
 #!/usr/bin/make -f

-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/utils.mk
-include /usr/share/cdbs/1/class/gnome.mk
-include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
-include /usr/share/cdbs/1/rules/autoreconf.mk

 GNOME_MODULE := libgtop

@@ -17,19 +12,28 @@ ifeq ($(DEB_HOST_ARCH_OS),kfreebsd)
 CPPFLAGS += $(shell pkg-config --cflags libbsd-overlay)
 endif

-DEB_DH_AUTORECONF_ARGS = --as-needed
+%:
+	dh $@ --with gnome,gir,autoreconf

-DEB_DH_MAKESHLIBS_ARGS_ALL += -V '$(SHARED_PKG) (>= 2.32.0)'
+override_dh_autoreconf:
+	dh_autoreconf --as-needed

-DEB_CONFIGURE_EXTRA_FLAGS += --libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \
-                             --libexecdir=\$${libdir}/$(SHARED_PKG)
+override_dh_auto_configure:
+	dh_auto_configure -- \
+		--libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \
+		--libexecdir=\$${libdir}/$(SHARED_PKG)

-DEB_FIXPERMS_EXCLUDE += libgtop_server2
+override_dh_makeshlibs:
+	dh_makeshlibs -V '$(SHARED_PKG) (>= 2.32.0)'

+override_dh_fixperms:
+	dh_fixperms -X libgtop_server2
+
+override_dh_install:
 ifeq ($(DEB_HOST_ARCH_OS),kfreebsd)
-install/$(SHARED_PKG)::
 	# The server is only necessary on kFreeBSD
 	dh_install --autodest -p$(SHARED_PKG) \
 		--ignore=debian/$(SHARED_PKG).install \
 		debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/$(SHARED_PKG)/libgtop_server2
 endif
+	dh_install
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
-version=3
-http://ftp.gnome.org/pub/GNOME/sources/libgtop/([\d\.]+[02468])/ \
-	libgtop-(.*)\.tar\.xz
+version=4
+https://download.gnome.org/sources/libgtop/([\d\.]+[02468])/ \
+	libgtop@ANY_VERSION@\.tar\.xz
Author	SHA1	Message	Date
Andreas Henriksson	500c3e4a1b	Also use dh gir addon to properly generate dependencies.	2016-08-31 11:41:54 +00:00
Andreas Henriksson	07ea5230b9	* Convert from cdbs to dh * Add debian/docs to install AUTHORS NEWS README	2016-08-31 08:20:48 +00:00
Andreas Henriksson	2187316edc	* New upstream release. * Update build-dependencies according to configure.ac changes: - drop intltool	2016-08-30 18:47:50 +00:00
Jeremy Bicha	97a6e055ae	restore trailing newlines to d/copyright and /watch	2016-05-26 21:42:36 +00:00
Jeremy Bicha	30c1b788e2	Use https for copyright headers	2016-05-25 03:17:35 +00:00
Jeremy Bicha	369c4532fa	Use https in d/watch and use new "special strings" to help standardize format	2016-05-23 00:25:09 +00:00
Michael Biebl	8927cb519a	Release version 2.34.0-1 to unstable	2016-04-14 22:52:12 +00:00
Michael Biebl	7ea0f6c596	Bump Standards-Version to 3.9.8.	2016-04-14 22:51:54 +00:00
Michael Biebl	f5c2b2fcda	New upstream release.	2016-04-14 22:50:19 +00:00
Michael Biebl	a8b9cb1fd7	Use https:// for Vcs-Browser	2015-10-08 13:38:05 +00:00