[SCM] pulseaudio packaging branch, master, updated. debian/2.1-2-36-g12c95b5

sjoerd at users.alioth.debian.org sjoerd at users.alioth.debian.org
Mon Feb 11 19:04:56 UTC 2013


The branch, master has been updated
       via  12c95b5c3a6d5efe301c907f73ba7fe33f4db00c (commit)
       via  1f0f66638906f1ae75e4de069f0df37c5fd3c68e (commit)
       via  4399be1220d5b361a85cac5695c8ef3ae3e8384d (commit)
       via  679f9bc5414e3ea91519b375bfe3e514ff45a1aa (commit)
       via  24510a07d765707155908f9fd395f6b05da95e9b (commit)
       via  952f9e2655503ff1985b688933f6036c210e7191 (commit)
      from  f8cfc34f15e6d34ce6da22872c0cb5315666a10b (commit)


- Shortlog ------------------------------------------------------------
12c95b5 Added Patches from the 3.0-stable branch:
1f0f666 Target experimental
4399be1 debian/control: Add conflicts & replaces for old pulseaudio-utils
679f9bc New upstream release (3.0)
24510a0 Merge tag 'upstream/3.0'

Summary of changes:
 .tarball-version                                   |    2 +-
 .version                                           |    2 +-
 configure                                          |   22 ++--
 configure.ac                                       |    2 +-
 debian/changelog                                   |   13 ++-
 debian/control                                     |    2 +
 ...Fix-the-analog-output-speaker-always-path.patch |   41 ++++++
 .../0004-man-Update-log-target-documentation.patch |   62 ++++++++
 ...-enable-BlueZ-if-libbluetooth-is-not-foun.patch |   30 ++++
 ...nge_cb-only-when-there-s-an-actual-change.patch |   57 ++++++++
 ...monitor-s-busy-status-to-false-if-we-own-.patch |  150 ++++++++++++++++++++
 debian/patches/series                              |    5 +
 src/daemon/default.pa.in                           |    4 +
 src/modules/alsa/alsa-sink.c                       |    2 +-
 src/modules/alsa/alsa-source.c                     |    2 +-
 src/modules/alsa/alsa-util.c                       |   28 +++--
 src/modules/alsa/alsa-util.h                       |    2 +-
 .../alsa/mixer/paths/analog-input-mic.conf.common  |    3 +
 .../mixer/paths/analog-output-desktop-speaker.conf |    3 +
 .../mixer/paths/analog-output-headphones-2.conf    |    3 +
 .../alsa/mixer/paths/analog-output-headphones.conf |    3 +
 .../mixer/paths/analog-output-speaker-always.conf  |    3 +
 .../alsa/mixer/paths/analog-output-speaker.conf    |    3 +
 src/modules/alsa/mixer/paths/hdmi-output-0.conf    |    3 +
 src/modules/alsa/mixer/paths/hdmi-output-1.conf    |    3 +
 src/modules/alsa/mixer/paths/hdmi-output-2.conf    |    3 +
 src/modules/alsa/mixer/paths/hdmi-output-3.conf    |    3 +
 .../alsa/mixer/profile-sets/90-pulseaudio.rules    |   10 ++
 src/modules/bluetooth/bluetooth-util.c             |   82 ++++++++----
 src/modules/bluetooth/bluetooth-util.h             |    3 +-
 src/modules/bluetooth/module-bluetooth-device.c    |  122 ++++++++++++----
 src/modules/bluetooth/module-bluetooth-discover.c  |    5 +-
 src/modules/bluetooth/module-bluetooth-policy.c    |    4 +
 src/modules/module-stream-restore.c                |   11 +-
 src/modules/module-virtual-surround-sink.c         |    6 +-
 src/pulse/version.h                                |    6 +-
 src/pulsecore/core-util.c                          |    1 -
 src/pulsecore/sink-input.c                         |    8 +
 src/pulsecore/source-output.c                      |   14 ++-
 39 files changed, 624 insertions(+), 104 deletions(-)
