r49814 - in /desktop/experimental/gvfs/debian: changelog control control.in docs rules

[ah at users.alioth.debian.org]

Author: ah
Date: Tue Aug 30 17:36:37 2016
New Revision: 49814

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=49814
Log:
* New upstream beta release.
* Convert from cdbs -> dh
* Explicitly disable admin backend on non-linux as apparently configure
  checks aren't detailed enough to auto-disable it.
* Skip running testsuite (as enabled by dh conversion)
  - it's better to run those tests with machine isolation as already
    done by the autopkgtests.
* Add debian/docs shipping AUTHORS NEWS

Added:
    desktop/experimental/gvfs/debian/docs
Modified:
    desktop/experimental/gvfs/debian/changelog
    desktop/experimental/gvfs/debian/control
    desktop/experimental/gvfs/debian/control.in
    desktop/experimental/gvfs/debian/rules

Modified: desktop/experimental/gvfs/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/changelog?rev=49814&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/changelog	[utf-8] (original)
+++ desktop/experimental/gvfs/debian/changelog	[utf-8] Tue Aug 30 17:36:37 2016
@@ -1,3 +1,16 @@
+gvfs (1.29.91-1) unstable; urgency=low
+
+  * New upstream beta release.
+  * Convert from cdbs -> dh
+  * Explicitly disable admin backend on non-linux as apparently configure
+    checks aren't detailed enough to auto-disable it.
+  * Skip running testsuite (as enabled by dh conversion)
+    - it's better to run those tests with machine isolation as already
+      done by the autopkgtests.
+  * Add debian/docs shipping AUTHORS NEWS
+
+ -- Andreas Henriksson <andreas at fatal.se>  Tue, 30 Aug 2016 18:26:00 +0200
+
 gvfs (1.29.90-1) experimental; urgency=medium
 
   * New upstream beta release.

Modified: desktop/experimental/gvfs/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/control?rev=49814&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/control	[utf-8] (original)
+++ desktop/experimental/gvfs/debian/control	[utf-8] Tue Aug 30 17:36:37 2016
@@ -10,7 +10,6 @@
 Build-Depends: debhelper (>= 9.20160114),
                dh-exec (>= 0.13),
                autotools-dev,
-               cdbs (>= 0.4.93),
                dh-autoreconf,
                gnome-pkg-tools (>= 0.7),
                pkg-config,

Modified: desktop/experimental/gvfs/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/control.in?rev=49814&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/control.in	[utf-8] (original)
+++ desktop/experimental/gvfs/debian/control.in	[utf-8] Tue Aug 30 17:36:37 2016
@@ -6,7 +6,6 @@
 Build-Depends: debhelper (>= 9.20160114),
                dh-exec (>= 0.13),
                autotools-dev,
-               cdbs (>= 0.4.93),
                dh-autoreconf,
                gnome-pkg-tools (>= 0.7),
                pkg-config,

Added: desktop/experimental/gvfs/debian/docs
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/docs?rev=49814&op=file
==============================================================================
--- desktop/experimental/gvfs/debian/docs	(added)
+++ desktop/experimental/gvfs/debian/docs	[utf-8] Tue Aug 30 17:36:37 2016
@@ -0,0 +1,2 @@
+AUTHORS
+NEWS

Modified: desktop/experimental/gvfs/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/rules?rev=49814&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/rules	[utf-8] (original)
+++ desktop/experimental/gvfs/debian/rules	[utf-8] Tue Aug 30 17:36:37 2016
@@ -1,24 +1,34 @@
 #!/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-version.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
 
-# List any files which are not installed
-include /usr/share/cdbs/1/rules/utils.mk
-DEB_DH_INSTALL_ARGS := --fail-missing -X.la -X.h
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+ifneq (,$(filter $(DEB_HOST_ARCH), hurd-i386 kfreebsd-i386 kfreebsd-amd64))
+	ADMIN_BACKEND=--disable-admin
+else
+	ADMIN_BACKEND=
+endif
 
-DEB_DH_STRIP_ARGS := --dbgsym-migration='gvfs-dbg (<< 1.28.0-1~)'
-DEB_DH_MAKESHLIBS_ARGS_ALL := --no-act
+%:
+	dh $@ --with autoreconf,gnome
 
-DEB_CONFIGURE_EXTRA_FLAGS += \
-	--libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \
-	--libexecdir=/usr/lib/gvfs \
-	--disable-hal
+override_dh_auto_configure:
+	dh_auto_configure -- \
+		--libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \
+		--libexecdir=/usr/lib/gvfs \
+		--disable-hal \
+		$(ADMIN_BACKEND)
 
+override_dh_strip:
+	dh_strip --dbgsym-migration='gvfs-dbg (<< 1.28.0-1~)'
+
+override_dh_install:
+	dh_install --fail-missing -X.la -X.h
+
+override_dh_makeshlibs:
+	dh_makeshlibs --no-act
+
+override_dh_auto_test:
+	echo "Skipping testsuite as it's better run as an autopkgtest with machine isolation"