[Pkg-telepathy-commits] [libnice] 09/12: Switch to dh sequences and bump debhelper compat to 10

Laurent Bigonville bigon at moszumanska.debian.org
Tue Sep 12 15:20:39 UTC 2017


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

bigon pushed a commit to branch debian
in repository libnice.

commit a6f4c188646fdfe878a17c13f1c197ad8e7ebd0b
Author: Laurent Bigonville <bigon at debian.org>
Date:   Tue Sep 12 16:46:50 2017 +0200

    Switch to dh sequences and bump debhelper compat to 10
---
 debian/compat            |  2 +-
 debian/control           |  5 +----
 debian/rules             | 26 +++++++++++---------------
 debian/update-patches.mk | 10 ----------
 4 files changed, 13 insertions(+), 30 deletions(-)

diff --git a/debian/compat b/debian/compat
index ec63514..f599e28 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/control b/debian/control
index 65a79bc..4f27f6d 100644
--- a/debian/control
+++ b/debian/control
@@ -5,10 +5,7 @@ Maintainer: Debian Telepathy maintainers <pkg-telepathy-maintainers at lists.alioth
 Uploaders: Dafydd Harries <daf at debian.org>,
            Sjoerd Simons <sjoerd at debian.org>,
            Laurent Bigonville <bigon at debian.org>
-Build-Depends: autotools-dev,
-               cdbs (>= 0.4.93~),
-               debhelper (>= 9),
-               dh-autoreconf,
+Build-Depends: debhelper (>= 10),
                gobject-introspection (>= 1.30.0),
                gtk-doc-tools,
                libgirepository1.0-dev (>= 1.30.0),
diff --git a/debian/rules b/debian/rules
index e206df4..b2050f5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,20 +1,16 @@
 #!/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/autotools.mk
+%:
+	dh $@ --with gir
 
-# List any files which are not installed
-include /usr/share/cdbs/1/rules/utils.mk
-common-binary-post-install-arch:: list-missing
+override_dh_auto_configure:
+	dh_auto_configure -- --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
+	                     --enable-compile-warnings=yes \
+	                     --enable-gupnp \
+	                     --with-gstreamer \
+	                     --enable-introspection
 
-DEB_DBG_PACKAGE_libnice10 := libnice-dbg
+override_dh_install:
+	dh_install --list-missing
 
-DEB_CONFIGURE_EXTRA_FLAGS := --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
-	--enable-compile-warnings=yes \
-	--enable-gupnp \
-	--with-gstreamer \
-	--enable-introspection \
-	$(NULL)
-
-include $(CURDIR)/debian/update-patches.mk
+override_dh_auto_test:
diff --git a/debian/update-patches.mk b/debian/update-patches.mk
deleted file mode 100644
index 55569f6..0000000
--- a/debian/update-patches.mk
+++ /dev/null
@@ -1,10 +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
-	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/pkg-telepathy/libnice.git



More information about the Pkg-telepathy-commits mailing list