-----------------------------------------------------------------------
Details of changes:

commit 12c95b5c3a6d5efe301c907f73ba7fe33f4db00c
Author: Sjoerd Simons <sjoerd at debian.org>
Date:   Mon Feb 11 19:43:33 2013 +0100

    Added Patches from the 3.0-stable branch:
    
    * Added Patches from the 3.0-stable branch:
      * d/patches/0003-alsa-mixer-Fix-the-analog-output-speaker-always-path.patch
      * d/patches/0004-man-Update-log-target-documentation.patch
      * d/patches/0005-build-Don-t-enable-BlueZ-if-libbluetooth-is-not-foun.patch
      * d/patches/0006-Call-change_cb-only-when-there-s-an-actual-change.patch
      * d/patches/0007-Initialize-monitor-s-busy-status-to-false-if-we-own-.patch

diff --git a/debian/changelog b/debian/changelog
index 6634370..ecccfc2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -39,6 +39,12 @@ pulseaudio (3.0-1) experimental; urgency=low
     * Added, Use fix point resampler on ARM
   * New upstream release (3.0)
   * debian/control: Add conflicts & replaces for old pulseaudio-utils
+  * Added Patches from the 3.0-stable branch:
+    * d/patches/0003-alsa-mixer-Fix-the-analog-output-speaker-always-path.patch
+    * d/patches/0004-man-Update-log-target-documentation.patch
+    * d/patches/0005-build-Don-t-enable-BlueZ-if-libbluetooth-is-not-foun.patch
+    * d/patches/0006-Call-change_cb-only-when-there-s-an-actual-change.patch
+    * d/patches/0007-Initialize-monitor-s-busy-status-to-false-if-we-own-.patch
 
  -- Sjoerd Simons <sjoerd at debian.org>  Mon, 11 Feb 2013 19:33:15 +0100
 
