[SCM] pulseaudio packaging branch, wheezy, updated. debian/2.0-3-3-gf903f5b

Sat Jul 21 16:00:49 UTC 2012

The branch, wheezy has been updated
       via  f903f5b2aec23a51b24335e9ec3e8508b9f7a92c (commit)
       via  c9b92e2870d94a41e3f7b2deade6f49f824086ca (commit)
      from  cf8007208b59037e65cd35c290275647cbef7c15 (commit)


- Shortlog ------------------------------------------------------------
f903f5b Target unstable
c9b92e2 debian/patches/remove-analog-mono.patch:

Summary of changes:
 debian/changelog                        |   11 +++
 debian/patches/remove-analog-mono.patch |  124 +++++++++++++++++++++++++++++++
 debian/patches/series                   |    1 +
 3 files changed, 136 insertions(+), 0 deletions(-)
-----------------------------------------------------------------------
Details of changes:

commit f903f5b2aec23a51b24335e9ec3e8508b9f7a92c
Author: Sjoerd Simons <sjoerd at debian.org>
Date:   Sat Jul 21 18:00:36 2012 +0200

    Target unstable

diff --git a/debian/changelog b/debian/changelog
index 68d2af5..76bee64 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-pulseaudio (2.0-4) UNRELEASED; urgency=low
+pulseaudio (2.0-4) unstable; urgency=low
 
   * debian/patches/remove-analog-mono.patch:
     - Added. Remove analog-output-lfe-on-mono mixer path, although in principle
