[Pkg-telepathy-commits] [empathy] 07/11: Convert to debhelper sequences

[Laurent Bigonville]

This is an automated email from the git hooks/post-receive script.

bigon pushed a commit to branch debian
in repository empathy.

commit 66c88bdab31fb6bba91dc16fbaaa129f3e112303
Author: Laurent Bigonville <bigon at bigon.be>
Date:   Thu Aug 31 14:57:21 2017 +0200

    Convert to debhelper sequences
---
 debian/changelog         |  3 ++-
 debian/control           |  4 +---
 debian/rules             | 52 ++++++++++++++++++++++++++----------------------
 debian/shlibs.local      |  2 --
 debian/update-patches.mk | 11 ----------
 5 files changed, 31 insertions(+), 41 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0f84047..9391492 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,9 @@ empathy (3.25.90-1) UNRELEASED; urgency=medium
     libnm-util-dev/libnm-glib-dev (Closes: #862670)
   * debian/control: Bump Standards-Version to 4.1.0 (no further changes)
   * Bump debhelper compatibility to 10
+  * Convert to debhelper sequences
 
- -- Laurent Bigonville <bigon at debian.org>  Thu, 31 Aug 2017 14:49:47 +0200
+ -- Laurent Bigonville <bigon at debian.org>  Thu, 31 Aug 2017 14:57:09 +0200
 
 empathy (3.12.12-4) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index e0ff52c..97b05a4 100644
--- a/debian/control
+++ b/debian/control
@@ -7,9 +7,7 @@ Uploaders: Sjoerd Simons <sjoerd at debian.org>,
            Riccardo Setti <giskard at debian.org>,
            Laurent Bigonville <bigon at debian.org>,
            Emilio Pozuelo Monfort <pochu at debian.org>
-Build-Depends: cdbs (>= 0.4.90),
-               debhelper (>= 10),
-               dh-autoreconf,
+Build-Depends: debhelper (>= 10),
                libglib2.0-dev (>= 2.48.0),
                libgtk-3-dev (>= 3.9.4),
                libtelepathy-glib-dev (>= 0.23.2),
diff --git a/debian/rules b/debian/rules
index 5d57e04..1e33a44 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,39 +1,43 @@
 #!/usr/bin/make -f
 
-export AUTOPOINT = true
-
-include /usr/share/cdbs/1/rules/autoreconf.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/gnome.mk
-
-DEB_DH_AUTORECONF_ARGS = --as-needed
-
-# List any files which are not installed
-include /usr/share/cdbs/1/rules/utils.mk
-DEB_DH_INSTALL_ARGS := --list-missing
+-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
 # Ensure at build time that the library has no dependencies on undefined
 # symbols, and speed up loading.
-DEB_LDFLAGS_MAINT_APPEND=-Wl,-z,defs -Wl,-O1 -Wl,--as-needed
-include /usr/share/dpkg/default.mk
+export DEB_LDFLAGS_MAINT_APPEND=-Wl,-z,defs -Wl,-O1 -Wl,--as-needed
+
+ifeq ($(DEB_HOST_ARCH_OS),linux)
+  DEB_CONFIGURE_EXTRA_FLAGS += --with-connectivity=nm --enable-gudev=yes
+else
+  DEB_CONFIGURE_EXTRA_FLAGS += --with-connectivity=no --enable-gudev=no
+endif
 
-DEB_CONFIGURE_EXTRA_FLAGS := --enable-spell=yes \
+%:
+	dh $@
+
+override_dh_auto_configure:
+	dh_auto_configure -- --libdir=/usr/lib \
+                             --libexecdir=/usr/lib/empathy \
+                             --enable-spell=yes \
                              --enable-location=yes \
                              --enable-geocode=yes \
                              --with-cheese \
                              --with-eds \
                              --disable-schemas-compile \
                              --enable-map=yes \
-                             --enable-goa=yes
+                             --enable-goa=yes \
+                             $(DEB_CONFIGURE_EXTRA_FLAGS)
 
-ifeq ($(DEB_HOST_ARCH_OS),linux)
-  DEB_CONFIGURE_EXTRA_FLAGS += --with-connectivity=nm --enable-gudev=yes
-else
-  DEB_CONFIGURE_EXTRA_FLAGS += --with-connectivity=no --enable-gudev=no
-endif
+override_dh_autoreconf:
+	dh_autoreconf --as-needed
+
+override_dh_install:
+	dh_install --list-missing
+
+override_dh_makeshlibs:
+	dh_makeshlibs -Xusr/lib/mission-control-plugins.0/ -Xusr/lib/empathy/
 
-DEB_DH_MAKESHLIBS_ARGS_ALL = -Xusr/lib/mission-control-plugins.0/ -Xusr/lib/empathy/
-DEB_DH_SHLIBDEPS_ARGS_ALL = -Lempathy
-DEB_DH_STRIP_ARGS = --dbgsym-migration='empathy-dbg (<< 3.12.11-2~)'
+override_dh_strip:
+	dh_strip --dbgsym-migration='empathy-dbg (<< 3.12.11-2~)'
 
-include $(CURDIR)/debian/update-patches.mk
+override_dh_auto_test:
diff --git a/debian/shlibs.local b/debian/shlibs.local
deleted file mode 100644
index daa033e..0000000
--- a/debian/shlibs.local
+++ /dev/null
@@ -1,2 +0,0 @@
-libempathy-gtk 3.10.3 empathy (= ${binary:Version})
-libempathy 3.10.3 empathy (= ${binary:Version})
diff --git a/debian/update-patches.mk b/debian/update-patches.mk
deleted file mode 100644
index 71aa9d7..0000000
--- a/debian/update-patches.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-update-patches:
-	mkdir -p $(CURDIR)/debian/patches
-	rm -f $(CURDIR)/debian/patches/*.patch
-	git format-patch -o $(CURDIR)/debian/patches debian-patches ^upstream | \
-		xargs -n 1 basename > $(CURDIR)/debian/patches/series
-	for patch in $$(ls $(CURDIR)/debian/patches/*.patch) ; \
-	do \
-		lines=$$(cat $$patch | wc -l) ; \
-		head -n $$(($$lines - 3)) $$patch > $${patch}.chomped ; \
-			mv $${patch}.chomped $$patch ; \
-	done

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/empathy.git