[SCM] pulseaudio packaging branch, master, updated. debian/2.0-1-10-gfb88976

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

The branch, master has been updated
       via  fb889763cc2e271189d6260da8a642536641b967 (commit)
       via  08c4824c53d4d514099761b516c363f8d8267892 (commit)
      from  609f9b778b5b1d6928a09f61d83bc22db560edef (commit)


- Shortlog ------------------------------------------------------------
fb88976 debian/rules: fixed ./configure to auto-generate versioned $moduledir
08c4824 debian/pulseaudio-esound-compat.links: added man page link for esd.1.gz

Summary of changes:
 debian/changelog                      |   12 +++++++-----
 debian/pulseaudio-esound-compat.links |    1 +
 debian/rules                          |    4 ++--
 3 files changed, 10 insertions(+), 7 deletions(-)
-----------------------------------------------------------------------
Details of changes:

commit fb889763cc2e271189d6260da8a642536641b967
Author: Martin-Éric Racine <martin-eric.racine at iki.fi>
Date:   Mon May 14 22:40:43 2012 +0300

    debian/rules: fixed ./configure to auto-generate versioned $moduledir

diff --git a/debian/changelog b/debian/changelog
index 93ef938..de8ec6f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,15 @@
 pulseaudio (2.0-2) UNRELEASED; urgency=low
 
   [Martin-Éric Racine]
+  * Added myself to Uploaders.
+  * Added patch 0001_man_page_typos.patch
+  * control: pulseaudio: no longer Recommends pulseaudio-esound-compat.
+  * control: Lintian: fixed duplicate short descriptions for -dbg.
+  * control: Lintian: change versioned Conflicts to Breaks.
+  * rules: correctly generate versioned library paths.
   * pulseaudio.init: LSB: NetworkManager to network-manager.
   * pulseaudio.init: LSB: added missing Stop levels 0 and 6.
-  * debian/control: pulseaudio: no longer Recommends pulseaudio-esound-compat.
-  * debian/control: Lintian: fixed duplicate short descriptions for -dbg packages.
-  * debian/control: Lintian: change versioned Conflicts to Breaks.
-  * Added patch 0001_man_page_typos.patch
-  * Added myself to Uploaders.
+  * pulseaudio-esound-compat.links: added man page link for esd.1.gz 
 
  -- Martin-Éric Racine <martin-eric.racine at iki.fi>  Mon, 14 May 2012 19:22:50 +0300
 
diff --git a/debian/rules b/debian/rules
index 50d25e3..4525740 100755
--- a/debian/rules
+++ b/debian/rules
@@ -54,9 +54,9 @@ update-patch-series:
 # 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-1.0/modules
+  --with-module-dir=\$${prefix}/lib/pulse-\$${PA_MAJORMINOR}/modules
 
-DEB_DH_MAKESHLIBS_ARGS_ALL = --exclude=usr/lib/pulse-1.0/modules
+DEB_DH_MAKESHLIBS_ARGS_ALL = --exclude=usr/lib/pulse-*/modules
 
 LDFLAGS += -Wl,--no-as-needed
 

commit 08c4824c53d4d514099761b516c363f8d8267892
Author: Martin-Éric Racine <martin-eric.racine at iki.fi>
Date:   Mon May 14 22:37:36 2012 +0300

    debian/pulseaudio-esound-compat.links: added man page link for esd.1.gz

diff --git a/debian/pulseaudio-esound-compat.links b/debian/pulseaudio-esound-compat.links
index d4739a0..b959b03 100644
--- a/debian/pulseaudio-esound-compat.links
+++ b/debian/pulseaudio-esound-compat.links
@@ -1 +1,2 @@
 usr/bin/esdcompat usr/bin/esd
+usr/share/man/man1/esdcompat.1.gz usr/share/man/man1/esd.1.gz

-- 
pulseaudio packaging