[Pkg-pulseaudio-devel] [SCM] pulseaudio packaging branch, master, updated. debian/0.9.13-2-4-g79199fd
sjoerd at users.alioth.debian.org
sjoerd at users.alioth.debian.org
Sun Feb 1 12:07:45 UTC 2009
The branch, master has been updated
via 79199fdbb1169dd39fb52eb2371096374a21f9e0 (commit)
via 90cac3fef650a5f99acc5a0b8d6ae0033bcbf02d (commit)
from 2972fb1616016c230fee45f39aaba54e51b10d34 (commit)
- Shortlog ------------------------------------------------------------
79199fd Updated patch series
90cac3f Start 0.9.14 packaging
Summary of changes:
debian/changelog | 16 +++++++
...ry-search-path-to-include-lib-and-usr-lib.patch | 24 ----------
.../patches/0001-load-module-gconf-earlier.patch | 45 +++++++++++++++++++
.../patches/0002-load-module-gconf-earlier.patch | 46 --------------------
...o-use-64bit-rounding-even-on-32bit-machin.patch | 40 -----------------
...move-dbus-matches-an-filters-when-unloadi.patch | 38 ----------------
.../0005-Fix-two-typos-that-broke-tunnels.patch | 32 --------------
debian/patches/series | 6 +--
8 files changed, 62 insertions(+), 185 deletions(-)
-----------------------------------------------------------------------
Details of changes:
commit 79199fdbb1169dd39fb52eb2371096374a21f9e0
Author: Sjoerd Simons <sjoerd at debian.org>
Date: Sun Feb 1 12:07:39 2009 +0000
Updated patch series
* 0002-load-module-gconf-earlier.patch renamed to
0001-load-module-gconf-earlier.patch and updated
* 0001-Fix-library-search-path-to-include-lib-and-usr-lib.patch
- Removed, no longer applicable
* 0003-make-sure-to-use-64bit-rounding-even-on-32bit-machin.patch
- Removed, fixed upstream
* 0004-properly-remove-dbus-matches-an-filters-when-unloadi.patch
- Removed, fixed upstream
* debian/patches/series
- Updated
diff --git a/debian/changelog b/debian/changelog
index 1be721e..c093842 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,18 @@
pulseaudio (0.9.14-1) UNRELEASED; urgency=low
* New Upstream Version
+ * 0002-load-module-gconf-earlier.patch renamed to
+ 0001-load-module-gconf-earlier.patch and updated
+ * 0001-Fix-library-search-path-to-include-lib-and-usr-lib.patch
+ - Removed, no longer applicable
+ * 0003-make-sure-to-use-64bit-rounding-even-on-32bit-machin.patch
+ - Removed, fixed upstream
+ * 0004-properly-remove-dbus-matches-an-filters-when-unloadi.patch
+ - Removed, fixed upstream
+ * debian/patches/series
+ - Updated
- -- Sjoerd Simons <sjoerd at debian.org> Sun, 01 Feb 2009 11:44:22 +0000
+ -- Sjoerd Simons <sjoerd at debian.org> Sun, 01 Feb 2009 12:04:39 +0000
pulseaudio (0.9.13-2) experimental; urgency=low
diff --git a/debian/patches/0001-Fix-library-search-path-to-include-lib-and-usr-lib.patch b/debian/patches/0001-Fix-library-search-path-to-include-lib-and-usr-lib.patch
deleted file mode 100644
index eb42734..0000000
--- a/debian/patches/0001-Fix-library-search-path-to-include-lib-and-usr-lib.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From ee025936469de666ba0b9308c4955ca85a1ce251 Mon Sep 17 00:00:00 2001
-From: Courteney van den Berg <vdberg at ffm.tc.iot.dtag.de>
-Date: Mon, 31 Mar 2008 17:11:29 +0200
-Subject: [PATCH] Fix library search path to include /lib and /usr/lib
-
----
- aclocal.m4 | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/aclocal.m4 b/aclocal.m4
-index 85fd9db..691752b 100644
---- a/aclocal.m4
-+++ b/aclocal.m4
-@@ -2141,8 +2141,8 @@ linux* | k*bsd*-gnu)
- # Some rework will be needed to allow for fast_install
- # before this can be enabled.
- hardcode_into_libs=yes
-- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-+ sys_lib_search_path_spec="/usr/lib /usr/lib${libsuff} /lib /lib${libsuff} /usr/local/lib${libsuff}"
-+ sys_lib_dlsearch_path_spec="/usr/lib /usr/lib${libsuff} /lib /lib${libsuff}"
-
- # Append ld.so.conf contents to the search path
- if test -f /etc/ld.so.conf; then
diff --git a/debian/patches/0002-load-module-gconf-earlier.patch b/debian/patches/0001-load-module-gconf-earlier.patch
similarity index 73%
rename from debian/patches/0002-load-module-gconf-earlier.patch
rename to debian/patches/0001-load-module-gconf-earlier.patch
index c92a24e..5142e86 100644
--- a/debian/patches/0002-load-module-gconf-earlier.patch
+++ b/debian/patches/0001-load-module-gconf-earlier.patch
@@ -1,17 +1,17 @@
-From 121bfc9f1916395e5216927ec3a9e0bbd742395a Mon Sep 17 00:00:00 2001
+From a33c3ef391c9bc6d164633e70cb8bb56ed738b06 Mon Sep 17 00:00:00 2001
From: Sjoerd Simons <sjoerd at debian.org>
Date: Sun, 19 Oct 2008 13:39:50 +0100
Subject: [PATCH] load module gconf earlier
---
- src/daemon/default.pa.in | 19 ++++++++++---------
- 1 files changed, 10 insertions(+), 9 deletions(-)
+ src/daemon/default.pa.in | 18 +++++++++---------
+ 1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/daemon/default.pa.in b/src/daemon/default.pa.in
-index 7032038..41322c6 100755
+index 517f2c9..cdb62dd 100755
--- a/src/daemon/default.pa.in
+++ b/src/daemon/default.pa.in
-@@ -72,6 +72,16 @@ load-module module-native-protocol-unix
+@@ -76,6 +76,15 @@ load-module module-native-protocol-unix
#load-module module-null-sink sink_name=rtp format=s16be channels=2 rate=44100 description="RTP Multicast Sink"
#load-module module-rtp-send source=rtp.monitor
@@ -24,11 +24,10 @@ index 7032038..41322c6 100755
+.fail
+.endif
+
-+
- ### Automatically restore the volume of streams and devices
- load-module module-stream-restore
- load-module module-device-restore
-@@ -96,15 +106,6 @@ load-module module-console-kit
+ ### Automatically restore the default sink/source when changed by the user during runtime
+ load-module module-default-device-restore
+
+@@ -96,15 +105,6 @@ load-module module-console-kit
### Enable positioned event sounds
load-module module-position-event-sounds
diff --git a/debian/patches/0003-make-sure-to-use-64bit-rounding-even-on-32bit-machin.patch b/debian/patches/0003-make-sure-to-use-64bit-rounding-even-on-32bit-machin.patch
deleted file mode 100644
index d7e178e..0000000
--- a/debian/patches/0003-make-sure-to-use-64bit-rounding-even-on-32bit-machin.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From b47ce0f5c3a5c23c674b46e5608b88a67e70da73 Mon Sep 17 00:00:00 2001
-From: Lennart Poettering <lennart at poettering.net>
-Date: Fri, 24 Oct 2008 04:34:10 +0200
-Subject: [PATCH] make sure to use 64bit rounding even on 32bit machines when converting to pa_usec_t
-
----
- src/pulsecore/time-smoother.c | 6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/pulsecore/time-smoother.c b/src/pulsecore/time-smoother.c
-index 6a2ffaa..6562194 100644
---- a/src/pulsecore/time-smoother.c
-+++ b/src/pulsecore/time-smoother.c
-@@ -313,7 +313,7 @@ static void estimate(pa_smoother *s, pa_usec_t x, pa_usec_t *y, double *deriv) {
- /* Move back from origin */
- ty += (double) s->ey;
-
-- *y = ty >= 0 ? (pa_usec_t) lrint(ty) : 0;
-+ *y = ty >= 0 ? (pa_usec_t) llrint(ty) : 0;
-
- /* Horner scheme */
- if (deriv)
-@@ -360,7 +360,7 @@ void pa_smoother_put(pa_smoother *s, pa_usec_t x, pa_usec_t y) {
-
- /* And calculate when we want to be on track again */
- s->px = s->ex + s->adjust_time;
-- s->py = s->ry + (pa_usec_t) lrint(s->dp * (double) s->adjust_time);
-+ s->py = s->ry + (pa_usec_t) llrint(s->dp * (double) s->adjust_time);
-
- s->abc_valid = FALSE;
-
-@@ -456,7 +456,7 @@ pa_usec_t pa_smoother_translate(pa_smoother *s, pa_usec_t x, pa_usec_t y_delay)
-
- /* pa_log_debug("translate(%llu) = %llu (%0.2f)", (unsigned long long) y_delay, (unsigned long long) ((double) y_delay / nde), nde); */
-
-- return (pa_usec_t) lrint((double) y_delay / nde);
-+ return (pa_usec_t) llrint((double) y_delay / nde);
- }
-
- void pa_smoother_reset(pa_smoother *s) {
diff --git a/debian/patches/0004-properly-remove-dbus-matches-an-filters-when-unloadi.patch b/debian/patches/0004-properly-remove-dbus-matches-an-filters-when-unloadi.patch
deleted file mode 100644
index 716508d..0000000
--- a/debian/patches/0004-properly-remove-dbus-matches-an-filters-when-unloadi.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 3ab1e82495c8aca71b99d36d5ef41af395c78330 Mon Sep 17 00:00:00 2001
-From: Lennart Poettering <lennart at poettering.net>
-Date: Mon, 13 Oct 2008 19:52:02 +0200
-Subject: [PATCH] properly remove dbus matches an filters when unloading m-b-d
-
----
- src/modules/bluetooth/module-bluetooth-discover.c | 17 ++++++++++++++++-
- 1 files changed, 16 insertions(+), 1 deletions(-)
-
-diff --git a/src/modules/bluetooth/module-bluetooth-discover.c b/src/modules/bluetooth/module-bluetooth-discover.c
-index 0601e9a..9d14c1a 100644
---- a/src/modules/bluetooth/module-bluetooth-discover.c
-+++ b/src/modules/bluetooth/module-bluetooth-discover.c
-@@ -452,8 +452,23 @@ void pa__done(pa_module* m) {
- device_free(i);
- }
-
-- if (u->conn)
-+ if (u->conn) {
-+ DBusError error;
-+ dbus_error_init(&error);
-+
-+ dbus_bus_remove_match(pa_dbus_connection_get(u->conn), "type='signal',sender='org.bluez',interface='org.bluez.Adapter',member='DeviceRemoved'", &error);
-+ dbus_error_free(&error);
-+
-+ dbus_bus_remove_match(pa_dbus_connection_get(u->conn), "type='signal',sender='org.bluez',interface='org.bluez.Headset',member='PropertyChanged'", &error);
-+ dbus_error_free(&error);
-+
-+ dbus_bus_remove_match(pa_dbus_connection_get(u->conn), "type='signal',sender='org.bluez',interface='org.bluez.AudioSink',member='PropertyChanged'", &error);
-+ dbus_error_free(&error);
-+
-+ dbus_connection_remove_filter(pa_dbus_connection_get(u->conn), filter_cb, u);
-+
- pa_dbus_connection_unref(u->conn);
-+ }
-
- pa_xfree(u);
- }
diff --git a/debian/patches/0005-Fix-two-typos-that-broke-tunnels.patch b/debian/patches/0005-Fix-two-typos-that-broke-tunnels.patch
deleted file mode 100644
index df02c0d..0000000
--- a/debian/patches/0005-Fix-two-typos-that-broke-tunnels.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 94958bb7c690f7bc4c3dd2a2b87ffa567929e9da Mon Sep 17 00:00:00 2001
-From: Colin Guthrie <pulse at colin.guthr.ie>
-Date: Sat, 11 Oct 2008 18:20:06 +0100
-Subject: [PATCH] Fix two typos that broke tunnels
-
-Signed-off-by: Lennart Poettering <lennart at poettering.net>
----
- src/modules/module-tunnel.c | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/modules/module-tunnel.c b/src/modules/module-tunnel.c
-index 4bbb11a..a46d6e5 100644
---- a/src/modules/module-tunnel.c
-+++ b/src/modules/module-tunnel.c
-@@ -508,7 +508,7 @@ static int source_process_msg(pa_msgobject *o, int code, void *data, int64_t off
-
- switch (code) {
-
-- case PA_SINK_MESSAGE_SET_STATE: {
-+ case PA_SOURCE_MESSAGE_SET_STATE: {
- int r;
-
- if ((r = pa_source_process_msg(o, code, data, offset, chunk)) >= 0)
-@@ -520,7 +520,7 @@ static int source_process_msg(pa_msgobject *o, int code, void *data, int64_t off
- case PA_SOURCE_MESSAGE_GET_LATENCY: {
- pa_usec_t yr, yl, *usec = data;
-
-- yl = pa_bytes_to_usec((uint64_t) u->counter, &PA_SINK(o)->sample_spec);
-+ yl = pa_bytes_to_usec((uint64_t) u->counter, &PA_SOURCE(o)->sample_spec);
- yr = pa_smoother_get(u->smoother, pa_rtclock_usec());
-
- *usec = yr > yl ? yr - yl : 0;
diff --git a/debian/patches/series b/debian/patches/series
index 4ace9ba..18dbec1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1 @@
-0001-Fix-library-search-path-to-include-lib-and-usr-lib.patch
-0002-load-module-gconf-earlier.patch
-0003-make-sure-to-use-64bit-rounding-even-on-32bit-machin.patch
-0004-properly-remove-dbus-matches-an-filters-when-unloadi.patch
-0005-Fix-two-typos-that-broke-tunnels.patch
+0001-load-module-gconf-earlier.patch
commit 90cac3fef650a5f99acc5a0b8d6ae0033bcbf02d
Author: Sjoerd Simons <sjoerd at debian.org>
Date: Sun Feb 1 11:45:20 2009 +0000
Start 0.9.14 packaging
diff --git a/debian/changelog b/debian/changelog
index 484293b..1be721e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pulseaudio (0.9.14-1) UNRELEASED; urgency=low
+
+ * New Upstream Version
+
+ -- Sjoerd Simons <sjoerd at debian.org> Sun, 01 Feb 2009 11:44:22 +0000
+
pulseaudio (0.9.13-2) experimental; urgency=low
* Rename libpulsecore5 to libpulsecore8 to correctly reflect the soname
--
pulseaudio packaging
More information about the Pkg-pulseaudio-devel
mailing list