[SCM] pulseaudio packaging branch, master, updated. debian/2.0-3-5-g5f55c0b

sjoerd at users.alioth.debian.org sjoerd at users.alioth.debian.org
Sat Jul 21 15:19:18 UTC 2012


The branch, master has been updated
       via  5f55c0b088c56ba57d3982ef28726d375e00a247 (commit)
       via  55dfcd4f178d3edb77cb6cd57680bf8e9c90298b (commit)
       via  89c0c31b5dc46e243e4e0c289550822c3494ec0b (commit)
       via  70d0bcf104d8f9da1494ecd7069f306e3cf4577a (commit)
      from  cf8007208b59037e65cd35c290275647cbef7c15 (commit)


- Shortlog ------------------------------------------------------------
5f55c0b debian/patches/webrtc-utils-needs-to-be-installed-before-module-ech.patch:
55dfcd4 Prepare 2.1 release
89c0c31 Merge tag 'upstream/2.1'

Summary of changes:
 .tarball-version                                   |    2 +-
 .version                                           |    2 +-
 configure                                          |   22 ++--
 configure.ac                                       |    2 +-
 debian/changelog                                   |    8 +
 debian/patches/series                              |    1 +
 ...s-needs-to-be-installed-before-module-ech.patch |   37 ++++++
 debian/rules                                       |    2 +-
 debian/shlibs.local                                |    2 +-
 man/pacmd.1                                        |   11 ++
 man/pacmd.1.xml.in                                 |   18 +++
 src/Makefile.am                                    |   18 ++-
 src/Makefile.in                                    |  131 ++++++++++---------
 src/modules/alsa/alsa-sink.c                       |    1 +
 src/modules/alsa/alsa-source.c                     |    1 +
 .../paths/analog-input-internal-mic-always.conf    |  135 ++++++++++++++++++++
 .../alsa/mixer/paths/analog-input-mic.conf.common  |    4 +
 .../alsa/mixer/paths/analog-output-headphones.conf |    3 +
 .../mixer/paths/analog-output-speaker-always.conf  |  127 ++++++++++++++++++
 .../alsa/mixer/paths/analog-output-speaker.conf    |    4 +
 .../alsa/mixer/profile-sets/90-pulseaudio.rules    |   48 +++++++
 .../profile-sets/force-speaker-and-int-mic.conf    |  122 ++++++++++++++++++
 .../alsa/mixer/profile-sets/force-speaker.conf     |  121 ++++++++++++++++++
 src/modules/bluetooth/module-bluetooth-device.c    |   29 +++--
 src/modules/module-role-cork.c                     |   16 ++-
 src/modules/module-udev-detect.c                   |    9 +-
 src/modules/udev-util.c                            |    4 +-
 src/modules/xen/module-xenpv-sink.c                |    4 +-
 src/pulse/version.h                                |    4 +-
 src/pulsecore/core-util.c                          |    2 +-
 src/pulsecore/once.c                               |   43 ++-----
 src/pulsecore/once.h                               |    8 +-
 src/pulsecore/sink-input.c                         |    3 +-
 src/pulsecore/source-output.c                      |    3 +-
 34 files changed, 804 insertions(+), 143 deletions(-)
-----------------------------------------------------------------------
Details of changes:

commit 5f55c0b088c56ba57d3982ef28726d375e00a247
Author: Sjoerd Simons <sjoerd at debian.org>
Date:   Sat Jul 21 17:11:40 2012 +0200

    debian/patches/webrtc-utils-needs-to-be-installed-before-module-ech.patch:
    
    * debian/patches/webrtc-utils-needs-to-be-installed-before-module-ech.patch:
      - Added. Fix build

diff --git a/debian/changelog b/debian/changelog
index 04fe487..6c5c2b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
 pulseaudio (2.1-1) UNRELEASED; urgency=low
 
   * New upstream stable release
+  * debian/patches/webrtc-utils-needs-to-be-installed-before-module-ech.patch:
+    - Added. Fix build
 
- -- Sjoerd Simons <sjoerd at debian.org>  Fri, 20 Jul 2012 19:44:08 +0200
+ -- Sjoerd Simons <sjoerd at debian.org>  Sat, 21 Jul 2012 17:11:01 +0200
 
 pulseaudio (2.0-3) unstable; urgency=low
 
