[pavucontrol] 04/09: Switch from cdbs to dh sequencer

Felipe Sateler fsateler at moszumanska.debian.org
Sun Dec 24 16:55:25 UTC 2017


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

fsateler pushed a commit to branch master
in repository pavucontrol.

commit ced4d3f957a8b21101438ffd100ffddefa276d5d
Author: Felipe Sateler <fsateler at debian.org>
Date:   Sun Dec 24 13:34:34 2017 -0300

    Switch from cdbs to dh sequencer
    
    - Bump debhelper compat level from 5 to 11
    - Use automatic dbgsym instead of manual dbg package
---
 debian/compat  |  2 +-
 debian/control | 18 +-----------------
 debian/rules   | 30 ++++++++++++------------------
 3 files changed, 14 insertions(+), 36 deletions(-)

diff --git a/debian/compat b/debian/compat
index 7ed6ff8..b4de394 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+11
diff --git a/debian/control b/debian/control
index 9fd10d1..7a3ebf1 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Pulseaudio maintenance team <pkg-pulseaudio-devel at lists.alioth.debia
 Uploaders: Sjoerd Simons <sjoerd at debian.org>,
  Léo Cavaillé <leo at cavaille.net>,
  Felipe Sateler <fsateler at debian.org>
-Build-Depends: debhelper (>= 5), cdbs, autotools-dev,
+Build-Depends: debhelper (>= 11),
                libpulse-dev (>= 0.9.15),
                libgtkmm-3.0-dev,
                lynx,
@@ -31,19 +31,3 @@ Description: PulseAudio Volume Control
  you to redirect a playback stream to another output device without
  interrupting playback.
 
-Package: pavucontrol-dbg
-Architecture: any
-Section: debug
-Priority: extra
-Depends:
-    pavucontrol (= ${binary:Version}),
-    ${misc:Depends}
-Description: Debugging symbols for pavucontrol
- PulseAudio Volume Control (pavucontrol) is a simple GTK+ based volume
- control tool (mixer) for the PulseAudio sound server. In contrast to
- classic mixer tools this one allows you to control both the volume of
- hardware devices and of each playback stream separately. It also allows
- you to redirect a playback stream to another output device without
- interrupting playback.
- .
- This package contains the debugging symbols for pavucontrol.
diff --git a/debian/rules b/debian/rules
index 84bad77..9d7e65d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,28 +1,22 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
+DPKG_EXPORT_BUILDFLAGS = 1
 
-DEB_DESTDIR = $(CURDIR)/debian/pavucontrol
+DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
-DEB_INSTALL_DOCS_ALL = -XREADME doc/README
+include /usr/share/dpkg/default.mk
 
-common-build-arch:: $(CURDIR)/debian/pavucontrol.1.txt
+%:
+	dh $@
+
+override_dh_auto_build:
 	a2x -d manpage -f manpage $(CURDIR)/debian/pavucontrol.1.txt
 
-clean::
+
+override_dh_clean:
+	dh_clean
 	rm -f $(CURDIR)/debian/pavucontrol.1.xml
 	rm -f $(CURDIR)/debian/pavucontrol.1
 	rm -f README
-
-update-patch-series:
-	mkdir -p $(CURDIR)/debian/patches
-	rm -f $(CURDIR)/debian/patches/*.patch
-	git-format-patch -o $(CURDIR)/debian/patches 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
+override_dh_installdocs:
+	dh_installdocs -XREADME doc/README

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-pulseaudio/pavucontrol.git



More information about the pkg-pulseaudio-devel mailing list