r50015 - in /desktop/unstable/gnome-user-share/debian: changelog control control.in docs rules

[biebl at users.alioth.debian.org]

Author: biebl
Date: Fri Sep  2 15:43:03 2016
New Revision: 50015

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

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

Modified: desktop/unstable/gnome-user-share/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-user-share/debian/changelog?rev=50015&op=diff
==============================================================================
--- desktop/unstable/gnome-user-share/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gnome-user-share/debian/changelog	[utf-8] Fri Sep  2 15:43:03 2016
@@ -7,6 +7,7 @@
     architectures.
   * Bump Standards-Version to 3.9.8.
   * Drop debian/dirs, no longer needed.
+  * Convert from cdbs to dh.
 
  -- Michael Biebl <biebl at debian.org>  Fri, 02 Sep 2016 16:18:34 +0200
 

Modified: desktop/unstable/gnome-user-share/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-user-share/debian/control?rev=50015&op=diff
==============================================================================
--- desktop/unstable/gnome-user-share/debian/control	[utf-8] (original)
+++ desktop/unstable/gnome-user-share/debian/control	[utf-8] Fri Sep  2 15:43:03 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 (>= 8),
+Build-Depends: debhelper (>= 8),
                dh-autoreconf,
                gnome-pkg-tools,
                gnome-common,

Modified: desktop/unstable/gnome-user-share/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-user-share/debian/control.in?rev=50015&op=diff
==============================================================================
--- desktop/unstable/gnome-user-share/debian/control.in	[utf-8] (original)
+++ desktop/unstable/gnome-user-share/debian/control.in	[utf-8] Fri Sep  2 15:43:03 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 (>= 8),
+Build-Depends: debhelper (>= 8),
                dh-autoreconf,
                gnome-pkg-tools,
                gnome-common,

Added: desktop/unstable/gnome-user-share/debian/docs
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-user-share/debian/docs?rev=50015&op=file
==============================================================================
--- desktop/unstable/gnome-user-share/debian/docs	(added)
+++ desktop/unstable/gnome-user-share/debian/docs	[utf-8] Fri Sep  2 15:43:03 2016
@@ -0,0 +1,2 @@
+NEWS
+README

Modified: desktop/unstable/gnome-user-share/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-user-share/debian/rules?rev=50015&op=diff
==============================================================================
--- desktop/unstable/gnome-user-share/debian/rules	[utf-8] (original)
+++ desktop/unstable/gnome-user-share/debian/rules	[utf-8] Fri Sep  2 15:43:03 2016
@@ -1,21 +1,29 @@
 #!/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/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
 
-LDFLAGS+=-Wl,-z,defs -Wl,-O1 -Wl,--as-needed
-DEB_DH_MAKESHLIBS_ARGS += --exclude=libnautilus-share-extension.so
-DEB_CONFIGURE_EXTRA_FLAGS += \
-	--with-httpd=/usr/lib/apache2/mpm-worker/apache2 \
-	--with-modules-path=/usr/lib/apache2/modules/
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
+
+%:
+	dh $@ --with autoreconf,gnome
+
+override_dh_autoreconf:
+	dh_autoreconf --as-needed
 
 ifneq ($(DEB_HOST_ARCH_OS),linux)
-DEB_CONFIGURE_EXTRA_FLAGS += --disable-bluetooth
+CONFFLAGS = --disable-bluetooth
 endif
 
-install/gnome-user-share::
+override_dh_auto_configure:
+	dh_auto_configure -- \
+		--with-httpd=/usr/lib/apache2/mpm-worker/apache2 \
+		--with-modules-path=/usr/lib/apache2/modules/ \
+		$(CONFFLAGS)
+
+override_dh_install:
+	dh_install
 	rm -f debian/gnome-user-share/usr/share/gnome-user-share/dav_user_2.0.conf
 	find debian/gnome-user-share -name "*.la" -delete
+
+override_dh_makeshlibs:
+	dh_makeshlibs --exclude=libnautilus-share-extension.so