[SCM] paprefs packaging branch, master, updated. debian/0.9.9-1-4-g73fa86b

[q-funk-guest at users.alioth.debian.org]

The branch, master has been updated
       via  73fa86b89480018fb1c3215d6d4dcdba42bd6255 (commit)
      from  6ada6c5d768ddab0d6488e5b453c3849b3b37eae (commit)


- Shortlog ------------------------------------------------------------
73fa86b Packaging new upstream and updating Debian source to 3.0 (quilt).

Summary of changes:
 debian/changelog     |   10 ++++++++++
 debian/control       |    3 +--
 debian/rules         |    9 ++++++++-
 debian/source/format |    1 +
 4 files changed, 20 insertions(+), 3 deletions(-)
-----------------------------------------------------------------------
Details of changes:

commit 73fa86b89480018fb1c3215d6d4dcdba42bd6255
Author: Martin-Éric Racine <martin-eric.racine at iki.fi>
Date:   Tue May 15 00:41:52 2012 +0300

    Packaging new upstream and updating Debian source to 3.0 (quilt).

diff --git a/debian/changelog b/debian/changelog
index a342085..6c9ea1b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+paprefs (0.9.10-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+  * Migrated to source format 3.0 (quilt).
+    + [debian/control]: Build-Depends on dpkg-dev (>= 1.14.17~).
+    - [debian/control]: drop the Build-Depends on quilt.
+    - [debian/rules]: drop the patchsys-quilt.mk CDBS include.
+
+ -- Martin-Éric Racine <martin-eric.racine at iki.fi>  Tue, 15 May 2012 00:21:55 +0300
+
 paprefs (0.9.9-2) unstable; urgency=low
 
   * debian/rules: Update the update-patch-series rule
diff --git a/debian/control b/debian/control
index 0e74346..216e5d3 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: sound
 Priority: optional
 Maintainer: Pulseaudio maintenance team <pkg-pulseaudio-devel at lists.alioth.debian.org>
 Uploaders: CJ van den Berg <cj at vdbonline.com>, Sjoerd Simons <sjoerd at debian.org>
-Build-Depends: debhelper (>= 5), cdbs, autotools-dev,
+Build-Depends: dpkg-dev (>= 1.14.17~), debhelper (>= 5), cdbs, autotools-dev,
     libpulse-dev (>= 0.9.15),
     libgtkmm-2.4-dev,
     libglademm-2.4-dev,
@@ -12,7 +12,6 @@ Build-Depends: debhelper (>= 5), cdbs, autotools-dev,
     asciidoc,
     xmlto,
     intltool,
-    quilt,
     libdbus-glib-1-dev
 Standards-Version: 3.8.1
 Vcs-Git: git://git.debian.org/git/pkg-pulseaudio/paprefs.git
diff --git a/debian/rules b/debian/rules
index 3b3efbd..a972496 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,6 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 common-build-arch:: $(CURDIR)/debian/paprefs.1.txt
 	a2x -d manpage -f manpage $(CURDIR)/debian/paprefs.1.txt
@@ -23,3 +22,11 @@ update-patch-series:
 		mv $${patch}.chomped $$patch ; \
 	done
 
+# Libs should be in the multi-arch path, but the modules should be in the
+# normal directory as pulseaudio is foreign
+DEB_CONFIGURE_EXTRA_FLAGS = --enable-x11 --disable-hal \
+  --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
+  --with-module-dir=\$${prefix}/lib/pulse-$(DEB_UPSTREAM_VERSION)/modules
+
+DEB_DH_MAKESHLIBS_ARGS_ALL = --exclude=usr/lib/pulse-$(DEB_UPSTREAM_VERSION)/modules
+
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)

-- 
paprefs packaging