[Pkg-pulseaudio-devel] [SCM] paprefs packaging branch, master, updated. debian/0.9.6-1-2-g454bad5

[neurocyte-guest at users.alioth.debian.org]

The branch, master has been updated
       via  454bad5bca0b42f0f4ea29d1fb0b4d9f750f15b3 (commit)
       via  9ac4dda96ee3b627bd0d5360b94a9b638649fde9 (commit)
      from  59ae08322f97b48449eabe940235787ee7906eac (commit)


- Shortlog ------------------------------------------------------------
454bad5 Add patch to fix build with gcc-4.3 (Closes: #474845)
9ac4dda Add quilt support

Summary of changes:
 debian/changelog                                   |    9 +++++++
 debian/control                                     |    2 +-
 .../0001-Fix-build-error-with-gcc-4.3.patch        |   24 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 debian/rules                                       |   13 ++++++++++
 5 files changed, 48 insertions(+), 1 deletions(-)
-----------------------------------------------------------------------
Details of changes:

commit 454bad5bca0b42f0f4ea29d1fb0b4d9f750f15b3
Author: Courteney van den Berg <vdberg at ffm.tc.iot.dtag.de>
Date:   Fri May 23 20:47:38 2008 +0200

    Add patch to fix build with gcc-4.3 (Closes: #474845)

diff --git a/debian/changelog b/debian/changelog
index 86eded6..6863166 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ paprefs (0.9.6-2) UNRELEASED; urgency=low
 
   * debian/control: Add quilt to build-depends.
   * debian/rule: Add quilt support.
+  * debian/patches/0001-Fix-build-error-with-gcc-4.3.patch:
+    + Added. Fix build with gcc-4.3 (Closes: #474845)
 
  -- CJ van den Berg <cj at vdbonline.com>  Fri, 23 May 2008 20:35:41 +0200
 
diff --git a/debian/patches/0001-Fix-build-error-with-gcc-4.3.patch b/debian/patches/0001-Fix-build-error-with-gcc-4.3.patch
new file mode 100644
index 0000000..e8ec83a
--- /dev/null
+++ b/debian/patches/0001-Fix-build-error-with-gcc-4.3.patch
@@ -0,0 +1,24 @@
+From 295db4168276f1fb6ddc06b09bc10221f951cbc5 Mon Sep 17 00:00:00 2001
+From: Bradley Smith <brad at brad-smith.co.uk>
+Date: Fri, 11 Apr 2008 21:14:57 +0100
+Subject: [PATCH] Fix build error with gcc-4.3
+
+This fixes:
+paprefs.cc:409: error: 'bindtextdomain' was not declared in this scope
+---
+ src/paprefs.cc |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/src/paprefs.cc b/src/paprefs.cc
+index 8c5f10a..7a426af 100644
+--- a/src/paprefs.cc
++++ b/src/paprefs.cc
+@@ -23,6 +23,8 @@
+ #include <config.h>
+ #endif
+ 
++#include <locale>
++
+ #include <signal.h>
+ 
+ #include <gtkmm.h>
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..51cd61f
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Fix-build-error-with-gcc-4.3.patch

commit 9ac4dda96ee3b627bd0d5360b94a9b638649fde9
Author: Courteney van den Berg <vdberg at ffm.tc.iot.dtag.de>
Date:   Fri May 23 20:35:33 2008 +0200

    Add quilt support

diff --git a/debian/changelog b/debian/changelog
index 998699c..86eded6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+paprefs (0.9.6-2) UNRELEASED; urgency=low
+
+  * debian/control: Add quilt to build-depends.
+  * debian/rule: Add quilt support.
+
+ -- CJ van den Berg <cj at vdbonline.com>  Fri, 23 May 2008 20:35:41 +0200
+
 paprefs (0.9.6-1) unstable; urgency=low
 
   [ Sjoerd Simons ]
diff --git a/debian/control b/debian/control
index 2548d24..a7c4125 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: CJ van den Berg <cj at vdbonline.com>
 Build-Depends: debhelper (>= 5), cdbs, autotools-dev, libpulse-dev,
     libgtkmm-2.4-dev, libglademm-2.4-dev, libgconfmm-2.6-dev, lynx,
-    asciidoc, xmlto, intltool
+    asciidoc, xmlto, intltool, quilt
 Standards-Version: 3.7.2
 Vcs-Git: git://git.debian.org/git/pkg-pulseaudio/paprefs.git
 Vcs-Browser: http://git.debian.org/?p=pkg-pulseaudio/paprefs.git
diff --git a/debian/rules b/debian/rules
index 5d22756..5b57bf2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,7 @@
 
 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
@@ -9,3 +10,15 @@ common-build-arch:: $(CURDIR)/debian/paprefs.1.txt
 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

-- 
paprefs packaging