diff --git a/debian/patches/0003-alsa-mixer-Fix-the-analog-output-speaker-always-path.patch b/debian/patches/0003-alsa-mixer-Fix-the-analog-output-speaker-always-path.patch
new file mode 100644
index 0000000..ad797e3
--- /dev/null
+++ b/debian/patches/0003-alsa-mixer-Fix-the-analog-output-speaker-always-path.patch
@@ -0,0 +1,41 @@
+From 299e32b767ac60ddbaa747cd03c09b780e364637 Mon Sep 17 00:00:00 2001
+From: David Henningsson <david.henningsson at canonical.com>
+Date: Wed, 19 Dec 2012 11:24:33 +0100
+Subject: [PATCH 3/7] alsa-mixer: Fix the analog-output-speaker-always path
+
+A left over "required-any" made this path useless for most people.
+While we're at it, also add "Front Headphone" like for the normal
+speaker path.
+
+Tested-by: Colin Guthrie <gmane at colin.guthr.ie>
+Signed-off-by: David Henningsson <david.henningsson at canonical.com>
+---
+ src/modules/alsa/mixer/paths/analog-output-speaker-always.conf |    5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/modules/alsa/mixer/paths/analog-output-speaker-always.conf b/src/modules/alsa/mixer/paths/analog-output-speaker-always.conf
+index 3ebdc4a..8a2b3df 100644
+--- a/src/modules/alsa/mixer/paths/analog-output-speaker-always.conf
++++ b/src/modules/alsa/mixer/paths/analog-output-speaker-always.conf
+@@ -30,6 +30,10 @@ device.icon_name = audio-speakers
+ state.plugged = no
+ state.unplugged = unknown
+ 
++[Jack Front Headphone]
++state.plugged = no
++state.unplugged = unknown
++
+ [Element Hardware Master]
+ switch = mute
+ volume = merge
+@@ -132,7 +136,6 @@ switch = mute
+ volume = merge
+ override-map.1 = lfe
+ override-map.2 = lfe,lfe
+-required-any = any
+ 
+ [Element CLFE]
+ switch = mute
+-- 
+1.7.10.4
+
diff --git a/debian/patches/0004-man-Update-log-target-documentation.patch b/debian/patches/0004-man-Update-log-target-documentation.patch
new file mode 100644
index 0000000..719a630
--- /dev/null
+++ b/debian/patches/0004-man-Update-log-target-documentation.patch
@@ -0,0 +1,62 @@
+From e5155b4f505dbc39c54944e369237202f0b42bf6 Mon Sep 17 00:00:00 2001
+From: Tanu Kaskinen <tanuk at iki.fi>
+Date: Mon, 17 Dec 2012 07:46:04 +0200
+Subject: [PATCH 4/7] man: Update log-target documentation.
+
+---
+ man/pulse-daemon.conf.5.xml.in |   15 +++++++++------
+ man/pulseaudio.1.xml.in        |    7 +++++--
+ 2 files changed, 14 insertions(+), 8 deletions(-)
+
+diff --git a/man/pulse-daemon.conf.5.xml.in b/man/pulse-daemon.conf.5.xml.in
+index c270d2b..744e94e 100644
+--- a/man/pulse-daemon.conf.5.xml.in
++++ b/man/pulse-daemon.conf.5.xml.in
+@@ -297,12 +297,15 @@ USA.
+ 
+     <option>
+       <p><opt>log-target=</opt> The default log target. Use either
+-      <opt>stderr</opt>, <opt>syslog</opt> or <opt>auto</opt>. The
+-      latter is equivalent to <opt>sylog</opt> in case
+-      <opt>daemonize</opt> is enabled, otherwise to
+-      <opt>stderr</opt>. Defaults to <opt>auto</opt>. The
+-      <opt>--log-target</opt> command line option takes
+-      precedence.</p>
++      <opt>stderr</opt>, <opt>syslog</opt>, <opt>auto</opt>,
++      <opt>file:PATH</opt> or <opt>newfile:PATH</opt>. <opt>auto</opt> is
++      equivalent to <opt>sylog</opt> in case <opt>daemonize</opt> is enabled,
++      otherwise to <opt>stderr</opt>. If set to <opt>file:PATH</opt>, logging
++      is directed to the file indicated by PATH. <opt>newfile:PATH</opt> is
++      otherwise the same as <opt>file:PATH</opt>, but existing files are never
++      overwritten. If the specified file already exists, a suffix is added to
++      the file name to avoid overwriting. Defaults to <opt>auto</opt>. The
++      <opt>--log-target</opt> command line option takes precedence.</p>
+     </option>
+ 
+     <option>
+diff --git a/man/pulseaudio.1.xml.in b/man/pulseaudio.1.xml.in
+index c556bda..12f05e8 100644
+--- a/man/pulseaudio.1.xml.in
++++ b/man/pulseaudio.1.xml.in
+@@ -217,13 +217,16 @@ USA.
+     </option>
+ 
+     <option>
+-      <p><opt>--log-target</opt><arg>={auto,syslog,stderr,file:PATH}</arg></p>
++      <p><opt>--log-target</opt><arg>={auto,syslog,stderr,file:PATH,newfile:PATH}</arg></p>
+ 
+       <optdesc><p>Specify the log target. If set to <arg>auto</arg>
+       (which is the default), then logging is directed to syslog when
+       <opt>--daemonize</opt> is passed, otherwise to
+       STDERR. If set to <arg>file:PATH</arg>, logging is directed to
+-      the file indicated by PATH.</p></optdesc>
++      the file indicated by PATH. <arg>newfile:PATH</arg> is otherwise
++      the same as file:PATH, but existing files are never overwritten.
++      If the specified file already exists, a suffix is added to the
++      file name to avoid overwriting.</p></optdesc>
+     </option>
+ 
+     <option>
+-- 
+1.7.10.4
+
diff --git a/debian/patches/0005-build-Don-t-enable-BlueZ-if-libbluetooth-is-not-foun.patch b/debian/patches/0005-build-Don-t-enable-BlueZ-if-libbluetooth-is-not-foun.patch
new file mode 100644
index 0000000..becec72
--- /dev/null
+++ b/debian/patches/0005-build-Don-t-enable-BlueZ-if-libbluetooth-is-not-foun.patch
@@ -0,0 +1,30 @@
+From 3ffa0bc62afd8dbfa1d1cd5cef2177a96c461343 Mon Sep 17 00:00:00 2001
+From: Tanu Kaskinen <tanuk at iki.fi>
+Date: Sat, 22 Sep 2012 18:16:24 +0300
+Subject: [PATCH 5/7] build: Don't enable BlueZ if libbluetooth is not found.
+
+Previously, if libsbc was available but libbluetooth was not, BlueZ
+would get incorrectly enabled.
+---
+ configure.ac |    5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 3199d85..d11af11 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1007,8 +1007,9 @@ AS_IF([test "x$enable_bluez" != "xno"],
+     [PKG_CHECK_MODULES(BLUEZ, [ bluez >= 4.99 ], HAVE_BLUEZ=1, HAVE_BLUEZ=0)],
+     HAVE_BLUEZ=0)
+ AS_IF([test "x$enable_bluez" != "xno"],
+-    [PKG_CHECK_MODULES(SBC, [ sbc >= 1.0 ], HAVE_BLUEZ=1, HAVE_BLUEZ=0)],
+-    HAVE_BLUEZ=0)
++    [PKG_CHECK_MODULES(SBC, [ sbc >= 1.0 ], HAVE_SBC=1, HAVE_SBC=0)],
++    HAVE_SBC=0)
++AS_IF([test "x$HAVE_SBC" != "x1"], HAVE_BLUEZ=0)
+ AS_IF([test "x$HAVE_DBUS" != "x1"], HAVE_BLUEZ=0)
+ 
+ AS_IF([test "x$enable_bluez" = "xyes" && test "x$HAVE_BLUEZ" = "x0"],
+-- 
+1.7.10.4
+
diff --git a/debian/patches/0006-Call-change_cb-only-when-there-s-an-actual-change.patch b/debian/patches/0006-Call-change_cb-only-when-there-s-an-actual-change.patch
new file mode 100644
index 0000000..8445879
--- /dev/null
+++ b/debian/patches/0006-Call-change_cb-only-when-there-s-an-actual-change.patch
@@ -0,0 +1,57 @@
+From e02e290d7cccd0cfbc89bacf5c0be7934ee58ece Mon Sep 17 00:00:00 2001
+From: Tanu Kaskinen <tanuk at iki.fi>
+Date: Wed, 16 Jan 2013 03:36:03 +0200
+Subject: [PATCH 6/7] Call change_cb() only when there's an actual change.
+
+Calling change_cb() whenever anything happens in the ownership of the
+bus name caused trouble in PulseAudio in this scenario:
+
+1. PulseAudio is using a device and owns the corresponding service
+   name.
+2. Another application requests device release.
+3. PulseAudio releases the device.
+4. Change in the bus name ownership: PulseAudio gives up the
+   ownership, and nobody owns the name.
+5. reserve-monitor notices that, and notifies PulseAudio.
+6. Since reserve-monitor reports the device as "not busy", PulseAudio
+   decides to reserve the bus name immediately back to itself and
+   opens the device again.
+
+The other application will forcibly take the bus name to itself, as
+it should according to the protocol, but the other application may
+have trouble opening the device if it tries to do that before
+PulseAudio has had time to react to the NameLost signal.
+
+This can be solved by not calling change_cb() if there are no changes
+in the device busy status. In this scenario the device is considered
+"not busy" while PulseAudio is owning the bus name, so PulseAudio gets
+no notification when the ownership changes from PulseAudio to nobody.
+---
+ src/modules/reserve-monitor.c |    4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/modules/reserve-monitor.c b/src/modules/reserve-monitor.c
+index ab453e6..4097a6f 100644
+--- a/src/modules/reserve-monitor.c
++++ b/src/modules/reserve-monitor.c
+@@ -85,6 +85,8 @@ static DBusHandlerResult filter_handler(
+ 			goto invalid;
+ 
+ 		if (strcmp(name, m->service_name) == 0) {
++			unsigned old_busy = m->busy;
++
+ 			m->busy = !!(new && *new);
+ 
+ 			/* If we ourselves own the device, then don't consider this 'busy' */
+@@ -96,7 +98,7 @@ static DBusHandlerResult filter_handler(
+ 						m->busy = FALSE;
+ 			}
+ 
+-			if (m->change_cb) {
++			if (m->busy != old_busy && m->change_cb) {
+ 				m->ref++;
+ 				m->change_cb(m);
+ 				rm_release(m);
+-- 
+1.7.10.4
+
diff --git a/debian/patches/0007-Initialize-monitor-s-busy-status-to-false-if-we-own-.patch b/debian/patches/0007-Initialize-monitor-s-busy-status-to-false-if-we-own-.patch
new file mode 100644
index 0000000..a68d0ec
--- /dev/null
+++ b/debian/patches/0007-Initialize-monitor-s-busy-status-to-false-if-we-own-.patch
@@ -0,0 +1,150 @@
+From b1691402bebfafba9c8055814493f55553f177c1 Mon Sep 17 00:00:00 2001
+From: Tanu Kaskinen <tanuk at iki.fi>
+Date: Wed, 16 Jan 2013 03:36:04 +0200
+Subject: [PATCH 7/7] Initialize monitor's busy status to false if we own the
+ device.
+
+Bug found by David Henningsson.
+---
+ src/modules/reserve-monitor.c |   96 ++++++++++++++++++++++++++++++++++-------
+ 1 file changed, 80 insertions(+), 16 deletions(-)
+
+diff --git a/src/modules/reserve-monitor.c b/src/modules/reserve-monitor.c
+index 4097a6f..4aa4a2b 100644
+--- a/src/modules/reserve-monitor.c
++++ b/src/modules/reserve-monitor.c
+@@ -59,6 +59,23 @@ struct rm_monitor {
+ 	"member='NameOwnerChanged',"		\
+ 	"arg0='%s'"
+ 
++static unsigned get_busy(
++	DBusConnection *c,
++	const char *name_owner) {
++
++	const char *un;
++
++	if (!name_owner || !*name_owner)
++		return FALSE;
++
++	/* If we ourselves own the device, then don't consider this 'busy' */
++	if ((un = dbus_bus_get_unique_name(c)))
++		if (strcmp(name_owner, un) == 0)
++			return FALSE;
++
++	return TRUE;
++}
++
+ static DBusHandlerResult filter_handler(
+ 	DBusConnection *c,
+ 	DBusMessage *s,
+@@ -87,16 +104,7 @@ static DBusHandlerResult filter_handler(
+ 		if (strcmp(name, m->service_name) == 0) {
+ 			unsigned old_busy = m->busy;
+ 
+-			m->busy = !!(new && *new);
+-
+-			/* If we ourselves own the device, then don't consider this 'busy' */
+-			if (m->busy) {
+-				const char *un;
+-
+-				if ((un = dbus_bus_get_unique_name(c)))
+-					if (strcmp(new, un) == 0)
+-						m->busy = FALSE;
+-			}
++			m->busy = get_busy(c, new);
+ 
+ 			if (m->busy != old_busy && m->change_cb) {
+ 				m->ref++;
+@@ -112,14 +120,71 @@ invalid:
+ 	return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+ }
+ 
++static int get_name_owner(
++	DBusConnection *connection,
++	const char *name,
++	char **name_owner,
++	DBusError *error) {
++
++	DBusMessage *msg, *reply;
++	int r;
++
++	*name_owner = NULL;
++
++	if (!(msg = dbus_message_new_method_call(DBUS_SERVICE_DBUS, DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS, "GetNameOwner"))) {
++		r = -ENOMEM;
++		goto fail;
++	}
++
++	if (!dbus_message_append_args(msg, DBUS_TYPE_STRING, &name, DBUS_TYPE_INVALID)) {
++		r = -ENOMEM;
++		goto fail;
++	}
++
++	reply = dbus_connection_send_with_reply_and_block(connection, msg, DBUS_TIMEOUT_USE_DEFAULT, error);
++	dbus_message_unref(msg);
++	msg = NULL;
++
++	if (reply) {
++		if (!dbus_message_get_args(reply, error, DBUS_TYPE_STRING, name_owner, DBUS_TYPE_INVALID)) {
++			dbus_message_unref(reply);
++			r = -EIO;
++			goto fail;
++		}
++
++		*name_owner = strdup(*name_owner);
++		dbus_message_unref(reply);
++
++		if (!*name_owner) {
++			r = -ENOMEM;
++			goto fail;
++		}
++
++	} else if (dbus_error_has_name(error, "org.freedesktop.DBus.Error.NameHasNoOwner"))
++		dbus_error_free(error);
++	else {
++		r = -EIO;
++		goto fail;
++	}
++
++	return 0;
++
++fail:
++	if (msg)
++		dbus_message_unref(msg);
++
++	return r;
++}
++
+ int rm_watch(
+ 	rm_monitor **_m,
+ 	DBusConnection *connection,
+-	const char*device_name,
++	const char *device_name,
+ 	rm_change_cb_t change_cb,
+ 	DBusError *error)  {
+ 
+ 	rm_monitor *m = NULL;
++	char *name_owner;
+ 	int r;
+ 	DBusError _error;
+ 
+@@ -178,12 +243,11 @@ int rm_watch(
+ 
+ 	m->matching = 1;
+ 
+-	m->busy = dbus_bus_name_has_owner(m->connection, m->service_name, error);
+-
+-	if (dbus_error_is_set(error)) {
+-		r = -EIO;
++	if ((r = get_name_owner(m->connection, m->service_name, &name_owner, error)) < 0)
+ 		goto fail;
+-	}
++
++	m->busy = get_busy(m->connection, name_owner);
++	free(name_owner);
+ 
+ 	*_m = m;
+ 	return 0;
+-- 
+1.7.10.4
+
diff --git a/debian/patches/series b/debian/patches/series
index 6e7c1f7..7f55c29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,7 @@
 0001-Switch-the-default-resample-quality-to-1.patch
 0002-Use-the-fixed-point-speex-resampler-on-ARM.patch
+0003-alsa-mixer-Fix-the-analog-output-speaker-always-path.patch
+0004-man-Update-log-target-documentation.patch
+0005-build-Don-t-enable-BlueZ-if-libbluetooth-is-not-foun.patch
+0006-Call-change_cb-only-when-there-s-an-actual-change.patch
+0007-Initialize-monitor-s-busy-status-to-false-if-we-own-.patch

commit 1f0f66638906f1ae75e4de069f0df37c5fd3c68e
Author: Sjoerd Simons <sjoerd at debian.org>
Date:   Mon Feb 11 19:33:31 2013 +0100

    Target experimental

diff --git a/debian/changelog b/debian/changelog
index dc6c3ab..6634370 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-pulseaudio (3.0-1) UNRELEASED; urgency=low
+pulseaudio (3.0-1) experimental; urgency=low
 
   [ Sjoerd Simons ]
   * debian/rules: use xz compression for binary packages. (Patch by Ansgar
@@ -13,7 +13,6 @@ pulseaudio (3.0-1) UNRELEASED; urgency=low
   [ Martin-Éric Racine ]
   * LSB headers: Should-Start: Avahi (Closes: #687890)
 
-
   [ Sjoerd Simons ]
   * debian/README.Debian: Updated & cleaned up
   * Sync with Ubuntu:
@@ -41,7 +40,7 @@ pulseaudio (3.0-1) UNRELEASED; urgency=low
   * New upstream release (3.0)
   * debian/control: Add conflicts & replaces for old pulseaudio-utils
 
- -- Sjoerd Simons <sjoerd at debian.org>  Sun, 10 Feb 2013 17:33:05 +0100
+ -- Sjoerd Simons <sjoerd at debian.org>  Mon, 11 Feb 2013 19:33:15 +0100
 
 pulseaudio (2.1-2) experimental; urgency=low
 

commit 4399be1220d5b361a85cac5695c8ef3ae3e8384d
Author: Sjoerd Simons <sjoerd at debian.org>
Date:   Sun Feb 10 17:34:28 2013 +0100

    debian/control: Add conflicts & replaces for old pulseaudio-utils

diff --git a/debian/changelog b/debian/changelog
index 64b4c79..dc6c3ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -39,8 +39,9 @@ pulseaudio (3.0-1) UNRELEASED; urgency=low
   * debian/patches/0002-Use-the-fixed-point-speex-resampler-on-ARM.patch
     * Added, Use fix point resampler on ARM
   * New upstream release (3.0)
+  * debian/control: Add conflicts & replaces for old pulseaudio-utils
 
- -- Sjoerd Simons <sjoerd at debian.org>  Sun, 10 Feb 2013 17:12:39 +0100
+ -- Sjoerd Simons <sjoerd at debian.org>  Sun, 10 Feb 2013 17:33:05 +0100
 
 pulseaudio (2.1-2) experimental; urgency=low
 
diff --git a/debian/control b/debian/control
index 5219a2e..f6d95b76 100644
--- a/debian/control
+++ b/debian/control
@@ -410,6 +410,8 @@ Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: pulseaudio-utils (< 3.0)
+Replaces: pulseaudio-utils (< 3.0)
 Description: PulseAudio OSS pre-load library
  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 679f9bc5414e3ea91519b375bfe3e514ff45a1aa
Author: Sjoerd Simons <sjoerd at debian.org>
Date:   Sun Feb 10 17:02:13 2013 +0100

    New upstream release (3.0)

diff --git a/debian/changelog b/debian/changelog
index 386033f..64b4c79 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-pulseaudio (2.99.2-1) UNRELEASED; urgency=low
+pulseaudio (3.0-1) UNRELEASED; urgency=low
 
   [ Sjoerd Simons ]
   * debian/rules: use xz compression for binary packages. (Patch by Ansgar
@@ -38,8 +38,9 @@ pulseaudio (2.99.2-1) UNRELEASED; urgency=low
     * Added, Switch to a lower speex resampler quality level
   * debian/patches/0002-Use-the-fixed-point-speex-resampler-on-ARM.patch
     * Added, Use fix point resampler on ARM
+  * New upstream release (3.0)
 
- -- Sjoerd Simons <sjoerd at debian.org>  Sun, 25 Nov 2012 23:02:56 +0100
+ -- Sjoerd Simons <sjoerd at debian.org>  Sun, 10 Feb 2013 17:12:39 +0100
 
 pulseaudio (2.1-2) experimental; urgency=low
 

commit 24510a07d765707155908f9fd395f6b05da95e9b
Merge: f8cfc34f15e6d34ce6da22872c0cb5315666a10b 952f9e2655503ff1985b688933f6036c210e7191
Author: Sjoerd Simons <sjoerd at debian.org>
Date:   Sun Feb 10 17:00:58 2013 +0100

    Merge tag 'upstream/3.0'
    
    Upstream version 3.0


-- 
pulseaudio packaging



More information about the pkg-pulseaudio-devel mailing list