Merge lp:~l3on/ubuntu/oneiric/paprefs/fix-829051 into lp:ubuntu/oneiric/paprefs

[Leo Iannacone]

A new patch based on upstream commit to fix paprefs to load pulseaudio
dynamically.

[Martin Pitt (pitti)]

Looks fine, thanks! I uploaded this, so marking as merged.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2009-11-30 11:21:19 +0000
+++ debian/changelog	2012-01-21 14:02:24 +0000
@@ -1,3 +1,10 @@
+paprefs (0.9.9-2ubuntu1.1) oneiric-proposed; urgency=low
+
+  * Fix pulseaudio recognition without requiring a rebuild each
+    time pulseaudio gets an update (LP: #829051).
+
+ -- Leo Iannacone <[e-mail]>  Sat, 21 Jan 2012 13:00:21 +0100
+
 paprefs (0.9.9-2ubuntu1) lucid; urgency=low
 
   * Sync on Debian unstable.

=== added file 'debian/patches/0005-fix-PA-version.patch'
--- debian/patches/0005-fix-PA-version.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/0005-fix-PA-version.patch	2012-01-21 14:02:24 +0000
@@ -0,0 +1,116 @@
+Description: Fix pulseaudio recognition without requiring a rebuild each
+ time pulseaudio gets an update.
+
+  Based on: 779c0ca043406c64761557f511d2a805ab5beb9e Mon Sep 17 00:00:00 2001
+  From: Colin Guthrie <[e-mail]>
+  Date: Fri, 20 Jan 2012 14:20:54 +0000
+  Subject:
+    modules: Better code for working out the dynamic module dir.
+
+    The current code used libdir from the pkgconfig file, but Debian
+    and Ubuntu do not put their modules inside this folder and thus it's
+    a bit flawed.
+
+    So take the static module dir and strip of the trailing parts that
+    might change with a new library version and make that tail end
+    dynamic. Should work on all platforms.
+  
+  Version 0.9.10 also affected.
+
+Author: Leo Iannacone <[e-mail]>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/829051
+Bug-Debian: http://bugs.debian.org/649565
+Forwarded: YES - no ML found, sent email to Christian Persch and Colin Guthrie
+ according to the homepage of paprefs
+
+---
+ configure       |    2 +-
+ configure.ac    |    2 +-
+ src/Makefile.am |    2 +-
+ src/Makefile.in |    2 +-
+ src/paprefs.cc  |   28 +++++++++++++++++-----------
+ 5 files changed, 21 insertions(+), 15 deletions(-)
+
+--- paprefs-oneiric.orig/src/paprefs.cc
++++ paprefs-oneiric/src/paprefs.cc
+@@ -659,19 +659,25 @@ void MainWindow::readFromGConf() {
+ }
+ 
+ gchar * MainWindow::modulePath(const gchar *name) {
+-  gchar *path, *pulsedir, *c;
++  gchar *path, *c, **versions;
+ 
+-  pulsedir = g_strdup_printf ("pulse-%s", pa_get_library_version ());
++  versions = g_strsplit(pa_get_library_version(), ".", 3);
++  if (versions[0] && versions[1]) {
++      gchar *pulsedir, *search;
+ 
+-  for (c = pulsedir + strlen ("pulse-"); *c != '\0'; c++) {
+-    if (*c == '-') {
+-      *c = '\0';
+-      break;
+-    }
+-  }
+-
+-  path = g_build_filename (MODLIBDIR, pulsedir, "modules", name, NULL);
+-  g_free (pulsedir);
++      /* Remove the "/pulse-x.y/modules" suffix so we can dynamically inject
++       * it again with runtime library version numbers */
++      pulsedir = g_strdup_printf ("%s", MODLIBDIR);
++      if ((search = g_strrstr (pulsedir, G_DIR_SEPARATOR_S))) {
++          *search = '\0';
++          if ((search = g_strrstr (pulsedir, G_DIR_SEPARATOR_S)))
++              *search = '\0';
++      }
++      path = g_strdup_printf ("%s" G_DIR_SEPARATOR_S "pulse-%s.%s" G_DIR_SEPARATOR_S "modules" G_DIR_SEPARATOR_S "%s", pulsedir, versions[0], versions[1], name);
++      g_free (pulsedir);
++  } else
++      path = g_build_filename (MODLIBDIR, name, NULL);
++  g_strfreev(versions);
+ 
+   return path;
+ }
+--- paprefs-oneiric.orig/configure.ac
++++ paprefs-oneiric/configure.ac
+@@ -43,7 +43,7 @@ AC_SUBST(GUILIBS_CFLAGS)
+ AC_SUBST(GUILIBS_LIBS)
+ 
+ PKG_CHECK_MODULES(LIBPULSE, libpulse)
+-LIBPULSE_MODLIBDIR=`pkg-config libpulse --variable libdir`
++LIBPULSE_MODLIBDIR=`pkg-config libpulse --variable modlibexecdir`
+ AC_SUBST(LIBPULSE_MODLIBDIR)
+ 
+ # If using GCC specifiy some additional parameters
+--- paprefs-oneiric.orig/src/Makefile.am
++++ paprefs-oneiric/src/Makefile.am
+@@ -31,7 +31,7 @@ paprefs_SOURCES=paprefs.cc
+ 
+ paprefs_LDADD=$(AM_LDADD) $(GUILIBS_LIBS) $(LIBPULSE_LIBS)
+ paprefs_CXXFLAGS=$(AM_CXXFLAGS) $(GUILIBS_CFLAGS) $(LIBPULSE_CFLAGS)
+-paprefs_CXXFLAGS+=-DGLADE_FILE=\"$(gladedir)/paprefs.glade\" -DLOCALEDIR=\"$(localedir)\" -DMODLIBDIR=\""$(LIBPULSE_MODLIBDIR)/"\" -DSHREXT=\"$(SHREXT)\"
++paprefs_CXXFLAGS+=-DGLADE_FILE=\"$(gladedir)/paprefs.glade\" -DLOCALEDIR=\"$(localedir)\" -DMODLIBDIR=\""$(LIBPULSE_MODLIBDIR)"\" -DSHREXT=\"$(SHREXT)\"
+ 
+ EXTRA_DIST = $(glade_DATA) $(desktop_in_files)
+ 
+--- paprefs-oneiric.orig/src/Makefile.in
++++ paprefs-oneiric/src/Makefile.in
+@@ -266,7 +266,7 @@ paprefs_LDADD = $(AM_LDADD) $(GUILIBS_LI
+ paprefs_CXXFLAGS = $(AM_CXXFLAGS) $(GUILIBS_CFLAGS) $(LIBPULSE_CFLAGS) \
+ 	-DGLADE_FILE=\"$(gladedir)/paprefs.glade\" \
+ 	-DLOCALEDIR=\"$(localedir)\" \
+-	-DMODLIBDIR=\""$(LIBPULSE_MODLIBDIR)/"\" \
++	-DMODLIBDIR=\""$(LIBPULSE_MODLIBDIR)"\" \
+ 	-DSHREXT=\"$(SHREXT)\"
+ EXTRA_DIST = $(glade_DATA) $(desktop_in_files)
+ CLEANFILES = $(desktop_DATA)
+--- paprefs-oneiric.orig/configure
++++ paprefs-oneiric/configure
+@@ -4754,7 +4754,7 @@ else
+ $as_echo "yes" >&6; }
+ 	:
+ fi
+-LIBPULSE_MODLIBDIR=`pkg-config libpulse --variable libdir`
++LIBPULSE_MODLIBDIR=`pkg-config libpulse --variable modlibexecdir`
+ 
+ 
+ # If using GCC specifiy some additional parameters

=== modified file 'debian/patches/series'
--- debian/patches/series	2009-11-30 11:21:19 +0000
+++ debian/patches/series	2012-01-21 14:02:24 +0000
@@ -2,3 +2,4 @@
 0002-Dynamically-build-the-paths-to-the-modules.patch
 0003-rerun-bootstrap-for-the-updated-autotools-file.patch
 0004-Show-install-only-with-active-packagekit.patch
+0005-fix-PA-version.patch