[Pkg-pulseaudio-devel] [SCM] pulseaudio packaging branch, master, updated. debian/0.9.15-2-7-gde9f6ef

sjoerd at users.alioth.debian.org sjoerd at users.alioth.debian.org
Sun Jun 7 21:04:32 UTC 2009


The branch, master has been updated
       via  de9f6ef52d53c72d2924550ac1d618f4fcd4cfde (commit)
       via  58b895c644dbc3f43e4c37bf83823a7b7cd1961b (commit)
       via  53d2b9c14dff098877d4689fd0257b2f53dc90c6 (commit)
       via  783b2ab790a0e98e53bef17eabb4c21877e82781 (commit)
       via  890a6a8a568522b1db60d3a7fe9183bc17082bf0 (commit)
       via  fc7061f8c8982a2f6b0e181ce4630b7446dac9d1 (commit)
      from  66e90a849d8c275b2c9e9ec9992bf77cb3f5cf1c (commit)


- Shortlog ------------------------------------------------------------
de9f6ef Prevent the default.pa manpage from being installed as part of the pa locale (Closes: #508874)
58b895c Change the libjack0.100.0-dev build-depend to libjack-dev as per request of the debian multimedia maintainers (Closes: #527424)
53d2b9c Add support for the status action in the init script, patch by Peter Eisentraut (Closes: #527333)
783b2ab add 0001-alsa-allow-configuration-of-fallback-device-strings-.patch
890a6a8 No longer recommend padevchooser and let paprefs be a suggest (Closes: #530810)
fc7061f Close bug request bluetooth to be reenabled

Summary of changes:
 debian/changelog                                   |   15 +-
 debian/control                                     |    8 +-
 ...configuration-of-fallback-device-strings-.patch |  339 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 debian/pulseaudio.init                             |    8 +-
 debian/pulseaudio.manpages                         |    1 -
 debian/rules                                       |    3 +
 7 files changed, 366 insertions(+), 9 deletions(-)
-----------------------------------------------------------------------
Details of changes:

commit de9f6ef52d53c72d2924550ac1d618f4fcd4cfde
Author: Sjoerd Simons <sjoerd at debian.org>
Date:   Sun Jun 7 21:58:35 2009 +0100

    Prevent the default.pa manpage from being installed as part of the pa locale (Closes: #508874)

diff --git a/debian/changelog b/debian/changelog
index 23e4a1d..c94108e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,8 +10,10 @@ pulseaudio (0.9.15-3) UNRELEASED; urgency=low
     Eisentraut (Closes: #527333)
   * Change the libjack0.100.0-dev build-depend to libjack-dev as per request of
     the debian multimedia maintainers (Closes: #527424)
+  * Prevent the default.pa manpage from being installed as part of the pa
+    locale (Closes: #508874)
 
- -- Sjoerd Simons <sjoerd at debian.org>  Sun, 07 Jun 2009 20:49:03 +0100
+ -- Sjoerd Simons <sjoerd at debian.org>  Sun, 07 Jun 2009 21:57:25 +0100
 
 pulseaudio (0.9.15-2) unstable; urgency=low
 
diff --git a/debian/pulseaudio.manpages b/debian/pulseaudio.manpages
index 9d4046d..c96c6b1 100644
--- a/debian/pulseaudio.manpages
+++ b/debian/pulseaudio.manpages
@@ -1,4 +1,3 @@
 debian/manpages/pulseaudio.1
-debian/tmp/usr/share/man/man5/default.pa.5
 debian/tmp/usr/share/man/man5/pulse-client.conf.5
 debian/tmp/usr/share/man/man5/pulse-daemon.conf.5
diff --git a/debian/rules b/debian/rules
index 9fbb01e..4fcf08e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,6 +16,9 @@ common-install-arch::
 	mkdir -p $(CURDIR)/debian/tmp/usr/share/lintian
 	cp -a $(CURDIR)/debian/overrides $(CURDIR)/debian/tmp/usr/share/lintian
 
+pulseaudio-install-arch::
+	dh_installman --language=C debian/tmp/usr/share/man/man5/default.pa.5
+
 common-binary-post-install-arch:: list-missing
 
 clean::

commit 58b895c644dbc3f43e4c37bf83823a7b7cd1961b
Author: Sjoerd Simons <sjoerd at debian.org>
Date:   Sun Jun 7 20:52:44 2009 +0100

    Change the libjack0.100.0-dev build-depend to libjack-dev as per request of the debian multimedia maintainers (Closes: #527424)

diff --git a/debian/changelog b/debian/changelog
index a6e9595..23e4a1d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,10 @@ pulseaudio (0.9.15-3) UNRELEASED; urgency=low
       front device even though they can do 2ch stereo (from upstream git)
   * Add support for the status action in the init script, patch by Peter
     Eisentraut (Closes: #527333)
+  * Change the libjack0.100.0-dev build-depend to libjack-dev as per request of
+    the debian multimedia maintainers (Closes: #527424)
 
- -- Sjoerd Simons <sjoerd at debian.org>  Sun, 07 Jun 2009 20:44:36 +0100
+ -- Sjoerd Simons <sjoerd at debian.org>  Sun, 07 Jun 2009 20:49:03 +0100
 
 pulseaudio (0.9.15-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 526cd88..ec078b4 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 5), cdbs, quilt, m4, libltdl-dev (>= 2.2.6a-2),
     x11proto-core-dev, libxt-dev, libglib2.0-dev,
     libcap-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
     libasound2-dev (>= 1.0.19) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
-    libavahi-client-dev, libjack0.100.0-dev, libwrap0-dev,
+    libavahi-client-dev, libjack-dev, libwrap0-dev,
     liblircclient-dev, libgconf2-dev, libhal-dev, libasyncns-dev,
     libatomic-ops-dev, libspeexdsp-dev (>= 1.2~rc1),
     libbluetooth-dev (>= 4.40) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],

commit 53d2b9c14dff098877d4689fd0257b2f53dc90c6
Author: Sjoerd Simons <sjoerd at debian.org>
Date:   Sun Jun 7 20:46:54 2009 +0100

    Add support for the status action in the init script, patch by Peter Eisentraut (Closes: #527333)

diff --git a/debian/changelog b/debian/changelog
index 8cc95e6..a6e9595 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,10 @@ pulseaudio (0.9.15-3) UNRELEASED; urgency=low
   * 0001-alsa-allow-configuration-of-fallback-device-strings-.patch
     - Added. Support alsa devices which only have the raw hw device, but no
       front device even though they can do 2ch stereo (from upstream git)
+  * Add support for the status action in the init script, patch by Peter
+    Eisentraut (Closes: #527333)
 
- -- Sjoerd Simons <sjoerd at debian.org>  Sun, 07 Jun 2009 20:33:03 +0100
+ -- Sjoerd Simons <sjoerd at debian.org>  Sun, 07 Jun 2009 20:44:36 +0100
 
 pulseaudio (0.9.15-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 5459c3c..526cd88 100644
--- a/debian/control
+++ b/debian/control
@@ -23,7 +23,7 @@ Homepage: http://www.pulseaudio.org
 Package: pulseaudio
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, adduser,
-  lsb-base (>= 3), consolekit
+  lsb-base (>= 3.2-13), consolekit
 Conflicts: libltdl3 (<< 1.5.24-1)
 Recommends: pulseaudio-module-hal, pulseaudio-module-x11,
     libasound2-plugins, gstreamer0.10-pulseaudio,
diff --git a/debian/pulseaudio.init b/debian/pulseaudio.init
index 5bb7b79..2cf01ca 100755
--- a/debian/pulseaudio.init
+++ b/debian/pulseaudio.init
@@ -23,9 +23,9 @@ test -x $DAEMON || exit 0
 PULSEAUDIO_SYSTEM_START=0
 DISALLOW_MODULE_LOADING=1
 test -f /etc/default/pulseaudio && . /etc/default/pulseaudio
-test "$PULSEAUDIO_SYSTEM_START" != "1" && exit 0
 
 pulseaudio_start () {
+	test "$PULSEAUDIO_SYSTEM_START" != "1" && exit 0
 	log_begin_msg "Starting PulseAudio Daemon"
 	start-stop-daemon -x $DAEMON -p $PIDFILE --start -- --system --daemonize --high-priority --log-target=syslog --disallow-module-loading=$DISALLOW_MODULE_LOADING
 	status=$?
@@ -60,8 +60,12 @@ case "$1" in
 		sleep 2
 		killall -9 pulseaudio || true
 		;;
+	status)
+		status_of_proc $DAEMON pulseaudio -p $PIDFILE
+		exit $?
+		;;
 	*)
-		echo "Usage: /etc/init.d/pulseaudio {start|stop|force-stop|restart|reload|force-reload}"
+		echo "Usage: /etc/init.d/pulseaudio {start|stop|force-stop|restart|reload|force-reload|status}"
 		exit 1
 		;;
 esac

commit 783b2ab790a0e98e53bef17eabb4c21877e82781
Author: Sjoerd Simons <sjoerd at debian.org>
Date:   Sun Jun 7 20:34:42 2009 +0100

    add 0001-alsa-allow-configuration-of-fallback-device-strings-.patch
    
    * 0001-alsa-allow-configuration-of-fallback-device-strings-.patch
      - Added. Support alsa devices which only have the raw hw device, but no
        front device even though they can do 2ch stereo (from upstream git)

diff --git a/debian/changelog b/debian/changelog
index d3e22b5..8cc95e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,11 @@ pulseaudio (0.9.15-3) UNRELEASED; urgency=low
   * Re-enable bluetooth support (Closes: #530514)
   * No longer recommend padevchooser and let paprefs be a suggest
     (Closes: #530810)
+  * 0001-alsa-allow-configuration-of-fallback-device-strings-.patch
+    - Added. Support alsa devices which only have the raw hw device, but no
+      front device even though they can do 2ch stereo (from upstream git)
 
- -- Sjoerd Simons <sjoerd at debian.org>  Sun, 07 Jun 2009 20:21:15 +0100
+ -- Sjoerd Simons <sjoerd at debian.org>  Sun, 07 Jun 2009 20:33:03 +0100
 
 pulseaudio (0.9.15-2) unstable; urgency=low
 
diff --git a/debian/patches/0001-alsa-allow-configuration-of-fallback-device-strings-.patch b/debian/patches/0001-alsa-allow-configuration-of-fallback-device-strings-.patch
new file mode 100644
index 0000000..1c1b15a
--- /dev/null
+++ b/debian/patches/0001-alsa-allow-configuration-of-fallback-device-strings-.patch
@@ -0,0 +1,339 @@
+From 270ab5f0f2c049f842e5b4a7f69c59db84827c5d Mon Sep 17 00:00:00 2001
+From: Lennart Poettering <lennart at poettering.net>
+Date: Wed, 29 Apr 2009 01:58:18 +0200
+Subject: [PATCH] alsa: allow configuration of fallback device strings in profiles
+
+This has the benefit that we can properly support ALSA devices where
+only the raw 'hw' device exists but no 'front' although it's a proper
+2ch stereo device.
+---
+ src/modules/alsa/alsa-util.c |  126 +++++++++++++++++++++++++++++------------
+ src/modules/alsa/alsa-util.h |    1 +
+ 2 files changed, 90 insertions(+), 37 deletions(-)
+
+diff --git a/src/modules/alsa/alsa-util.c b/src/modules/alsa/alsa-util.c
+index d2dc6e8..2ea0c3d 100644
+--- a/src/modules/alsa/alsa-util.c
++++ b/src/modules/alsa/alsa-util.c
+@@ -526,7 +526,7 @@ int pa_alsa_set_sw_params(snd_pcm_t *pcm, snd_pcm_uframes_t avail_min) {
+ 
+ static const struct pa_alsa_profile_info device_table[] = {
+     {{ 1, { PA_CHANNEL_POSITION_MONO }},
+-     "hw",
++     "hw", NULL,
+      N_("Analog Mono"),
+      "analog-mono",
+      1,
+@@ -534,7 +534,7 @@ static const struct pa_alsa_profile_info device_table[] = {
+      "Capture", "Mic" },
+ 
+     {{ 2, { PA_CHANNEL_POSITION_LEFT, PA_CHANNEL_POSITION_RIGHT }},
+-     "front",
++     "front", "hw",
+      N_("Analog Stereo"),
+      "analog-stereo",
+      10,
+@@ -542,7 +542,7 @@ static const struct pa_alsa_profile_info device_table[] = {
+      "Capture", "Mic" },
+ 
+     {{ 2, { PA_CHANNEL_POSITION_LEFT, PA_CHANNEL_POSITION_RIGHT }},
+-     "iec958",
++     "iec958", NULL,
+      N_("Digital Stereo (IEC958)"),
+      "iec958-stereo",
+      5,
+@@ -550,7 +550,7 @@ static const struct pa_alsa_profile_info device_table[] = {
+      "IEC958 In", NULL },
+ 
+     {{ 2, { PA_CHANNEL_POSITION_LEFT, PA_CHANNEL_POSITION_RIGHT }},
+-     "hdmi",
++     "hdmi", NULL,
+      N_("Digital Stereo (HDMI)"),
+      "hdmi-stereo",
+      4,
+@@ -559,7 +559,7 @@ static const struct pa_alsa_profile_info device_table[] = {
+ 
+     {{ 4, { PA_CHANNEL_POSITION_FRONT_LEFT, PA_CHANNEL_POSITION_FRONT_RIGHT,
+             PA_CHANNEL_POSITION_REAR_LEFT, PA_CHANNEL_POSITION_REAR_RIGHT }},
+-     "surround40",
++     "surround40", NULL,
+      N_("Analog Surround 4.0"),
+      "analog-surround-40",
+      7,
+@@ -568,7 +568,7 @@ static const struct pa_alsa_profile_info device_table[] = {
+ 
+     {{ 4, { PA_CHANNEL_POSITION_FRONT_LEFT, PA_CHANNEL_POSITION_FRONT_RIGHT,
+             PA_CHANNEL_POSITION_REAR_LEFT, PA_CHANNEL_POSITION_REAR_RIGHT }},
+-     "a52",
++     "a52", NULL,
+      N_("Digital Surround 4.0 (IEC958/AC3)"),
+      "iec958-ac3-surround-40",
+      2,
+@@ -578,7 +578,7 @@ static const struct pa_alsa_profile_info device_table[] = {
+     {{ 5, { PA_CHANNEL_POSITION_FRONT_LEFT, PA_CHANNEL_POSITION_FRONT_RIGHT,
+             PA_CHANNEL_POSITION_REAR_LEFT, PA_CHANNEL_POSITION_REAR_RIGHT,
+             PA_CHANNEL_POSITION_LFE }},
+-     "surround41",
++     "surround41", NULL,
+      N_("Analog Surround 4.1"),
+      "analog-surround-41",
+      7,
+@@ -588,7 +588,7 @@ static const struct pa_alsa_profile_info device_table[] = {
+     {{ 5, { PA_CHANNEL_POSITION_FRONT_LEFT, PA_CHANNEL_POSITION_FRONT_RIGHT,
+             PA_CHANNEL_POSITION_REAR_LEFT, PA_CHANNEL_POSITION_REAR_RIGHT,
+             PA_CHANNEL_POSITION_CENTER }},
+-     "surround50",
++     "surround50", NULL,
+      N_("Analog Surround 5.0"),
+      "analog-surround-50",
+      7,
+@@ -598,7 +598,7 @@ static const struct pa_alsa_profile_info device_table[] = {
+     {{ 6, { PA_CHANNEL_POSITION_FRONT_LEFT, PA_CHANNEL_POSITION_FRONT_RIGHT,
+             PA_CHANNEL_POSITION_REAR_LEFT, PA_CHANNEL_POSITION_REAR_RIGHT,
+             PA_CHANNEL_POSITION_CENTER, PA_CHANNEL_POSITION_LFE }},
+-     "surround51",
++     "surround51", NULL,
+      N_("Analog Surround 5.1"),
+      "analog-surround-51",
+      8,
+@@ -608,7 +608,7 @@ static const struct pa_alsa_profile_info device_table[] = {
+     {{ 6, { PA_CHANNEL_POSITION_FRONT_LEFT, PA_CHANNEL_POSITION_FRONT_RIGHT,
+             PA_CHANNEL_POSITION_REAR_LEFT, PA_CHANNEL_POSITION_REAR_RIGHT,
+             PA_CHANNEL_POSITION_FRONT_CENTER, PA_CHANNEL_POSITION_LFE}},
+-     "a52",
++     "a52", NULL,
+      N_("Digital Surround 5.1 (IEC958/AC3)"),
+      "iec958-ac3-surround-51",
+      3,
+@@ -619,16 +619,72 @@ static const struct pa_alsa_profile_info device_table[] = {
+             PA_CHANNEL_POSITION_REAR_LEFT, PA_CHANNEL_POSITION_REAR_RIGHT,
+             PA_CHANNEL_POSITION_CENTER, PA_CHANNEL_POSITION_LFE,
+             PA_CHANNEL_POSITION_SIDE_LEFT, PA_CHANNEL_POSITION_SIDE_RIGHT }},
+-     "surround71",
++     "surround71", NULL,
+      N_("Analog Surround 7.1"),
+      "analog-surround-71",
+      7,
+      "Master", "PCM",
+      "Capture", "Mic" },
+ 
+-    {{ 0, { 0 }}, NULL, NULL, NULL, 0, NULL, NULL, NULL, NULL }
++    {{ 0, { 0 }}, NULL, NULL, NULL, NULL, 0, NULL, NULL, NULL, NULL }
+ };
+ 
++static snd_pcm_t *open_by_device_string_with_fallback(
++        const char *prefix,
++        const char *prefix_fallback,
++        const char *dev_id,
++        char **dev,
++        pa_sample_spec *ss,
++        pa_channel_map* map,
++        int mode,
++        uint32_t *nfrags,
++        snd_pcm_uframes_t *period_size,
++        snd_pcm_uframes_t tsched_size,
++        pa_bool_t *use_mmap,
++        pa_bool_t *use_tsched,
++        pa_bool_t require_exact_channel_number) {
++
++    snd_pcm_t *pcm_handle;
++    char *d;
++
++    d = pa_sprintf_malloc("%s:%s", prefix, dev_id);
++
++    pcm_handle = pa_alsa_open_by_device_string(
++            d,
++            dev,
++            ss,
++            map,
++            mode,
++            nfrags,
++            period_size,
++            tsched_size,
++            use_mmap,
++            use_tsched,
++            require_exact_channel_number);
++    pa_xfree(d);
++
++    if (!pcm_handle && prefix_fallback) {
++
++        d = pa_sprintf_malloc("%s:%s", prefix_fallback, dev_id);
++
++        pcm_handle = pa_alsa_open_by_device_string(
++                d,
++                dev,
++                ss,
++                map,
++                mode,
++                nfrags,
++                period_size,
++                tsched_size,
++                use_mmap,
++                use_tsched,
++                require_exact_channel_number);
++        pa_xfree(d);
++    }
++
++    return pcm_handle;
++}
++
+ snd_pcm_t *pa_alsa_open_by_device_id_auto(
+         const char *dev_id,
+         char **dev,
+@@ -669,14 +725,14 @@ snd_pcm_t *pa_alsa_open_by_device_id_auto(
+ 
+             pa_log_debug("Checking for %s (%s)", device_table[i].name, device_table[i].alsa_name);
+ 
+-            d = pa_sprintf_malloc("%s:%s", device_table[i].alsa_name, dev_id);
+-
+             try_ss.channels = device_table[i].map.channels;
+             try_ss.rate = ss->rate;
+             try_ss.format = ss->format;
+ 
+-            pcm_handle = pa_alsa_open_by_device_string(
+-                    d,
++            pcm_handle = open_by_device_string_with_fallback(
++                    device_table[i].alsa_name,
++                    device_table[i].alsa_name_fallback,
++                    dev_id,
+                     dev,
+                     &try_ss,
+                     map,
+@@ -688,8 +744,6 @@ snd_pcm_t *pa_alsa_open_by_device_id_auto(
+                     use_tsched,
+                     TRUE);
+ 
+-            pa_xfree(d);
+-
+             if (pcm_handle) {
+ 
+                 *ss = try_ss;
+@@ -701,6 +755,7 @@ snd_pcm_t *pa_alsa_open_by_device_id_auto(
+ 
+                 return pcm_handle;
+             }
++
+         }
+ 
+         if (direction > 0) {
+@@ -773,7 +828,6 @@ snd_pcm_t *pa_alsa_open_by_device_id_profile(
+         pa_bool_t *use_tsched,
+         const pa_alsa_profile_info *profile) {
+ 
+-    char *d;
+     snd_pcm_t *pcm_handle;
+     pa_sample_spec try_ss;
+ 
+@@ -785,14 +839,14 @@ snd_pcm_t *pa_alsa_open_by_device_id_profile(
+     pa_assert(period_size);
+     pa_assert(profile);
+ 
+-    d = pa_sprintf_malloc("%s:%s", profile->alsa_name, dev_id);
+-
+     try_ss.channels = profile->map.channels;
+     try_ss.rate = ss->rate;
+     try_ss.format = ss->format;
+ 
+-    pcm_handle = pa_alsa_open_by_device_string(
+-            d,
++    pcm_handle = open_by_device_string_with_fallback(
++            profile->alsa_name,
++            profile->alsa_name_fallback,
++            dev_id,
+             dev,
+             &try_ss,
+             map,
+@@ -804,8 +858,6 @@ snd_pcm_t *pa_alsa_open_by_device_id_profile(
+             use_tsched,
+             TRUE);
+ 
+-    pa_xfree(d);
+-
+     if (!pcm_handle)
+         return NULL;
+ 
+@@ -858,6 +910,8 @@ snd_pcm_t *pa_alsa_open_by_device_string(
+             goto fail;
+         }
+ 
++        pa_log_debug("Managed to open %s", d);
++
+         if ((err = pa_alsa_set_hw_params(pcm_handle, ss, nfrags, period_size, tsched_size, use_mmap, use_tsched, require_exact_channel_number)) < 0) {
+ 
+             if (!reformat) {
+@@ -926,26 +980,25 @@ int pa_alsa_probe_profiles(
+         snd_pcm_t *pcm_i = NULL;
+ 
+         if (i->alsa_name) {
+-            char *id;
+             pa_sample_spec try_ss;
+             pa_channel_map try_map;
+ 
+             pa_log_debug("Checking for playback on %s (%s)", i->name, i->alsa_name);
+-            id = pa_sprintf_malloc("%s:%s", i->alsa_name, dev_id);
+ 
+             try_ss = *ss;
+             try_ss.channels = i->map.channels;
+             try_map = i->map;
+ 
+-            pcm_i = pa_alsa_open_by_device_string(
+-                    id, NULL,
++            pcm_i = open_by_device_string_with_fallback(
++                    i->alsa_name,
++                    i->alsa_name_fallback,
++                    dev_id,
++                    NULL,
+                     &try_ss, &try_map,
+                     SND_PCM_STREAM_PLAYBACK,
+                     NULL, NULL, 0, NULL, NULL,
+                     TRUE);
+ 
+-            pa_xfree(id);
+-
+             if (!pcm_i)
+                 continue;
+         }
+@@ -954,26 +1007,25 @@ int pa_alsa_probe_profiles(
+             snd_pcm_t *pcm_j = NULL;
+ 
+             if (j->alsa_name) {
+-                char *jd;
+                 pa_sample_spec try_ss;
+                 pa_channel_map try_map;
+ 
+                 pa_log_debug("Checking for capture on %s (%s)", j->name, j->alsa_name);
+-                jd = pa_sprintf_malloc("%s:%s", j->alsa_name, dev_id);
+ 
+                 try_ss = *ss;
+                 try_ss.channels = j->map.channels;
+                 try_map = j->map;
+ 
+-                pcm_j = pa_alsa_open_by_device_string(
+-                        jd, NULL,
++                pcm_j = open_by_device_string_with_fallback(
++                        j->alsa_name,
++                        j->alsa_name_fallback,
++                        dev_id,
++                        NULL,
+                         &try_ss, &try_map,
+                         SND_PCM_STREAM_CAPTURE,
+                         NULL, NULL, 0, NULL, NULL,
+                         TRUE);
+ 
+-                pa_xfree(jd);
+-
+                 if (!pcm_j)
+                     continue;
+             }
+diff --git a/src/modules/alsa/alsa-util.h b/src/modules/alsa/alsa-util.h
+index c8acc7c..c3a8117 100644
+--- a/src/modules/alsa/alsa-util.h
++++ b/src/modules/alsa/alsa-util.h
+@@ -56,6 +56,7 @@ int pa_alsa_set_sw_params(snd_pcm_t *pcm, snd_pcm_uframes_t avail_min);
+ typedef struct pa_alsa_profile_info {
+     pa_channel_map map;
+     const char *alsa_name;
++    const char *alsa_name_fallback;
+     const char *description; /* internationalized */
+     const char *name;
+     unsigned priority;
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..3cfaf5b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-alsa-allow-configuration-of-fallback-device-strings-.patch

commit 890a6a8a568522b1db60d3a7fe9183bc17082bf0
Author: Sjoerd Simons <sjoerd at debian.org>
Date:   Sun Jun 7 20:29:04 2009 +0100

    No longer recommend padevchooser and let paprefs be a suggest (Closes: #530810)

diff --git a/debian/changelog b/debian/changelog
index 2104aa8..d3e22b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
 pulseaudio (0.9.15-3) UNRELEASED; urgency=low
 
   * Re-enable bluetooth support (Closes: #530514)
+  * No longer recommend padevchooser and let paprefs be a suggest
+    (Closes: #530810)
 
- -- Sjoerd Simons <sjoerd at debian.org>  Sat, 23 May 2009 13:42:44 +0100
+ -- Sjoerd Simons <sjoerd at debian.org>  Sun, 07 Jun 2009 20:21:15 +0100
 
 pulseaudio (0.9.15-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index e68768a..5459c3c 100644
--- a/debian/control
+++ b/debian/control
@@ -27,8 +27,8 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, adduser,
 Conflicts: libltdl3 (<< 1.5.24-1)
 Recommends: pulseaudio-module-hal, pulseaudio-module-x11,
     libasound2-plugins, gstreamer0.10-pulseaudio,
-    pulseaudio-esound-compat, paprefs, padevchooser
-Suggests: pulseaudio-utils, pavumeter, pavucontrol, paman
+    pulseaudio-esound-compat
+Suggests: pulseaudio-utils, pavumeter, pavucontrol, paman, paprefs
 Description: PulseAudio sound server
  PulseAudio, previously known as Polypaudio, is a sound server for POSIX and
  WIN32 systems. It is a drop in replacement for the ESD sound server with

commit fc7061f8c8982a2f6b0e181ce4630b7446dac9d1
Author: Sjoerd Simons <sjoerd at debian.org>
Date:   Sun Jun 7 20:19:59 2009 +0100

    Close bug request bluetooth to be reenabled

diff --git a/debian/changelog b/debian/changelog
index 2a321d0..2104aa8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 pulseaudio (0.9.15-3) UNRELEASED; urgency=low
 
-  * Re-enable bluetooth support
+  * Re-enable bluetooth support (Closes: #530514)
 
  -- Sjoerd Simons <sjoerd at debian.org>  Sat, 23 May 2009 13:42:44 +0100
 

-- 
pulseaudio packaging



More information about the Pkg-pulseaudio-devel mailing list