r49532 - in /desktop/experimental/gnome-desktop3/debian: changelog control.in rules

[ah at users.alioth.debian.org]

Author: ah
Date: Tue Aug 16 12:11:52 2016
New Revision: 49532

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

Modified:
    desktop/experimental/gnome-desktop3/debian/changelog
    desktop/experimental/gnome-desktop3/debian/control.in
    desktop/experimental/gnome-desktop3/debian/rules

Modified: desktop/experimental/gnome-desktop3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-desktop3/debian/changelog?rev=49532&op=diff
==============================================================================
--- desktop/experimental/gnome-desktop3/debian/changelog	[utf-8] (original)
+++ desktop/experimental/gnome-desktop3/debian/changelog	[utf-8] Tue Aug 16 12:11:52 2016
@@ -8,6 +8,7 @@
   * Drop --with-pnp-ids-path=/usr/share/hwdata/pnp.ids as this configure
     flag is now removed (pnp.ids usage replaced with hwdb).
   * Update debian/libgnome-desktop-3-12.symbols with one addition.
+  * Convert from cdbs to dh
 
  -- Andreas Henriksson <andreas at fatal.se>  Tue, 16 Aug 2016 13:38:19 +0200
 

Modified: desktop/experimental/gnome-desktop3/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-desktop3/debian/control.in?rev=49532&op=diff
==============================================================================
--- desktop/experimental/gnome-desktop3/debian/control.in	[utf-8] (original)
+++ desktop/experimental/gnome-desktop3/debian/control.in	[utf-8] Tue Aug 16 12:11:52 2016
@@ -11,7 +11,6 @@
                libglib2.0-dev (>= 2.44.0),
                intltool (>= 0.40.6),
                iso-codes,
-               cdbs (>= 0.4.93),
                gnome-pkg-tools (>= 0.10),
                gtk-doc-tools (>= 1.4),
                docbook-xml,

Modified: desktop/experimental/gnome-desktop3/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-desktop3/debian/rules?rev=49532&op=diff
==============================================================================
--- desktop/experimental/gnome-desktop3/debian/rules	[utf-8] (original)
+++ desktop/experimental/gnome-desktop3/debian/rules	[utf-8] Tue Aug 16 12:11:52 2016
@@ -2,29 +2,32 @@
 
 GNOME_MODULE=gnome-desktop
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/gnome.mk
-include /usr/share/cdbs/1/rules/utils.mk
-include /usr/share/cdbs/1/rules/autoreconf.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/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
-LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
+# Library package list for override_dh_makeshlibs (assumes only one match)
+LIB_PKG := $(filter-out %-dev %-dbg %-bin,$(filter lib%,$(shell dh_listpackages)))
 
-DEB_DH_AUTORECONF_ARGS = --as-needed
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
 
-LIB_PKG := libgnome-desktop-3-12
+%:
+	dh $@ --with gnome,gir,autoreconf
 
-DEB_CONFIGURE_LIBEXECDIR := \$${prefix}/lib/$(DEB_HOST_MULTIARCH)/$(LIB_PKG)
+override_dh_autoreconf:
+	dh_autoreconf --as-needed
 
-DEB_CONFIGURE_EXTRA_FLAGS += \
-			--libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
+override_dh_auto_configure:
+	dh_auto_configure -- \
+			--libexecdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)/$(LIB_PKG) \
+
 			--with-gnome-distributor=$(shell dpkg-vendor --query vendor) \
 			--disable-date-in-gnome-version \
 			--enable-gtk-doc \
 			--enable-desktop-docs \
 			--enable-introspection
 
-DEB_DH_MAKESHLIBS_ARGS_$(LIB_PKG) += -- -c4
+override_dh_makeshlibs:
+	dh_makeshlibs -N $(LIB_PKG)
+	dh_makeshlibs -p $(LIB_PKG) -- -c4
 
-common-binary-post-install-arch:: list-missing
+override_dh_install:
+	dh_install --list-missing