r49903 - in /desktop/unstable/gnome-settings-daemon/debian: changelog control control.in gnome-settings-daemon.docs rules

[biebl at users.alioth.debian.org]

Author: biebl
Date: Wed Aug 31 22:52:49 2016
New Revision: 49903

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

Added:
    desktop/unstable/gnome-settings-daemon/debian/gnome-settings-daemon.docs
Modified:
    desktop/unstable/gnome-settings-daemon/debian/changelog
    desktop/unstable/gnome-settings-daemon/debian/control
    desktop/unstable/gnome-settings-daemon/debian/control.in
    desktop/unstable/gnome-settings-daemon/debian/rules

Modified: desktop/unstable/gnome-settings-daemon/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-settings-daemon/debian/changelog?rev=49903&op=diff
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gnome-settings-daemon/debian/changelog	[utf-8] Wed Aug 31 22:52:49 2016
@@ -6,6 +6,7 @@
   * Install man page provided by upstream and remove the outdated one we
     shipped downstream.
   * Drop conffile removal code from pre-wheezy.
+  * Convert from cdbs to dh.
 
  -- Michael Biebl <biebl at debian.org>  Wed, 31 Aug 2016 23:48:57 +0200
 

Modified: desktop/unstable/gnome-settings-daemon/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-settings-daemon/debian/control?rev=49903&op=diff
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/control	[utf-8] (original)
+++ desktop/unstable/gnome-settings-daemon/debian/control	[utf-8] Wed Aug 31 22:52:49 2016
@@ -7,8 +7,7 @@
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Uploaders: Andreas Henriksson <andreas at fatal.se>, Laurent Bigonville <bigon at debian.org>, Michael Biebl <biebl at debian.org>
-Build-Depends: cdbs,
-               debhelper (>= 9),
+Build-Depends: debhelper (>= 9),
                gnome-pkg-tools,
                gtk-doc-tools,
                dh-autoreconf,

Modified: desktop/unstable/gnome-settings-daemon/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-settings-daemon/debian/control.in?rev=49903&op=diff
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/control.in	[utf-8] (original)
+++ desktop/unstable/gnome-settings-daemon/debian/control.in	[utf-8] Wed Aug 31 22:52:49 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,
-               debhelper (>= 9),
+Build-Depends: debhelper (>= 9),
                gnome-pkg-tools,
                gtk-doc-tools,
                dh-autoreconf,

Added: desktop/unstable/gnome-settings-daemon/debian/gnome-settings-daemon.docs
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-settings-daemon/debian/gnome-settings-daemon.docs?rev=49903&op=file
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/gnome-settings-daemon.docs	(added)
+++ desktop/unstable/gnome-settings-daemon/debian/gnome-settings-daemon.docs	[utf-8] Wed Aug 31 22:52:49 2016
@@ -0,0 +1,2 @@
+AUTHORS
+NEWS

Modified: desktop/unstable/gnome-settings-daemon/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-settings-daemon/debian/rules?rev=49903&op=diff
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/rules	[utf-8] (original)
+++ desktop/unstable/gnome-settings-daemon/debian/rules	[utf-8] Wed Aug 31 22:52:49 2016
@@ -1,32 +1,35 @@
 #!/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
 
-DEB_DH_AUTORECONF_ARGS = --as-needed
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,-z,defs -Wl,-O1 -Wl,--warn-unresolved-symbols -Wl,--as-needed
 
-ifneq ($(DEB_HOST_ARCH_CPU),$(filter $(DEB_HOST_ARCH_CPU),ia64 mipsel))
-  LDFLAGS += -Wl,-z,defs
-endif
-LDFLAGS += -Wl,-O1 -Wl,--warn-unresolved-symbols -Wl,--as-needed
+%:
+	dh $@ --with autoreconf,gnome
 
 ifneq ($(DEB_HOST_ARCH_OS),linux)
-  DEB_CONFIGURE_EXTRA_FLAGS += --disable-rfkill --disable-network-manager \
-				--disable-alsa
-else
-install/gnome-settings-daemon::
+CONFFLAGS = \
+	--disable-rfkill \
+	--disable-network-manager \
+	--disable-alsa
+endif
+
+override_dh_auto_configure:
+	dh_auto_configure -- \
+		--libdir=\$${prefix}/lib \
+		--libexecdir=\$${libdir}/gnome-settings-daemon \
+		--disable-static \
+		$(CONFFLAGS)
+
+override_dh_autoreconf:
+	dh_autoreconf --as-needed
+
+override_dh_install:
+ifeq ($(DEB_HOST_ARCH_OS),linux)
 	dh_install -pgnome-settings-daemon --ignore=debian/gnome-settings-daemon.install \
 		debian/tmp/usr/lib/udev/rules.d/ lib/udev
 endif
+	dh_install --list-missing -X.la
 
-DEB_DH_MAKESHLIBS_ARGS_ALL += --no-act
-
-binary-install/gnome-settings-daemon::
-	find debian -name '*.a' -delete
-	find debian -name '*.la' -delete
-
-common-binary-post-install-arch:: list-missing
+# test-suite currently fails, see https://bugzilla.gnome.org/show_bug.cgi?id=770684
+override_dh_auto_test: