r48971 - in /desktop/unstable/gnome-keyring/debian: changelog control control.in docs rules

[biebl at users.alioth.debian.org]

Author: biebl
Date: Wed Jun  1 13:07:23 2016
New Revision: 48971

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

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

Modified: desktop/unstable/gnome-keyring/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/changelog?rev=48971&op=diff
==============================================================================
--- desktop/unstable/gnome-keyring/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gnome-keyring/debian/changelog	[utf-8] Wed Jun  1 13:07:23 2016
@@ -7,6 +7,7 @@
     Build-Depends on xsltproc and docbook-xsl.
   * Set pkg-gnome-maintainers at lists.alioth.debian.org as Maintainer.
   * Install gnome-keyring-3.1 man page and fix the .so link.
+  * Convert from cdbs to dh.
 
  -- Michael Biebl <biebl at debian.org>  Wed, 01 Jun 2016 10:25:44 +0200
 

Modified: desktop/unstable/gnome-keyring/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/control?rev=48971&op=diff
==============================================================================
--- desktop/unstable/gnome-keyring/debian/control	[utf-8] (original)
+++ desktop/unstable/gnome-keyring/debian/control	[utf-8] Wed Jun  1 13:07:23 2016
@@ -8,7 +8,6 @@
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Uploaders: Dmitry Shachnev <mitya57 at debian.org>, Michael Biebl <biebl at debian.org>
 Build-Depends: debhelper (>= 9),
-               cdbs,
                ca-certificates,
                dbus,
                dh-autoreconf,

Modified: desktop/unstable/gnome-keyring/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/control.in?rev=48971&op=diff
==============================================================================
--- desktop/unstable/gnome-keyring/debian/control.in	[utf-8] (original)
+++ desktop/unstable/gnome-keyring/debian/control.in	[utf-8] Wed Jun  1 13:07:23 2016
@@ -4,7 +4,6 @@
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Uploaders: @GNOME_TEAM@
 Build-Depends: debhelper (>= 9),
-               cdbs,
                ca-certificates,
                dbus,
                dh-autoreconf,

Added: desktop/unstable/gnome-keyring/debian/docs
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/docs?rev=48971&op=file
==============================================================================
--- desktop/unstable/gnome-keyring/debian/docs	(added)
+++ desktop/unstable/gnome-keyring/debian/docs	[utf-8] Wed Jun  1 13:07:23 2016
@@ -0,0 +1,3 @@
+AUTHORS
+NEWS
+README

Modified: desktop/unstable/gnome-keyring/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/rules?rev=48971&op=diff
==============================================================================
--- desktop/unstable/gnome-keyring/debian/rules	[utf-8] (original)
+++ desktop/unstable/gnome-keyring/debian/rules	[utf-8] Wed Jun  1 13:07:23 2016
@@ -1,28 +1,29 @@
 #!/usr/bin/make -f
 
-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
 
 export DEB_LDFLAGS_MAINT_APPEND := -Wl,-O1 -Wl,-z,defs -Wl,--as-needed
-include /usr/share/dpkg/buildflags.mk
+
+%:
+	dh $@ --with autoreconf,gnome
+
+override_dh_auto_configure:
+	dh_auto_configure -- \
+		--with-pam-dir=/lib/security \
+		--libdir=/usr/lib \
+		--enable-docs
+
+override_dh_install:
+	dh_install --list-missing
 
 TESTHOMEDIR = $(CURDIR)/debian/testhome
 
-debian/stamp-makefile-check:
+override_dh_auto_test:
+ifeq (, $(filter nocheck, $(DEB_BUILD_OPTIONS)))
 	mkdir -p $(TESTHOMEDIR)
-	-HOME=$(TESTHOMEDIR) dbus-run-session -- $(MAKE) check -j1
-	touch $@
+	env -u LD_PRELOAD HOME=$(TESTHOMEDIR) dbus-run-session -- $(MAKE) check
+endif
 
-clean::
+override_dh_clean:
 	rm -rf $(TESTHOMEDIR)
-
-DEB_CONFIGURE_EXTRA_FLAGS += --with-pam-dir=/lib/security \
-                             --enable-doc
-
-DEB_DH_MAKESHLIBS_ARGS_gnome-keyring := --no-act
-
-common-binary-post-install-arch:: list-missing
+	dh_clean