@@ -7,7 +7,7 @@ pulseaudio (2.0-4) UNRELEASED; urgency=low
       which causes audio in virtualbox not to work out of the box
       (Closes: #673847)
 
- -- Sjoerd Simons <sjoerd at debian.org>  Sat, 21 Jul 2012 17:50:17 +0200
+ -- Sjoerd Simons <sjoerd at debian.org>  Sat, 21 Jul 2012 18:00:28 +0200
 
 pulseaudio (2.0-3) unstable; urgency=low
 

commit c9b92e2870d94a41e3f7b2deade6f49f824086ca
Author: Sjoerd Simons <sjoerd at debian.org>
Date:   Sat Jul 21 17:27:55 2012 +0200

    debian/patches/remove-analog-mono.patch:
    
    * debian/patches/remove-analog-mono.patch:
      - Added. Remove analog-output-lfe-on-mono mixer path, although in principle
        Ac '97 hardware has a seperate mono LFE pin nothing seems to use it. To
        make matters worse it does confused pulseaudios port selection slightly
        which causes audio in virtualbox not to work out of the box
        (Closes: #673847)
    
    Conflicts:
    	debian/changelog
    	debian/patches/series

diff --git a/debian/changelog b/debian/changelog
index 6fbb8a4..68d2af5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+pulseaudio (2.0-4) UNRELEASED; urgency=low
+
+  * debian/patches/remove-analog-mono.patch:
+    - Added. Remove analog-output-lfe-on-mono mixer path, although in principle
+      Ac '97 hardware has a seperate mono LFE pin nothing seems to use it. To
+      make matters worse it does confused pulseaudios port selection slightly
+      which causes audio in virtualbox not to work out of the box
+      (Closes: #673847)
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Sat, 21 Jul 2012 17:50:17 +0200
+
 pulseaudio (2.0-3) unstable; urgency=low
 
   [ Martin-Ã‰ric Racine ]
diff --git a/debian/patches/remove-analog-mono.patch b/debian/patches/remove-analog-mono.patch
new file mode 100644
index 0000000..46e833c
--- /dev/null
+++ b/debian/patches/remove-analog-mono.patch
@@ -0,0 +1,124 @@
+Index: pulseaudio-2.0/src/modules/alsa/mixer/profile-sets/default.conf
+===================================================================
+--- pulseaudio-2.0.orig/src/modules/alsa/mixer/profile-sets/default.conf	2012-05-13 15:26:37.000000000 +0200
++++ pulseaudio-2.0/src/modules/alsa/mixer/profile-sets/default.conf	2012-07-11 10:36:40.594590601 +0200
+@@ -101,42 +101,42 @@
+ [Mapping analog-mono]
+ device-strings = hw:%f
+ channel-map = mono
+-paths-output = analog-output analog-output-speaker analog-output-desktop-speaker analog-output-headphones analog-output-headphones-2 analog-output-mono analog-output-lfe-on-mono
++paths-output = analog-output analog-output-speaker analog-output-desktop-speaker analog-output-headphones analog-output-headphones-2
+ paths-input = analog-input-front-mic analog-input-rear-mic analog-input-internal-mic analog-input-dock-mic analog-input analog-input-mic analog-input-linein analog-input-aux analog-input-video analog-input-tvtuner analog-input-fm analog-input-mic-line
+ priority = 1
+ 
+ [Mapping analog-stereo]
+ device-strings = front:%f hw:%f
+ channel-map = left,right
+-paths-output = analog-output analog-output-speaker analog-output-desktop-speaker analog-output-headphones analog-output-headphones-2 analog-output-mono analog-output-lfe-on-mono
++paths-output = analog-output analog-output-speaker analog-output-desktop-speaker analog-output-headphones analog-output-headphones-2
+ paths-input = analog-input-front-mic analog-input-rear-mic analog-input-internal-mic analog-input-dock-mic analog-input analog-input-mic analog-input-linein analog-input-aux analog-input-video analog-input-tvtuner analog-input-fm analog-input-mic-line
+ priority = 10
+ 
+ [Mapping analog-surround-40]
+ device-strings = surround40:%f
+ channel-map = front-left,front-right,rear-left,rear-right
+-paths-output = analog-output analog-output-speaker analog-output-desktop-speaker analog-output-lfe-on-mono
++paths-output = analog-output analog-output-speaker analog-output-desktop-speaker
+ priority = 7
+ direction = output
+ 
+ [Mapping analog-surround-41]
+ device-strings = surround41:%f
+ channel-map = front-left,front-right,rear-left,rear-right,lfe
+-paths-output = analog-output analog-output-speaker analog-output-desktop-speaker analog-output-lfe-on-mono
++paths-output = analog-output analog-output-speaker analog-output-desktop-speaker
+ priority = 8
+ direction = output
+ 
+ [Mapping analog-surround-50]
+ device-strings = surround50:%f
+ channel-map = front-left,front-right,rear-left,rear-right,front-center
+-paths-output = analog-output analog-output-speaker analog-output-desktop-speaker analog-output-lfe-on-mono
++paths-output = analog-output analog-output-speaker analog-output-desktop-speaker
+ priority = 7
+ direction = output
+ 
+ [Mapping analog-surround-51]
+ device-strings = surround51:%f
+ channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
+-paths-output = analog-output analog-output-speaker analog-output-desktop-speaker analog-output-lfe-on-mono
++paths-output = analog-output analog-output-speaker analog-output-desktop-speaker
+ priority = 8
+ direction = output
+ 
+@@ -144,7 +144,7 @@
+ device-strings = surround71:%f
+ channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe,side-left,side-right
+ description = Analog Surround 7.1
+-paths-output = analog-output analog-output-speaker analog-output-desktop-speaker analog-output-lfe-on-mono
++paths-output = analog-output analog-output-speaker analog-output-desktop-speaker
+ priority = 7
+ direction = output
+ 
+Index: pulseaudio-2.0/src/modules/alsa/mixer/profile-sets/extra-hdmi.conf
+===================================================================
+--- pulseaudio-2.0.orig/src/modules/alsa/mixer/profile-sets/extra-hdmi.conf	2012-05-13 15:26:37.000000000 +0200
++++ pulseaudio-2.0/src/modules/alsa/mixer/profile-sets/extra-hdmi.conf	2012-07-11 10:34:12.474169115 +0200
+@@ -27,42 +27,42 @@
+ [Mapping analog-mono]
+ device-strings = hw:%f
+ channel-map = mono
+-paths-output = analog-output analog-output-speaker analog-output-desktop-speaker analog-output-headphones analog-output-headphones-2 analog-output-mono analog-output-lfe-on-mono
++paths-output = analog-output analog-output-speaker analog-output-desktop-speaker analog-output-headphones analog-output-headphones-2
+ paths-input = analog-input-front-mic analog-input-rear-mic analog-input-internal-mic analog-input-dock-mic analog-input analog-input-mic analog-input-linein analog-input-aux analog-input-video analog-input-tvtuner analog-input-fm analog-input-mic-line
+ priority = 1
+ 
+ [Mapping analog-stereo]
+ device-strings = front:%f hw:%f
+ channel-map = left,right
+-paths-output = analog-output analog-output-speaker analog-output-desktop-speaker analog-output-headphones analog-output-headphones-2 analog-output-mono analog-output-lfe-on-mono
++paths-output = analog-output analog-output-speaker analog-output-desktop-speaker analog-output-headphones analog-output-headphones-2
+ paths-input = analog-input-front-mic analog-input-rear-mic analog-input-internal-mic analog-input-dock-mic analog-input analog-input-mic analog-input-linein analog-input-aux analog-input-video analog-input-tvtuner analog-input-fm analog-input-mic-line
+ priority = 10
+ 
+ [Mapping analog-surround-40]
+ device-strings = surround40:%f
+ channel-map = front-left,front-right,rear-left,rear-right
+-paths-output = analog-output analog-output-speaker analog-output-desktop-speaker analog-output-lfe-on-mono
++paths-output = analog-output analog-output-speaker analog-output-desktop-speaker
+ priority = 7
+ direction = output
+ 
+ [Mapping analog-surround-41]
+ device-strings = surround41:%f
+ channel-map = front-left,front-right,rear-left,rear-right,lfe
+-paths-output = analog-output analog-output-speaker analog-output-desktop-speaker analog-output-lfe-on-mono
++paths-output = analog-output analog-output-speaker analog-output-desktop-speaker
+ priority = 8
+ direction = output
+ 
+ [Mapping analog-surround-50]
+ device-strings = surround50:%f
+ channel-map = front-left,front-right,rear-left,rear-right,front-center
+-paths-output = analog-output analog-output-speaker analog-output-desktop-speaker analog-output-lfe-on-mono
++paths-output = analog-output analog-output-speaker analog-output-desktop-speaker
+ priority = 7
+ direction = output
+ 
+ [Mapping analog-surround-51]
+ device-strings = surround51:%f
+ channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
+-paths-output = analog-output analog-output-speaker analog-output-desktop-speaker analog-output-lfe-on-mono
++paths-output = analog-output analog-output-speaker analog-output-desktop-speaker
+ priority = 8
+ direction = output
+ 
+@@ -70,7 +70,7 @@
+ device-strings = surround71:%f
+ channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe,side-left,side-right
+ description = Analog Surround 7.1
+-paths-output = analog-output analog-output-speaker analog-output-desktop-speaker analog-output-lfe-on-mono
++paths-output = analog-output analog-output-speaker analog-output-desktop-speaker
+ priority = 7
+ direction = output
+ 
diff --git a/debian/patches/series b/debian/patches/series
index c9aa3d0..82acf27 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001_man_page_typos.patch
+remove-analog-mono.patch

-- 
pulseaudio packaging

