diff -u paprefs-0.9.6/debian/rules paprefs-0.9.6/debian/rules
--- paprefs-0.9.6/debian/rules
+++ paprefs-0.9.6/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
@@ -11,0 +13,12 @@
+
+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
diff -u paprefs-0.9.6/debian/changelog paprefs-0.9.6/debian/changelog
--- paprefs-0.9.6/debian/changelog
+++ paprefs-0.9.6/debian/changelog
@@ -1,3 +1,24 @@
+paprefs (0.9.6-2ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable, remaining changes (LP: #238979):
+    - Added Polish translation (LP: #191854)
+    - Modify Maintainer value to match the DebianMaintainerField
+      specification.
+
+ -- Nathan Handler <nathan.handler@gmail.com>  Tue, 10 Jun 2008 15:03:19 -0500
+
+paprefs (0.9.6-2) unstable; urgency=low
+
+  * debian/control:
+    + Add quilt to build-depends.
+    + Fix spelling error in description.
+  * 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)
+  * Update Standards-Version to 3.7.3 (no changes required).
+
+ -- CJ van den Berg <cj@vdbonline.com>  Fri, 23 May 2008 20:35:41 +0200
+
 paprefs (0.9.6-1ubuntu1) hardy; urgency=low
 
   * po/LINGUAS, po/pl.po:
diff -u paprefs-0.9.6/debian/control paprefs-0.9.6/debian/control
--- paprefs-0.9.6/debian/control
+++ paprefs-0.9.6/debian/control
@@ -5,8 +5,8 @@
 XSBC-Original-Maintainer: CJ van den Berg <cj@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
-Standards-Version: 3.7.2
+    asciidoc, xmlto, intltool, quilt
+Standards-Version: 3.7.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/
@@ -22,3 +22,3 @@
  .
- PulseAudio Preferences (paprefs) is a simple GTK based configuration dialog
+ PulseAudio Preferences (paprefs) is a simple GTK+ based configuration dialog
  for the PulseAudio sound server.
only in patch2:
unchanged:
--- paprefs-0.9.6.orig/debian/patches/series
+++ paprefs-0.9.6/debian/patches/series
@@ -0,0 +1 @@
+0001-Fix-build-error-with-gcc-4.3.patch
only in patch2:
unchanged:
--- paprefs-0.9.6.orig/debian/patches/0001-Fix-build-error-with-gcc-4.3.patch
+++ paprefs-0.9.6/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@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>