[SCM] paprefs packaging branch, master, updated. debian/0.9.9-1-15-g5afc12c

[sjoerd at users.alioth.debian.org]

The branch, master has been updated
  discards  8ac8368fd3bf8c588b1cc8475e771afe2270d19e (commit)
       via  5afc12c741c1fd64c6e1eb89e8cb8c73345f252c (commit)
      from  8ac8368fd3bf8c588b1cc8475e771afe2270d19e (commit)


- Shortlog ------------------------------------------------------------
5afc12c Switch to dh 7, new standards and autoreconf

Summary of changes:
 debian/changelog |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)
-----------------------------------------------------------------------
Details of changes:

commit 5afc12c741c1fd64c6e1eb89e8cb8c73345f252c
Author: Sjoerd Simons <sjoerd.simons at collabora.co.uk>
Date:   Fri May 18 20:15:19 2012 +0200

    Switch to dh 7, new standards and autoreconf
    
    * Switch to dh 7
    * Switch to standards version 3.9.3
    * Use autoreconf to regenerate the build system

diff --git a/debian/changelog b/debian/changelog
index e8b7537..ee71a81 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 paprefs (0.9.10-1) UNRELEASED; urgency=low
 
+  [ Martin-Éric Racine ]
   * New upstream release:
     - Deleted all previous debian/patches; merged upstream.
   * Added myself to Uploaders.
@@ -12,7 +13,12 @@ paprefs (0.9.10-1) UNRELEASED; urgency=low
     (Closes: #649565, #649593, #652444)
   * watch: updated to point to FreeDesktop.org XZ tarball.
 
- -- Martin-Éric Racine <martin-eric.racine at iki.fi>  Tue, 15 May 2012 00:21:55 +0300
+  [ Sjoerd Simons ]
+  * Switch to dh 7
+  * Switch to standards version 3.9.3
+  * Use autoreconf to regenerate the build system
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Fri, 18 May 2012 20:30:58 +0200
 
 paprefs (0.9.9-2) unstable; urgency=low
 
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..327ffde
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,2 @@
+debian/paprefs.1
+debian/paprefs.1.xml
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+9
diff --git a/debian/control b/debian/control
index 9bd9da5..d3097d4 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Pulseaudio maintenance team <pkg-pulseaudio-devel at lists.alioth.debian.org>
 Uploaders: Sjoerd Simons <sjoerd at debian.org>,
   Martin-Éric Racine <martin-eric.racine at iki.fi>
-Build-Depends: dpkg-dev (>= 1.14.17~), debhelper (>= 5), cdbs, autotools-dev,
+Build-Depends: debhelper (>= 9), autotools-dev, dh-autoreconf,
     libpulse-dev (>= 0.9.15),
     libgtkmm-2.4-dev,
     libglademm-2.4-dev,
@@ -14,10 +14,10 @@ Build-Depends: dpkg-dev (>= 1.14.17~), debhelper (>= 5), cdbs, autotools-dev,
     xmlto,
     intltool,
     libdbus-glib-1-dev
-Standards-Version: 3.8.1
+Standards-Version: 3.9.3
 Vcs-Git: git://git.debian.org/git/pkg-pulseaudio/paprefs.git
 Vcs-Browser: http://git.debian.org/?p=pkg-pulseaudio/paprefs.git
-Homepage: http://0pointer.de/lennart/projects/paprefs/
+Homepage: http://freedesktop.org/software/pulseaudio/paprefs/
 
 Package: paprefs
 Architecture: any
diff --git a/debian/rules b/debian/rules
index fde0cfa..f9f6652 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,24 +1,9 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
-
-common-build-arch:: $(CURDIR)/debian/paprefs.1.txt
+override_dh_auto_build:
 	a2x -d manpage -f manpage $(CURDIR)/debian/paprefs.1.txt
+	dh_auto_build
 
-clean::
-	rm -f $(CURDIR)/debian/paprefs.1.xml
-	rm -f $(CURDIR)/debian/paprefs.1
-
-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
 
+%:
+	dh $@ --with autoreconf,autotools_dev

-- 
paprefs packaging