r49950 - in /desktop/unstable/libsoup2.4/debian: changelog control control.in docs libsoup2.4-1.docs rules

[biebl at users.alioth.debian.org]

Author: biebl
Date: Thu Sep  1 12:16:39 2016
New Revision: 49950

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

Added:
    desktop/unstable/libsoup2.4/debian/libsoup2.4-1.docs
      - copied unchanged from r49949, desktop/unstable/libsoup2.4/debian/docs
Removed:
    desktop/unstable/libsoup2.4/debian/docs
Modified:
    desktop/unstable/libsoup2.4/debian/changelog
    desktop/unstable/libsoup2.4/debian/control
    desktop/unstable/libsoup2.4/debian/control.in
    desktop/unstable/libsoup2.4/debian/rules

Modified: desktop/unstable/libsoup2.4/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libsoup2.4/debian/changelog?rev=49950&op=diff
==============================================================================
--- desktop/unstable/libsoup2.4/debian/changelog	[utf-8] (original)
+++ desktop/unstable/libsoup2.4/debian/changelog	[utf-8] Thu Sep  1 12:16:39 2016
@@ -1,6 +1,7 @@
 libsoup2.4 (2.55.90-1) UNRELEASED; urgency=medium
 
   * New upstream beta release.
+  * Convert from cdbs to dh.
 
  -- Michael Biebl <biebl at debian.org>  Thu, 01 Sep 2016 13:45:24 +0200
 

Modified: desktop/unstable/libsoup2.4/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libsoup2.4/debian/control?rev=49950&op=diff
==============================================================================
--- desktop/unstable/libsoup2.4/debian/control	[utf-8] (original)
+++ desktop/unstable/libsoup2.4/debian/control	[utf-8] Thu Sep  1 12:16:39 2016
@@ -9,7 +9,6 @@
 Uploaders: Andreas Henriksson <andreas at fatal.se>, Emilio Pozuelo Monfort <pochu at debian.org>, Iain Lane <laney at debian.org>, Michael Biebl <biebl at debian.org>
 Build-Depends: debhelper (>= 9.20160114),
                dh-autoreconf,
-               cdbs (>= 0.4.93~),
                gnome-pkg-tools,
                intltool (>= 0.35.0),
                libglib2.0-dev (>= 2.39.90),

Modified: desktop/unstable/libsoup2.4/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libsoup2.4/debian/control.in?rev=49950&op=diff
==============================================================================
--- desktop/unstable/libsoup2.4/debian/control.in	[utf-8] (original)
+++ desktop/unstable/libsoup2.4/debian/control.in	[utf-8] Thu Sep  1 12:16:39 2016
@@ -5,7 +5,6 @@
 Uploaders: @GNOME_TEAM@
 Build-Depends: debhelper (>= 9.20160114),
                dh-autoreconf,
-               cdbs (>= 0.4.93~),
                gnome-pkg-tools,
                intltool (>= 0.35.0),
                libglib2.0-dev (>= 2.39.90),

Modified: desktop/unstable/libsoup2.4/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libsoup2.4/debian/rules?rev=49950&op=diff
==============================================================================
--- desktop/unstable/libsoup2.4/debian/rules	[utf-8] (original)
+++ desktop/unstable/libsoup2.4/debian/rules	[utf-8] Thu Sep  1 12:16:39 2016
@@ -1,32 +1,30 @@
 #!/usr/bin/make -f
 
-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/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
-
-DEB_DH_AUTORECONF_ARGS := --as-needed
 
 GNOME_MODULE := libsoup
 
-DEB_DH_MAKESHLIBS_ARGS_ALL += -V -- -c4
+%:
+	dh $@ --with autoreconf,gir,gnome
 
-DEB_DH_STRIP_ARGS = --dbgsym-migration='libsoup2.4-dbg (<< 2.54.0.1-1~)'
+override_dh_autoreconf:
+	dh_autoreconf --as-needed
 
-DEB_CONFIGURE_EXTRA_FLAGS += --enable-gtk-doc \
-        --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
+override_dh_auto_configure:
+	dh_auto_configure -- \
+		--enable-gtk-doc
 
-ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
+override_dh_strip:
+	dh_strip --dbgsym-migration='libsoup2.4-dbg (<< 2.54.0.1-1~)'
+
+override_dh_makeshlibs:
+	dh_makeshlibs -V -- -c4
+
 CHECK_HOME = $(CURDIR)/debian/tmp/home
-common-build-arch common-build-indep:: debian/stamp-makefile-check
-debian/stamp-makefile-check: debian/stamp-makefile-build
+
+override_dh_auto_test:
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	mkdir -p $(CHECK_HOME)
 	env HOME=$(CHECK_HOME) XDG_RUNTIME_DIR=$(CHECK_HOME) dbus-run-session -- $(MAKE) check VERBOSE=1
-	touch $@
-
-makefile-clean::
-	rm -f debian/stamp-makefile-check
 endif