r49233 - in /packages/unstable/libgdata/debian: changelog control control.in rules

biebl at users.alioth.debian.org biebl at users.alioth.debian.org
Fri Jul 1 13:32:21 UTC 2016


Author: biebl
Date: Fri Jul  1 13:32:21 2016
New Revision: 49233

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=49233
Log:
Convert from cdbs to dh.

Modified:
    packages/unstable/libgdata/debian/changelog
    packages/unstable/libgdata/debian/control
    packages/unstable/libgdata/debian/control.in
    packages/unstable/libgdata/debian/rules

Modified: packages/unstable/libgdata/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libgdata/debian/changelog?rev=49233&op=diff
==============================================================================
--- packages/unstable/libgdata/debian/changelog	[utf-8] (original)
+++ packages/unstable/libgdata/debian/changelog	[utf-8] Fri Jul  1 13:32:21 2016
@@ -1,6 +1,7 @@
 libgdata (0.17.5-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Convert from cdbs to dh.
 
  -- Michael Biebl <biebl at debian.org>  Fri, 01 Jul 2016 14:35:30 +0200
 

Modified: packages/unstable/libgdata/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libgdata/debian/control?rev=49233&op=diff
==============================================================================
--- packages/unstable/libgdata/debian/control	[utf-8] (original)
+++ packages/unstable/libgdata/debian/control	[utf-8] Fri Jul  1 13:32:21 2016
@@ -6,9 +6,8 @@
 Section: libs
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Andreas Henriksson <andreas at fatal.se>, Emilio Pozuelo Monfort <pochu at debian.org>, Iain Lane <laney at debian.org>, Michael Biebl <biebl at debian.org>
-Build-Depends: cdbs (>= 0.4.93),
-               debhelper (>= 9),
+Uploaders: Andreas Henriksson <andreas at fatal.se>, Iain Lane <laney at debian.org>, Michael Biebl <biebl at debian.org>
+Build-Depends: debhelper (>= 9),
                dh-autoreconf,
                gnome-common (>= 3.6.0),
                gnome-pkg-tools (>= 0.11),

Modified: packages/unstable/libgdata/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libgdata/debian/control.in?rev=49233&op=diff
==============================================================================
--- packages/unstable/libgdata/debian/control.in	[utf-8] (original)
+++ packages/unstable/libgdata/debian/control.in	[utf-8] Fri Jul  1 13:32:21 2016
@@ -3,8 +3,7 @@
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Uploaders: @GNOME_TEAM@
-Build-Depends: cdbs (>= 0.4.93),
-               debhelper (>= 9),
+Build-Depends: debhelper (>= 9),
                dh-autoreconf,
                gnome-common (>= 3.6.0),
                gnome-pkg-tools (>= 0.11),

Modified: packages/unstable/libgdata/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libgdata/debian/rules?rev=49233&op=diff
==============================================================================
--- packages/unstable/libgdata/debian/rules	[utf-8] (original)
+++ packages/unstable/libgdata/debian/rules	[utf-8] Fri Jul  1 13:32:21 2016
@@ -1,22 +1,25 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/autoreconf.mk
-include /usr/share/cdbs/1/class/autotools.mk
-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
 
-DEB_MAKE_CHECK_TARGET = check || echo "=== test-suite.log ===" && cat gdata/tests/test-suite.log && echo "======================" || true
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
 
-DEB_DH_AUTORECONF_ARGS = --as-needed
+%:
+	dh $@ --with autoreconf,gir,gnome
 
-DEB_CONFIGURE_EXTRA_FLAGS += --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
+override_dh_autoreconf:
+	dh_autoreconf --as-needed
 
-LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
+override_dh_install:
+	dh_install --list-missing
 
-libgdata := $(shell sed -nr 's/^Package:[[:space:]]*(libgdata[0-9]+)[[:space:]]*$$/\1/p' debian/control)
-DEB_DH_MAKESHLIBS_ARGS_$(libgdata) = -- -c4
+override_dh_makeshlibs:
+	dh_makeshlibs -- -c4
 
-common-binary-post-install-arch:: list-missing
+override_dh_auto_test:
+ifeq (, $(filter nocheck, $(DEB_BUILD_OPTIONS)))
+	$(MAKE) check || ( \
+		echo "=== test-suite.log ===" && \
+		cat gdata/tests/test-suite.log && \
+		echo "======================" || true )
+endif




More information about the pkg-gnome-commits mailing list