diff --git a/debian/patches/series b/debian/patches/series
index c9aa3d0..fe2fe05 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001_man_page_typos.patch
+webrtc-utils-needs-to-be-installed-before-module-ech.patch
diff --git a/debian/patches/webrtc-utils-needs-to-be-installed-before-module-ech.patch b/debian/patches/webrtc-utils-needs-to-be-installed-before-module-ech.patch
new file mode 100644
index 0000000..5e3541f
--- /dev/null
+++ b/debian/patches/webrtc-utils-needs-to-be-installed-before-module-ech.patch
@@ -0,0 +1,37 @@
+From 9c141a3b230f1e2e5ecdb2eb95ad597610df73cd Mon Sep 17 00:00:00 2001
+From: Sjoerd Simons <sjoerd at luon.net>
+Date: Fri, 20 Jul 2012 21:18:26 +0200
+Subject: [PATCH] webrtc-utils needs to be installed before module-echo-cancel
+
+Like other plugin helper libraries these need to be installed
+before the plugins that use them..
+---
+ src/Makefile.am |    5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 9b71b17..aae13b5 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -905,6 +905,10 @@ modlibexec_LTLIBRARIES = \
+ 		libprotocol-http.la \
+ 		libprotocol-native.la
+ 
++if HAVE_WEBRTC
++modlibexec_LTLIBRARIES += libwebrtc-util.la
++endif
++
+ if HAVE_ESOUND
+ modlibexec_LTLIBRARIES += \
+ 		libprotocol-esound.la
+@@ -1837,7 +1841,6 @@ if HAVE_WEBRTC
+ # The webrtc code is split off into a helper library to avoid having automake
+ # link module-echo-cancel with C++ (which it does if there are any C++ deps,
+ # even conditional ones).
+-modlibexec_LTLIBRARIES += libwebrtc-util.la
+ 
+ libwebrtc_util_la_SOURCES = modules/echo-cancel/webrtc.cc
+ libwebrtc_util_la_CXXFLAGS = $(AM_CXXFLAGS) $(SERVER_CFLAGS) $(WEBRTC_CFLAGS) -DHAVE_WEBRTC=1
+-- 
+1.7.10.4
+

commit 55dfcd4f178d3edb77cb6cd57680bf8e9c90298b
Author: Sjoerd Simons <sjoerd at debian.org>
Date:   Fri Jul 20 19:46:08 2012 +0200

    Prepare 2.1 release

diff --git a/debian/changelog b/debian/changelog
index 6fbb8a4..04fe487 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pulseaudio (2.1-1) UNRELEASED; urgency=low
+
+  * New upstream stable release
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Fri, 20 Jul 2012 19:44:08 +0200
+
 pulseaudio (2.0-3) unstable; urgency=low
 
   [ Martin-Éric Racine ]
diff --git a/debian/rules b/debian/rules
index 73e7b39..dadf89f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,7 +25,7 @@ common-install-arch::
 
 common-configure-arch::
 ifneq (,$(findstring $(DEB_HOST_ARCH), "arm armel"))
-	make -C src libpulsecore_2.0_la-svolume_arm.lo CFLAGS+=-march=armv6
+	make -C src libpulsecore_2.1_la-svolume_arm.lo CFLAGS+=-march=armv6
 endif
 
 pulseaudio-install-arch::
diff --git a/debian/shlibs.local b/debian/shlibs.local
index a18985f..4192d27 100644
--- a/debian/shlibs.local
+++ b/debian/shlibs.local
@@ -1 +1 @@
-libpulsecommon 2.0 libpulse0 (= ${binary:Version})
+libpulsecommon 2.1 libpulse0 (= ${binary:Version})

commit 89c0c31b5dc46e243e4e0c289550822c3494ec0b
Merge: cf8007208b59037e65cd35c290275647cbef7c15 70d0bcf104d8f9da1494ecd7069f306e3cf4577a
Author: Sjoerd Simons <sjoerd at debian.org>
Date:   Fri Jul 20 19:42:57 2012 +0200

    Merge tag 'upstream/2.1'
    
    Upstream version 2.1


-- 
pulseaudio packaging



More information about the pkg-pulseaudio-devel mailing list