r51116 - in /desktop/unstable/pango1.0/debian: changelog control control.in rules

[biebl at users.alioth.debian.org]

Author: biebl
Date: Thu Sep 22 17:17:18 2016
New Revision: 51116

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

Modified:
    desktop/unstable/pango1.0/debian/changelog
    desktop/unstable/pango1.0/debian/control
    desktop/unstable/pango1.0/debian/control.in
    desktop/unstable/pango1.0/debian/rules

Modified: desktop/unstable/pango1.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pango1.0/debian/changelog?rev=51116&op=diff
==============================================================================
--- desktop/unstable/pango1.0/debian/changelog	[utf-8] (original)
+++ desktop/unstable/pango1.0/debian/changelog	[utf-8] Thu Sep 22 17:17:18 2016
@@ -6,6 +6,7 @@
   * Drop debian/libpango1.0-common.README.Debian, it's horribly outdated.
   * Drop the multiflavor builds. Those are no longer necessary after the
     modules system has been dropped.
+  * Convert from cdbs to dh.
 
  -- Michael Biebl <biebl at debian.org>  Thu, 22 Sep 2016 17:22:03 +0200
 

Modified: desktop/unstable/pango1.0/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pango1.0/debian/control?rev=51116&op=diff
==============================================================================
--- desktop/unstable/pango1.0/debian/control	[utf-8] (original)
+++ desktop/unstable/pango1.0/debian/control	[utf-8] Thu Sep 22 17:17:18 2016
@@ -8,7 +8,6 @@
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Uploaders: Andreas Henriksson <andreas at fatal.se>, Iain Lane <laney at debian.org>, Michael Biebl <biebl at debian.org>
 Build-Depends: autotools-dev,
-               cdbs (>= 0.4.93),
                debhelper (>= 9.20141010),
                dpkg-dev (>= 1.17.14),
                dh-autoreconf,

Modified: desktop/unstable/pango1.0/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pango1.0/debian/control.in?rev=51116&op=diff
==============================================================================
--- desktop/unstable/pango1.0/debian/control.in	[utf-8] (original)
+++ desktop/unstable/pango1.0/debian/control.in	[utf-8] Thu Sep 22 17:17:18 2016
@@ -4,7 +4,6 @@
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Uploaders: @GNOME_TEAM@
 Build-Depends: autotools-dev,
-               cdbs (>= 0.4.93),
                debhelper (>= 9.20141010),
                dpkg-dev (>= 1.17.14),
                dh-autoreconf,

Modified: desktop/unstable/pango1.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pango1.0/debian/rules?rev=51116&op=diff
==============================================================================
--- desktop/unstable/pango1.0/debian/rules	[utf-8] (original)
+++ desktop/unstable/pango1.0/debian/rules	[utf-8] Thu Sep 22 17:17:18 2016
@@ -1,38 +1,21 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/autoreconf.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
 
 GNOME_MODULE := pango
 
-# Enable parallel build support
-DEB_BUILD_PARALLEL = 1
+# Ensure the build aborts when there are still references to undefined symbols
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,-z,defs -Wl,-O1
 
-# Ensure the build aborts when there are still references to undefined symbols
-LDFLAGS += -Wl,-z,defs
+%:
+	dh $@ --with autoreconf,gnome,gir
 
-# Make the linker work a bit harder so dynamic loading can be done faster
-LDFLAGS += -Wl,-O1
-
-APIVER := 1.0
-
-# package names
-UDEB_PKG := libpango$(APIVER)-udeb
-DEV_PKG := libpango$(APIVER)-dev
-DOC_PKG := libpango$(APIVER)-doc
-
-DEB_CONFIGURE_EXTRA_FLAGS = \
-		--with-html-dir=\$${prefix}/share/doc/$(DOC_PKG) \
-		--libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \
+override_dh_auto_configure:
+	dh_auto_configure -- \
+		--libexecdir=\$${prefix}/lib/pango1.0 \
+		--with-html-dir=\$${prefix}/share/doc/libpango1.0-doc \
 		--enable-installed-tests \
 		--enable-static
 
-# Get failing tests' stdout/err so we have some information when a build fails
-export VERBOSE=1
-
-DEB_MAKE_CHECK_TARGET = check
-DEB_DH_MAKESHLIBS_ARGS_ALL += -V --add-udeb=$(UDEB_PKG) -- -c4
+override_dh_makeshlibs:
+	dh_makeshlibs -V --add-udeb=libpango1.0-udeb -- -c4