[Pkg-pulseaudio-devel] [SCM] pulseaudio packaging branch, master, updated. debian/0.9.10-3-7-g42ca12c
sjoerd at users.alioth.debian.org
sjoerd at users.alioth.debian.org
Sun Oct 19 13:02:06 UTC 2008
The branch, master has been updated
via 42ca12c3d364ed4c5c6601d9bf5362e33255059c (commit)
via c0871ed2f1b510c11dcfa99c57f5d5d3a759cdf4 (commit)
from 316c41124d6b1f4ded441ac522e3a57c3a74b961 (commit)
- Shortlog ------------------------------------------------------------
42ca12c drop esd socket patch patch and drop the debian/patches prefixes in changelog, they make lines too long
c0871ed Apply a patch from Bas Zoutekouw to update the packaging for newer pulse versions
Summary of changes:
debian/changelog | 25 +++++++++--
debian/control | 2 +-
...ry-search-path-to-include-lib-and-usr-lib.patch | 24 ++++++++++
...ocket-to-tmp-.esd-socket-to-match-up-with.patch | 22 ---------
...ry-search-path-to-include-lib-and-usr-lib.patch | 24 ----------
.../patches/0002-load-module-gconf-earlier.patch | 46 ++++++++++++++++++++
.../patches/0003-load-module-gconf-earlier.patch | 46 --------------------
debian/patches/series | 5 +-
debian/pulseaudio-module-x11.install | 1 -
debian/pulseaudio.install | 5 ++-
debian/rules | 2 +-
11 files changed, 98 insertions(+), 104 deletions(-)
-----------------------------------------------------------------------
Details of changes:
commit 42ca12c3d364ed4c5c6601d9bf5362e33255059c
Author: Sjoerd Simons <sjoerd at debian.org>
Date: Sun Oct 19 14:01:58 2008 +0100
drop esd socket patch patch and drop the debian/patches prefixes in changelog, they make lines too long
diff --git a/debian/changelog b/debian/changelog
index 63b2e36..76fba6c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,11 +12,18 @@ pulseaudio (0.9.13-1) UNRELEASED; urgency=low
* New Upstream Version
* Fixes FTBTS on GNU/kFreeBSD (Closes: #497624)
* Dropped patches for things that have been fixed upstream:
- - debian/patches/0003-Define-PULSE_INTERNAL.patch
- - debian/patches/0005-Reduce-RT-prio-logging-severity.patch
- - debian/patches/0006-fix-iteration-over-random-devices.patch
- * rename debian/patches/0004-load-module-gconf-earlier.patch to
- debian/patches/0003-load-module-gconf-earlier.patch
+ - 0003-Define-PULSE_INTERNAL.patch
+ - 0005-Reduce-RT-prio-logging-severity.patch
+ - 0006-fix-iteration-over-random-devices.patch
+ * rename 0003-load-module-gconf-earlier.patch to
+ 0002-load-module-gconf-earlier.patch
+ * rename 0002-Fix-library-search-path-to-include-lib-and-usr-lib.patch
+ to 0001-Fix-library-search-path-to-include-lib-and-usr-lib.patch
+ * rename 0004-load-module-gconf-earlier.patch to
+ 0003-load-module-gconf-earlier.patch
+ * 0001-Set-ESD-socket-to-tmp-.esd-socket-to-match-up-with.patch
+ - Dropped, not necessary anymore, the --disable-per-user-esound-socket
+ configure flag now has the same result
-- Sjoerd Simons <sjoerd at debian.org> Sun, 19 Oct 2008 13:40:50 +0100
diff --git a/debian/patches/0002-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
similarity index 93%
rename from debian/patches/0002-Fix-library-search-path-to-include-lib-and-usr-lib.patch
rename to debian/patches/0001-Fix-library-search-path-to-include-lib-and-usr-lib.patch
index 0a2a187..eb42734 100644
--- a/debian/patches/0002-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
@@ -1,4 +1,4 @@
-From 887a98aa80e26aa01ba73d11546e2eeeaa193ec8 Mon Sep 17 00:00:00 2001
+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
diff --git a/debian/patches/0001-Set-ESD-socket-to-tmp-.esd-socket-to-match-up-with.patch b/debian/patches/0001-Set-ESD-socket-to-tmp-.esd-socket-to-match-up-with.patch
deleted file mode 100644
index a7038f8..0000000
--- a/debian/patches/0001-Set-ESD-socket-to-tmp-.esd-socket-to-match-up-with.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From f2d3b86adc4e247061cbb747668c038a18f3ad92 Mon Sep 17 00:00:00 2001
-From: CJ van den Berg <cj at vdbonline.com>
-Date: Wed, 31 Oct 2007 13:59:31 +0100
-Subject: [PATCH] Set ESD socket to /tmp/.esd/socket to match up with libesd
-
----
- src/daemon/default.pa.in | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/daemon/default.pa.in b/src/daemon/default.pa.in
-index 7032038..27b3458 100755
---- a/src/daemon/default.pa.in
-+++ b/src/daemon/default.pa.in
-@@ -55,7 +55,7 @@ load-module module-detect
-
- ### Load several protocols
- .ifexists module-esound-protocol-unix at PA_SOEXT@
--load-module module-esound-protocol-unix
-+load-module module-esound-protocol-unix socket="/tmp/.esd/socket"
- .endif
- load-module module-native-protocol-unix
-
diff --git a/debian/patches/0003-load-module-gconf-earlier.patch b/debian/patches/0002-load-module-gconf-earlier.patch
similarity index 94%
rename from debian/patches/0003-load-module-gconf-earlier.patch
rename to debian/patches/0002-load-module-gconf-earlier.patch
index ad0917c..c92a24e 100644
--- a/debian/patches/0003-load-module-gconf-earlier.patch
+++ b/debian/patches/0002-load-module-gconf-earlier.patch
@@ -1,4 +1,4 @@
-From 3117863ef8395c6c1a7f61e5745438013bcac059 Mon Sep 17 00:00:00 2001
+From 121bfc9f1916395e5216927ec3a9e0bbd742395a 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
@@ -8,7 +8,7 @@ Subject: [PATCH] load module gconf earlier
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/src/daemon/default.pa.in b/src/daemon/default.pa.in
-index 27b3458..f420a36 100755
+index 7032038..41322c6 100755
--- a/src/daemon/default.pa.in
+++ b/src/daemon/default.pa.in
@@ -72,6 +72,16 @@ load-module module-native-protocol-unix
diff --git a/debian/patches/series b/debian/patches/series
index 10f81b6..e247c39 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-0001-Set-ESD-socket-to-tmp-.esd-socket-to-match-up-with.patch
-0002-Fix-library-search-path-to-include-lib-and-usr-lib.patch
-0003-load-module-gconf-earlier.patch
+0001-Fix-library-search-path-to-include-lib-and-usr-lib.patch
+0002-load-module-gconf-earlier.patch
commit c0871ed2f1b510c11dcfa99c57f5d5d3a759cdf4
Author: Sjoerd Simons <sjoerd at debian.org>
Date: Sun Oct 19 13:57:48 2008 +0100
Apply a patch from Bas Zoutekouw to update the packaging for newer pulse versions
diff --git a/debian/changelog b/debian/changelog
index 38b5ce8..63b2e36 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,13 @@
pulseaudio (0.9.13-1) UNRELEASED; urgency=low
+ [ Bas Zoetekouw ]
+ * debian/control: Build-Depend on libasound2-dev (>= 1.0.17)
+ * debian/pulseaudio-module-x11.install: No longer install an xdg autostart
+ file
+ * debian/pulseaudio.install: Install system.pa config file and various new
+ pulseaudio modules
+ * debian/rules: Add --disable-per-user-esound-socket to configure flags
+
[ Sjoerd Simons ]
* New Upstream Version
* Fixes FTBTS on GNU/kFreeBSD (Closes: #497624)
diff --git a/debian/control b/debian/control
index bf0d40b..1d43c73 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 5), cdbs, quilt, m4, libltdl3-dev,
libsndfile1-dev (>= 1.0.10) | libsndfile-dev, libx11-dev,
x11proto-core-dev, libxt-dev, libglib2.0-dev,
libcap-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
- libasound-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+ libasound2-dev (>= 1.0.17) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
libavahi-client-dev, libjack0.100.0-dev, libwrap0-dev,
liblircclient-dev, libgconf2-dev, libhal-dev, libasyncns-dev,
libatomic-ops-dev
diff --git a/debian/pulseaudio-module-x11.install b/debian/pulseaudio-module-x11.install
index 67b78a1..a7c065f 100644
--- a/debian/pulseaudio-module-x11.install
+++ b/debian/pulseaudio-module-x11.install
@@ -4,4 +4,3 @@ usr/lib/pulse-*/modules/module-x11-bell.so
usr/lib/pulse-*/modules/module-x11-publish.so
usr/lib/pulse-*/modules/module-x11-xsmp.so
usr/share/lintian/overrides/pulseaudio-module-x11
-etc/xdg/autostart/pulseaudio-module-xsmp.desktop
diff --git a/debian/pulseaudio.install b/debian/pulseaudio.install
index fcd372f..24b434f 100644
--- a/debian/pulseaudio.install
+++ b/debian/pulseaudio.install
@@ -1,9 +1,10 @@
etc/pulse/default.pa
+etc/pulse/system.pa
etc/pulse/daemon.conf
usr/bin/pulseaudio
usr/lib/pulse-*/modules/libalsa-util.so
-usr/lib/pulse-*/modules/libauthkey-prop.so
usr/lib/pulse-*/modules/libauthkey.so
+usr/lib/pulse-*/modules/libauth-cookie.so
usr/lib/pulse-*/modules/libcli.so
usr/lib/pulse-*/modules/libiochannel.so
usr/lib/pulse-*/modules/libioline.so
@@ -26,6 +27,7 @@ usr/lib/pulse-*/modules/libstrlist.so
usr/lib/pulse-*/modules/libtagstruct.so
usr/lib/pulse-*/modules/module-alsa-sink.so
usr/lib/pulse-*/modules/module-alsa-source.so
+usr/lib/pulse-*/modules/module-always-sink.so
usr/lib/pulse-*/modules/module-cli-protocol-tcp.so
usr/lib/pulse-*/modules/module-cli-protocol-unix.so
usr/lib/pulse-*/modules/module-cli.so
@@ -46,6 +48,7 @@ usr/lib/pulse-*/modules/module-null-sink.so
usr/lib/pulse-*/modules/module-oss.so
usr/lib/pulse-*/modules/module-pipe-sink.so
usr/lib/pulse-*/modules/module-pipe-source.so
+usr/lib/pulse-*/modules/module-position-event-sounds.so
usr/lib/pulse-*/modules/module-remap-sink.so
usr/lib/pulse-*/modules/module-rescue-streams.so
usr/lib/pulse-*/modules/module-rtp-recv.so
diff --git a/debian/rules b/debian/rules
index 6db705b..a2515ad 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,7 +34,7 @@ update-patch-series:
mv $${patch}.chomped $$patch ; \
done
-DEB_CONFIGURE_EXTRA_FLAGS = --with-realtime-group=pulse-rt
+DEB_CONFIGURE_EXTRA_FLAGS = --with-realtime-group=pulse-rt --disable-per-user-esound-socket
DEB_DH_MAKESHLIBS_ARGS_ALL = --exclude=usr/lib/pulse-0.9/modules
DEB_DH_INSTALL_ARGS = --sourcedir=$(CURDIR)/debian/tmp
DEB_UPDATE_RCD_PARAMS = defaults 25 15
--
pulseaudio packaging
More information about the Pkg-pulseaudio-devel
mailing list