[SCM] pulseaudio packaging branch, master, updated. debian/0.9.22-1-23-g3757b57
sjoerd at users.alioth.debian.org
sjoerd at users.alioth.debian.org
Mon Jul 25 23:26:28 UTC 2011
The branch, master has been updated
via 3757b57368a70bde547f2bf0c16824b075c29156 (commit)
via 36056d622c73432bb0977baf44fcfef748cc6d17 (commit)
via 681298f63cebdf00543c20441d432f4e49215b1f (commit)
via 87c2ad5c1a71aa4d408d788b70fec00744631682 (commit)
via fbc50679b5b452f8a7d1997f90afd3f664fa712e (commit)
via 847ce95f25f938e76cf774a8e2fb21e192bf2211 (commit)
via 4a08008c825461ae4cc2b0946cca5489eed31dae (commit)
via 09f1b56f05c260ec3ca1bea326e5dfe860f41055 (commit)
via 92c6e34cb5b5a825033707d67b21a6ecc1cf880e (commit)
via ee912aaf771f21542eafdaa005db41e788fb901b (commit)
via 786e86c8fc205921ce068f8c025cf58cb9505ee6 (commit)
via 63dbcc6356a50c457ac982d6e2dc0783392a5817 (commit)
via dba33e466e17070333b7f587b07a47dcf5037f8c (commit)
via 4750bb06b4e2dff1e998ad50f0746f1794e60354 (commit)
from b02c58a67b9f648d3046189b071d1c0a0a90e571 (commit)
- Shortlog ------------------------------------------------------------
3757b57 Target unstable
36056d6 debian/patches/+0003-Explicitely-link-pax11publish-to-libdbus.patch:
681298f Update patch series
87c2ad5 debian/control: Use dh-autoreconf
fbc5067 Switch to 3.0 (quilt) format
847ce95 WIP
4a08008 Happily builds with binutils-gold (Closes: #556124)
09f1b56 Update to 0.9.23 versioning: debian/libpulse0.shlibs debian/pulseaudio.shlibs debian/rules
92c6e34 d/p/0004-Fix-FTBFS-with-xcb-util-0.3.8.patch
ee912aa d/p/0003-Mention-speex-and-libsamplerate-in-pulse-daemon.conf.patch
786e86c Start packaging new upstream release
63dbcc6 Merge commit 'upstream/0.9.23'
Summary of changes:
.tarball-version | 2 +-
.version | 1 +
ChangeLog | 7586 --------------------
LICENSE | 4 +
Makefile.am | 12 +-
Makefile.in | 23 +-
aclocal.m4 | 4 +-
compile | 6 +-
config.guess | 196 +-
config.h.in | 5 +-
config.sub | 43 +-
configure | 2184 ++++--
configure.ac | 157 +-
debian/changelog | 20 +-
debian/control | 3 +-
debian/libpulse0.shlibs | 4 +-
...round-some-platforms-not-having-O_CLOEXEC.patch | 4 +-
...-start-pulseaudio-from-the-KDE-specific-d.patch | 5 +-
...-Explicitely-link-pax11publish-to-libdbus.patch | 25 +
...ex-and-libsamplerate-in-pulse-daemon.conf.patch | 40 -
.../0004-Fix-FTBFS-with-xcb-util-0.3.8.patch | 102 -
debian/patches/series | 3 +-
debian/pulseaudio.shlibs | 2 +-
debian/rules | 6 +-
debian/source/format | 1 +
doxygen/Makefile.in | 2 +
git-version-gen | 1 +
ltmain.sh | 2427 +++++--
m4/libtool.m4 | 1078 ++-
m4/ltversion.m4 | 12 +-
man/Makefile.in | 2 +
man/default.pa.5 | 4 +-
man/pax11publish.1 | 2 +-
man/pulse-client.conf.5 | 4 +-
man/pulse-daemon.conf.5 | 8 +-
man/pulse-daemon.conf.5.xml.in | 29 +-
man/pulseaudio.1 | 6 +-
po/ChangeLog | 437 ++-
po/POTFILES.in | 1 +
src/Makefile.am | 107 +-
src/Makefile.in | 592 ++-
src/daemon/Makefile.am | 20 +
src/daemon/Makefile.in | 506 ++
src/daemon/default.pa.in | 4 +-
src/daemon/main.c | 2 +-
src/daemon/system.pa.in | 6 +-
src/modules/Makefile.am | 20 +
src/modules/Makefile.in | 707 ++
src/modules/alsa/Makefile.am | 20 +
src/modules/alsa/Makefile.in | 707 ++
src/modules/alsa/alsa-mixer.c | 8 +-
src/modules/alsa/alsa-sink.c | 6 +-
src/modules/alsa/alsa-source.c | 4 +-
src/modules/alsa/mixer/Makefile.am | 20 +
src/modules/alsa/mixer/Makefile.in | 707 ++
src/modules/alsa/mixer/paths/Makefile.am | 20 +
src/modules/alsa/mixer/paths/Makefile.in | 506 ++
src/modules/alsa/mixer/profile-sets/Makefile.am | 20 +
src/modules/alsa/mixer/profile-sets/Makefile.in | 506 ++
src/modules/bluetooth/Makefile.am | 20 +
src/modules/bluetooth/Makefile.in | 506 ++
src/modules/echo-cancel/Makefile.am | 20 +
src/modules/echo-cancel/Makefile.in | 506 ++
src/modules/echo-cancel/adrian-aec.c | 233 +
src/modules/echo-cancel/adrian-aec.h | 370 +
src/modules/echo-cancel/adrian-license.txt | 17 +
src/modules/echo-cancel/adrian.c | 113 +
src/modules/echo-cancel/adrian.h | 31 +
src/modules/echo-cancel/echo-cancel.h | 80 +
.../echo-cancel/module-echo-cancel-symdef.h | 29 +
src/modules/echo-cancel/module-echo-cancel.c | 1680 +++++
src/modules/echo-cancel/speex.c | 116 +
src/modules/gconf/Makefile.am | 20 +
src/modules/gconf/Makefile.in | 506 ++
src/modules/jack/Makefile.am | 20 +
src/modules/jack/Makefile.in | 506 ++
src/modules/jack/module-jack-sink.c | 13 +-
src/modules/jack/module-jack-source.c | 13 +-
src/modules/jack/module-jackdbus-detect-symdef.h | 29 +
src/modules/jack/module-jackdbus-detect.c | 304 +
src/modules/module-card-restore.c | 2 +-
src/modules/module-combine.c | 47 +-
src/modules/module-device-manager.c | 5 +-
src/modules/module-device-restore.c | 2 +-
src/modules/module-loopback.c | 22 +-
src/modules/module-pipe-source.c | 2 +-
src/modules/module-rescue-streams.c | 10 +-
src/modules/module-stream-restore.c | 4 +-
src/modules/module-tunnel.c | 4 +-
src/modules/module-udev-detect.c | 2 +-
src/modules/oss/Makefile.am | 20 +
src/modules/oss/Makefile.in | 506 ++
src/modules/raop/Makefile.am | 20 +
src/modules/raop/Makefile.in | 506 ++
src/modules/rtp/Makefile.am | 20 +
src/modules/rtp/Makefile.in | 506 ++
src/modules/rtp/module-rtp-recv.c | 114 +-
src/modules/x11/Makefile.am | 20 +
src/modules/x11/Makefile.in | 506 ++
src/pulse/Makefile.am | 20 +
src/pulse/Makefile.in | 509 ++
src/pulse/stream.c | 4 +-
src/pulse/version.h | 4 +-
src/pulse/volume.h | 7 +
src/pulsecore/Makefile.am | 20 +
src/pulsecore/Makefile.in | 707 ++
src/pulsecore/asyncq.c | 2 +-
src/pulsecore/core-util.c | 7 +-
src/pulsecore/ffmpeg/Makefile.am | 20 +
src/pulsecore/ffmpeg/Makefile.in | 506 ++
src/pulsecore/log.c | 4 +-
src/pulsecore/log.h | 2 +-
src/pulsecore/memblock.c | 2 +-
src/pulsecore/memblockq.c | 71 +-
src/pulsecore/memblockq.h | 5 +
src/pulsecore/pdispatch.c | 2 +-
src/pulsecore/pid.c | 2 +-
src/pulsecore/protocol-http.c | 47 +-
src/pulsecore/protocol-native.c | 60 +-
src/pulsecore/pstream.c | 2 +-
src/pulsecore/random.c | 2 +-
src/pulsecore/ratelimit.c | 4 +-
src/pulsecore/ratelimit.h | 3 +-
src/pulsecore/sink-input.c | 1 +
src/pulsecore/sndfile-util.c | 6 +-
src/pulsecore/source-output.c | 1 +
src/pulsecore/svolume_arm.c | 8 +-
src/pulsecore/svolume_mmx.c | 12 +-
src/pulsecore/svolume_sse.c | 12 +-
src/pulsecore/tagstruct.c | 2 +
src/pulsecore/x11prop.c | 40 +-
src/tests/Makefile.am | 20 +
src/tests/Makefile.in | 506 ++
src/tests/memblockq-test.c | 44 +-
src/utils/Makefile.am | 20 +
src/utils/Makefile.in | 506 ++
src/utils/padsp.c | 61 +-
vala/libpulse-mainloop-glib.deps | 1 +
vala/libpulse-mainloop-glib.vapi | 13 +
vala/libpulse.deps | 1 +
vala/libpulse.vapi | 28 +-
141 files changed, 19553 insertions(+), 10130 deletions(-)
-----------------------------------------------------------------------
Details of changes:
commit 3757b57368a70bde547f2bf0c16824b075c29156
Author: Sjoerd Simons <sjoerd at debian.org>
Date: Mon Jul 25 23:11:13 2011 +0100
Target unstable
diff --git a/debian/changelog b/debian/changelog
index a2dc5d0..364ae6d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-pulseaudio (0.9.23-1) UNRELEASED; urgency=low
+pulseaudio (0.9.23-1) unstable; urgency=low
[ Daniel T Chen ]
* debian/control:
@@ -39,7 +39,7 @@ pulseaudio (0.9.23-1) UNRELEASED; urgency=low
* debian/patches/+0003-Explicitely-link-pax11publish-to-libdbus.patch:
+ Added. Fix build with binutils-gold (Closes: #556124)
- -- Sjoerd Simons <sjoerd at debian.org> Mon, 25 Jul 2011 22:42:35 +0100
+ -- Sjoerd Simons <sjoerd at debian.org> Mon, 25 Jul 2011 23:05:29 +0100
pulseaudio (0.9.22-1) experimental; urgency=low
commit 36056d622c73432bb0977baf44fcfef748cc6d17
Author: Sjoerd Simons <sjoerd at debian.org>
Date: Mon Jul 25 22:49:20 2011 +0100
debian/patches/+0003-Explicitely-link-pax11publish-to-libdbus.patch:
* debian/patches/+0003-Explicitely-link-pax11publish-to-libdbus.patch:
+ Added. Fix build with binutils-gold (Closes: #556124)
diff --git a/debian/changelog b/debian/changelog
index 849568c..a2dc5d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -36,8 +36,10 @@ pulseaudio (0.9.23-1) UNRELEASED; urgency=low
debian/rules
* Switch to 3.0 (quilt) format
* debian/control: Use dh-autoreconf
+ * debian/patches/+0003-Explicitely-link-pax11publish-to-libdbus.patch:
+ + Added. Fix build with binutils-gold (Closes: #556124)
- -- Sjoerd Simons <sjoerd at debian.org> Sun, 03 Jul 2011 19:08:33 -0700
+ -- Sjoerd Simons <sjoerd at debian.org> Mon, 25 Jul 2011 22:42:35 +0100
pulseaudio (0.9.22-1) experimental; urgency=low
commit 681298f63cebdf00543c20441d432f4e49215b1f
Author: Sjoerd Simons <sjoerd at debian.org>
Date: Mon Jul 25 22:29:42 2011 +0100
Update patch series
diff --git a/debian/patches/0001-Work-around-some-platforms-not-having-O_CLOEXEC.patch b/debian/patches/0001-Work-around-some-platforms-not-having-O_CLOEXEC.patch
index 014fa43..942518c 100644
--- a/debian/patches/0001-Work-around-some-platforms-not-having-O_CLOEXEC.patch
+++ b/debian/patches/0001-Work-around-some-platforms-not-having-O_CLOEXEC.patch
@@ -1,7 +1,7 @@
-From b7fb5904c5eab9fce20dc598dfd60f3349e90190 Mon Sep 17 00:00:00 2001
+From fe69d0d16fc89e3f3b8c0e31ec744b76926751ae Mon Sep 17 00:00:00 2001
From: Clint Adams <schizo at debian.org>
Date: Sun, 25 Oct 2009 12:35:14 +0000
-Subject: [PATCH 1/2] Work around some platforms not having O_CLOEXEC
+Subject: [PATCH 1/3] Work around some platforms not having O_CLOEXEC
---
src/modules/module-cli.c | 5 +++++
diff --git a/debian/patches/0002-In-KDE-only-start-pulseaudio-from-the-KDE-specific-d.patch b/debian/patches/0002-In-KDE-only-start-pulseaudio-from-the-KDE-specific-d.patch
index 33e3789..dcea084 100644
--- a/debian/patches/0002-In-KDE-only-start-pulseaudio-from-the-KDE-specific-d.patch
+++ b/debian/patches/0002-In-KDE-only-start-pulseaudio-from-the-KDE-specific-d.patch
@@ -1,7 +1,8 @@
-From b4389a752385afd6e65e412a8488828ee3648fbd Mon Sep 17 00:00:00 2001
+From d01653d5537330e1692cff64307eff33c3b6fa8d Mon Sep 17 00:00:00 2001
From: Zsolt Rizsanyi <rizsanyi at users.sourceforge.net>
Date: Sun, 27 Jun 2010 15:16:13 +0100
-Subject: [PATCH 2/2] In KDE only start pulseaudio from the KDE specific desktop file
+Subject: [PATCH 2/3] In KDE only start pulseaudio from the KDE specific
+ desktop file
---
src/daemon/pulseaudio.desktop.in | 1 +
diff --git a/debian/patches/0003-Explicitely-link-pax11publish-to-libdbus.patch b/debian/patches/0003-Explicitely-link-pax11publish-to-libdbus.patch
new file mode 100644
index 0000000..96a927d
--- /dev/null
+++ b/debian/patches/0003-Explicitely-link-pax11publish-to-libdbus.patch
@@ -0,0 +1,25 @@
+From 6f491fdf6265d7fe0c1967c24229b07348787a2f Mon Sep 17 00:00:00 2001
+From: Sjoerd Simons <sjoerd at debian.org>
+Date: Mon, 25 Jul 2011 22:27:56 +0100
+Subject: [PATCH 3/3] Explicitely link pax11publish to libdbus
+
+prevents build failure with gold
+---
+ src/Makefile.am | 4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index cc38db2..a4a7d65 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -258,7 +258,9 @@ pacmd_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
+
+ pax11publish_SOURCES = utils/pax11publish.c
+ pax11publish_CFLAGS = $(AM_CFLAGS) $(X11_CFLAGS)
+-pax11publish_LDADD = $(AM_LDADD) libpulse.la libpulsecommon- at PA_MAJORMINORMICRO@.la $(X11_LIBS)
++pax11publish_LDADD = $(AM_LDADD) libpulse.la \
++ libpulsecommon- at PA_MAJORMINORMICRO@.la $(X11_LIBS) \
++ $(DBUS_LIBS)
+ pax11publish_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
+
+ pabrowse_SOURCES = utils/pabrowse.c
diff --git a/debian/patches/series b/debian/patches/series
index 8e45941..2c3de39 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
0001-Work-around-some-platforms-not-having-O_CLOEXEC.patch
0002-In-KDE-only-start-pulseaudio-from-the-KDE-specific-d.patch
+0003-Explicitely-link-pax11publish-to-libdbus.patch
commit 87c2ad5c1a71aa4d408d788b70fec00744631682
Author: Sjoerd Simons <sjoerd at debian.org>
Date: Sun Jul 3 19:09:16 2011 -0700
debian/control: Use dh-autoreconf
diff --git a/debian/changelog b/debian/changelog
index 1727570..849568c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -35,8 +35,9 @@ pulseaudio (0.9.23-1) UNRELEASED; urgency=low
debian/pulseaudio.shlibs
debian/rules
* Switch to 3.0 (quilt) format
+ * debian/control: Use dh-autoreconf
- -- Sjoerd Simons <sjoerd at debian.org> Sun, 03 Jul 2011 18:36:15 -0700
+ -- Sjoerd Simons <sjoerd at debian.org> Sun, 03 Jul 2011 19:08:33 -0700
pulseaudio (0.9.22-1) experimental; urgency=low
diff --git a/debian/control b/debian/control
index f3a7b72..f6ca214 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,8 @@ Section: sound
Priority: optional
Maintainer: Pulseaudio maintenance team <pkg-pulseaudio-devel at lists.alioth.debian.org>
Uploaders: CJ van den Berg <cj at vdbonline.com>, Sjoerd Simons <sjoerd at debian.org>
-Build-Depends: debhelper (>= 5), cdbs, quilt, m4, libltdl-dev (>= 2.2.6a-2),
+Build-Depends: debhelper (>= 5), cdbs, quilt, m4, dh-autoreconf,
+ libltdl-dev (>= 2.2.6a-2),
libsamplerate0-dev, libsndfile1-dev (>= 1.0.20), libglib2.0-dev,
libcap-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
libasound2-dev (>= 1.0.19) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
commit fbc50679b5b452f8a7d1997f90afd3f664fa712e
Author: Sjoerd Simons <sjoerd at debian.org>
Date: Sun Jul 3 18:36:43 2011 -0700
Switch to 3.0 (quilt) format
diff --git a/debian/changelog b/debian/changelog
index 19b9f8d..1727570 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -34,9 +34,9 @@ pulseaudio (0.9.23-1) UNRELEASED; urgency=low
debian/libpulse0.shlibs
debian/pulseaudio.shlibs
debian/rules
- * Happily builds with binutils-gold (Closes: #556124)
+ * Switch to 3.0 (quilt) format
- -- Sjoerd Simons <sjoerd at debian.org> Sun, 03 Jul 2011 12:51:28 -0700
+ -- Sjoerd Simons <sjoerd at debian.org> Sun, 03 Jul 2011 18:36:15 -0700
pulseaudio (0.9.22-1) experimental; urgency=low
diff --git a/debian/rules b/debian/rules
index 2f1e5ad..d2cd750 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,9 @@
#!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/autoreconf.mk
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
include /usr/share/cdbs/1/rules/utils.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+include /usr/share/cdbs/1/rules/autoreconf.mk
common-build-arch::
grep -v -e alsa -e evdev -e udev debian/pulseaudio.install > \
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
commit 847ce95f25f938e76cf774a8e2fb21e192bf2211
Author: Sjoerd Simons <sjoerd at debian.org>
Date: Sun Jul 3 18:15:19 2011 -0700
WIP
diff --git a/debian/rules b/debian/rules
index 26a184b..2f1e5ad 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,6 @@
#!/usr/bin/make -f
+include /usr/share/cdbs/1/rules/autoreconf.mk
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
include /usr/share/cdbs/1/rules/utils.mk
commit 4a08008c825461ae4cc2b0946cca5489eed31dae
Author: Sjoerd Simons <sjoerd at debian.org>
Date: Sun Jul 3 12:52:31 2011 -0700
Happily builds with binutils-gold (Closes: #556124)
diff --git a/debian/changelog b/debian/changelog
index c9591fd..19b9f8d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -34,8 +34,9 @@ pulseaudio (0.9.23-1) UNRELEASED; urgency=low
debian/libpulse0.shlibs
debian/pulseaudio.shlibs
debian/rules
+ * Happily builds with binutils-gold (Closes: #556124)
- -- Sjoerd Simons <sjoerd at debian.org> Sun, 03 Jul 2011 11:44:43 -0700
+ -- Sjoerd Simons <sjoerd at debian.org> Sun, 03 Jul 2011 12:51:28 -0700
pulseaudio (0.9.22-1) experimental; urgency=low
commit 09f1b56f05c260ec3ca1bea326e5dfe860f41055
Author: Sjoerd Simons <sjoerd at debian.org>
Date: Sun Jul 3 11:45:26 2011 -0700
Update to 0.9.23 versioning: debian/libpulse0.shlibs debian/pulseaudio.shlibs debian/rules
diff --git a/debian/changelog b/debian/changelog
index 74569fd..c9591fd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,8 +30,12 @@ pulseaudio (0.9.23-1) UNRELEASED; urgency=low
+ Removed, fixed upstream
* d/p/0004-Fix-FTBFS-with-xcb-util-0.3.8.patch
+ Removed, fixed upstream
+ * Update to 0.9.23 versioning:
+ debian/libpulse0.shlibs
+ debian/pulseaudio.shlibs
+ debian/rules
- -- Sjoerd Simons <sjoerd at debian.org> Sun, 03 Jul 2011 11:32:19 -0700
+ -- Sjoerd Simons <sjoerd at debian.org> Sun, 03 Jul 2011 11:44:43 -0700
pulseaudio (0.9.22-1) experimental; urgency=low
diff --git a/debian/libpulse0.shlibs b/debian/libpulse0.shlibs
index c69955e..7eb4092 100644
--- a/debian/libpulse0.shlibs
+++ b/debian/libpulse0.shlibs
@@ -1,3 +1,3 @@
-libpulse 0 libpulse0 (>= 0.9.22)
+libpulse 0 libpulse0 (>= 0.9.23)
libpulse-simple 0 libpulse0
-libpulsecommon 0.9.22 libpulse0
+libpulsecommon 0.9.23 libpulse0
diff --git a/debian/pulseaudio.shlibs b/debian/pulseaudio.shlibs
index 8e76da7..f2bdc9d 100644
--- a/debian/pulseaudio.shlibs
+++ b/debian/pulseaudio.shlibs
@@ -1 +1 @@
-libpulsecore 0.9.22 pulseaudio
+libpulsecore 0.9.23 pulseaudio
diff --git a/debian/rules b/debian/rules
index 78f7cc7..26a184b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,7 +20,7 @@ common-install-arch::
common-configure-arch::
ifneq (,$(findstring $(DEB_HOST_ARCH), "arm armel"))
- make -C src libpulsecore_0.9.22_la-svolume_arm.lo CFLAGS+=-march=armv6
+ make -C src libpulsecore_0.9.23_la-svolume_arm.lo CFLAGS+=-march=armv6
endif
pulseaudio-install-arch::
@@ -51,7 +51,7 @@ ifneq (,$(findstring $(DEB_HOST_ARCH_OS), "linux"))
DEB_CONFIGURE_EXTRA_FLAGS += --enable-hal-compat --disable-hal
endif
-DEB_DH_MAKESHLIBS_ARGS_ALL = --exclude=usr/lib/pulse-0.9.22/modules
+DEB_DH_MAKESHLIBS_ARGS_ALL = --exclude=usr/lib/pulse-0.9.23/modules
DEB_DH_SHLIBDEPS_ARGS_libpulse0 = -u -L/dev/null
DEB_DH_SHLIBDEPS_ARGS_pulseaudio = -u -Ldebian/shlibs_pulseaudio.local
DEB_DH_INSTALL_ARGS = --sourcedir=$(CURDIR)/debian/tmp
commit 92c6e34cb5b5a825033707d67b21a6ecc1cf880e
Author: Sjoerd Simons <sjoerd at debian.org>
Date: Sun Jul 3 11:32:59 2011 -0700
d/p/0004-Fix-FTBFS-with-xcb-util-0.3.8.patch
* d/p/0004-Fix-FTBFS-with-xcb-util-0.3.8.patch
+ Removed, fixed upstream
diff --git a/debian/changelog b/debian/changelog
index 0eda800..74569fd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,8 +28,10 @@ pulseaudio (0.9.23-1) UNRELEASED; urgency=low
* New upstream release
* d/p/0003-Mention-speex-and-libsamplerate-in-pulse-daemon.conf.patch
+ Removed, fixed upstream
+ * d/p/0004-Fix-FTBFS-with-xcb-util-0.3.8.patch
+ + Removed, fixed upstream
- -- Sjoerd Simons <sjoerd at debian.org> Sun, 03 Jul 2011 11:27:16 -0700
+ -- Sjoerd Simons <sjoerd at debian.org> Sun, 03 Jul 2011 11:32:19 -0700
pulseaudio (0.9.22-1) experimental; urgency=low
diff --git a/debian/patches/0004-Fix-FTBFS-with-xcb-util-0.3.8.patch b/debian/patches/0004-Fix-FTBFS-with-xcb-util-0.3.8.patch
deleted file mode 100644
index 8ab3f86..0000000
--- a/debian/patches/0004-Fix-FTBFS-with-xcb-util-0.3.8.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index dea8bb9..d31f561 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -516,7 +516,7 @@ AC_ARG_ENABLE([x11],
- [x11=auto])
-
- if test "x${x11}" != xno ; then
-- PKG_CHECK_MODULES(X11, [ x11-xcb ice sm xtst xcb-atom ],
-+ PKG_CHECK_MODULES(X11, [ x11-xcb xcb >= 1.6 ice sm xtst ],
- HAVE_X11=1,
- [
- HAVE_X11=0
-diff --git a/src/pulsecore/x11prop.c b/src/pulsecore/x11prop.c
-index 4cb21da..1c0d199 100644
---- a/src/pulsecore/x11prop.c
-+++ b/src/pulsecore/x11prop.c
-@@ -30,7 +30,6 @@
- #include <pulsecore/macro.h>
-
- #include <xcb/xproto.h>
--#include <xcb/xcb_atom.h>
-
- #define PA_XCB_FORMAT 8
-
-@@ -50,28 +49,43 @@ static xcb_screen_t *screen_of_display(xcb_connection_t *xcb, int screen)
-
- void pa_x11_set_prop(xcb_connection_t *xcb, int screen, const char *name, const char *data) {
- xcb_screen_t *xs;
-- xcb_atom_t a;
-+ xcb_intern_atom_reply_t *reply;
-
- pa_assert(xcb);
- pa_assert(name);
- pa_assert(data);
-
- if ((xs = screen_of_display(xcb, screen))) {
-- a = xcb_atom_get(xcb, name);
-- xcb_change_property(xcb, XCB_PROP_MODE_REPLACE, xs->root, a, STRING, PA_XCB_FORMAT, (int) strlen(data), (const void*) data);
-+ reply = xcb_intern_atom_reply(xcb,
-+ xcb_intern_atom(xcb, 0, strlen(name), name),
-+ NULL);
-+
-+ if (reply) {
-+ xcb_change_property(xcb, XCB_PROP_MODE_REPLACE, xs->root, reply->atom,
-+ XCB_ATOM_STRING, PA_XCB_FORMAT,
-+ (int) strlen(data), (const void*) data);
-+
-+ free(reply);
-+ }
- }
- }
-
- void pa_x11_del_prop(xcb_connection_t *xcb, int screen, const char *name) {
- xcb_screen_t *xs;
-- xcb_atom_t a;
-+ xcb_intern_atom_reply_t *reply;
-
- pa_assert(xcb);
- pa_assert(name);
-
- if ((xs = screen_of_display(xcb, screen))) {
-- a = xcb_atom_get(xcb, name);
-- xcb_delete_property(xcb, xs->root, a);
-+ reply = xcb_intern_atom_reply(xcb,
-+ xcb_intern_atom(xcb, 0, strlen(name), name),
-+ NULL);
-+
-+ if (reply) {
-+ xcb_delete_property(xcb, xs->root, reply->atom);
-+ free(reply);
-+ }
- }
- }
-
-@@ -81,7 +95,7 @@ char* pa_x11_get_prop(xcb_connection_t *xcb, int screen, const char *name, char
- xcb_get_property_cookie_t req;
- xcb_get_property_reply_t* prop = NULL;
- xcb_screen_t *xs;
-- xcb_atom_t a;
-+ xcb_intern_atom_reply_t *reply;
-
- pa_assert(xcb);
- pa_assert(name);
-@@ -99,9 +113,15 @@ char* pa_x11_get_prop(xcb_connection_t *xcb, int screen, const char *name, char
- xs = screen_of_display(xcb, 0);
-
- if (xs) {
-- a = xcb_atom_get(xcb, name);
-+ reply = xcb_intern_atom_reply(xcb,
-+ xcb_intern_atom(xcb, 0, strlen(name), name),
-+ NULL);
-+
-+ if (!reply)
-+ goto finish;
-
-- req = xcb_get_property(xcb, 0, xs->root, a, STRING, 0, (uint32_t)(l-1));
-+ req = xcb_get_property(xcb, 0, xs->root, reply->atom, XCB_ATOM_STRING, 0, (uint32_t)(l-1));
-+ free(reply);
- prop = xcb_get_property_reply(xcb, req, NULL);
-
- if (!prop)
diff --git a/debian/patches/series b/debian/patches/series
index e57be26..8e45941 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
0001-Work-around-some-platforms-not-having-O_CLOEXEC.patch
0002-In-KDE-only-start-pulseaudio-from-the-KDE-specific-d.patch
-0004-Fix-FTBFS-with-xcb-util-0.3.8.patch
commit ee912aaf771f21542eafdaa005db41e788fb901b
Author: Sjoerd Simons <sjoerd at debian.org>
Date: Sun Jul 3 11:27:49 2011 -0700
d/p/0003-Mention-speex-and-libsamplerate-in-pulse-daemon.conf.patch
* d/p/0003-Mention-speex-and-libsamplerate-in-pulse-daemon.conf.patch
+ Removed, fixed upstream
diff --git a/debian/changelog b/debian/changelog
index 8255ae3..0eda800 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,8 +26,10 @@ pulseaudio (0.9.23-1) UNRELEASED; urgency=low
[ Sjoerd Simons ]
* New upstream release
+ * d/p/0003-Mention-speex-and-libsamplerate-in-pulse-daemon.conf.patch
+ + Removed, fixed upstream
- -- Sjoerd Simons <sjoerd at debian.org> Sun, 03 Jul 2011 11:18:29 -0700
+ -- Sjoerd Simons <sjoerd at debian.org> Sun, 03 Jul 2011 11:27:16 -0700
pulseaudio (0.9.22-1) experimental; urgency=low
diff --git a/debian/patches/0003-Mention-speex-and-libsamplerate-in-pulse-daemon.conf.patch b/debian/patches/0003-Mention-speex-and-libsamplerate-in-pulse-daemon.conf.patch
deleted file mode 100644
index 7adb903..0000000
--- a/debian/patches/0003-Mention-speex-and-libsamplerate-in-pulse-daemon.conf.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Index: pulseaudio-0.9.22/man/pulse-daemon.conf.5.xml.in
-===================================================================
---- pulseaudio-0.9.22.orig/man/pulse-daemon.conf.5.xml.in 2010-12-17 20:40:29.000000000 -0500
-+++ pulseaudio-0.9.22/man/pulse-daemon.conf.5.xml.in 2010-12-20 21:36:39.000000000 -0500
-@@ -89,20 +89,21 @@
- <opt>src-zero-order-hold</opt>, <opt>src-linear</opt>,
- <opt>trivial</opt>, <opt>speex-float-N</opt>,
- <opt>speex-fixed-N</opt>, <opt>ffmpeg</opt>. See the
-- documentation of libsamplerate for an explanation for the
-- different src- methods. The method <opt>trivial</opt> is the most basic
-- algorithm implemented. If you're tight on CPU consider using
-- this. On the other hand it has the worst quality of them
-- all. The Speex resamplers take an integer quality setting in the
-- range 0..9 (bad...good). They exist in two flavours: <opt>fixed</opt> and
-- <opt>float</opt>. The former uses fixed point numbers, the latter relies on
-- floating point numbers. On most desktop CPUs the float point
-- resmampler is a lot faster, and it also offers slightly better
-- quality. See the output of <opt>dump-resample-methods</opt> for
-- a complete list of all available resamplers. Defaults to
-- <opt>speex-float-3</opt>. The <opt>--resample-method</opt>
-- command line option takes precedence. Note that some modules
-- overwrite or allow overwriting of the resampler to use.</p>
-+ documentation of libsamplerate and speex for explanations of the
-+ different src- and speex- methods, respectively. The method
-+ <opt>trivial</opt> is the most basic algorithm implemented. If
-+ you're tight on CPU consider using this. On the other hand it has
-+ the worst quality of them all. The Speex resamplers take an
-+ integer quality setting in the range 0..10 (bad...good). They
-+ exist in two flavours: <opt>fixed</opt> and <opt>float</opt>. The former uses fixed point
-+ numbers, the latter relies on floating point numbers. On most
-+ desktop CPUs the float point resampler is a lot faster, and it
-+ also offers slightly better quality. See the output of
-+ <opt>dump-resample-methods</opt> for a complete list of all
-+ available resamplers. Defaults to <opt>speex-float-3</opt>. The
-+ <opt>--resample-method</opt> command line option takes precedence.
-+ Note that some modules overwrite or allow overwriting of the
-+ resampler to use.</p>
- </option>
-
- <option>
diff --git a/debian/patches/series b/debian/patches/series
index 592c893..e57be26 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
0001-Work-around-some-platforms-not-having-O_CLOEXEC.patch
0002-In-KDE-only-start-pulseaudio-from-the-KDE-specific-d.patch
-0003-Mention-speex-and-libsamplerate-in-pulse-daemon.conf.patch
0004-Fix-FTBFS-with-xcb-util-0.3.8.patch
commit 786e86c8fc205921ce068f8c025cf58cb9505ee6
Author: Sjoerd Simons <sjoerd at debian.org>
Date: Sun Jul 3 11:24:49 2011 -0700
Start packaging new upstream release
diff --git a/debian/changelog b/debian/changelog
index f1ef663..8255ae3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-pulseaudio (0.9.22-2) UNRELEASED; urgency=low
+pulseaudio (0.9.23-1) UNRELEASED; urgency=low
+ [ Daniel T Chen ]
* debian/control:
+ Fix typo in long description of pulseaudio-module-x11, thanks to
Sam Morris (Closes: #500038)
@@ -23,7 +24,10 @@ pulseaudio (0.9.22-2) UNRELEASED; urgency=low
* debian/README.Debian: Clarify historical pulse-rt use and document
current recommendation of RealtimeKit (Closes: #548363)
- -- Daniel T Chen <crimsun at ubuntu.com> Sat, 11 Jun 2011 18:26:18 -0400
+ [ Sjoerd Simons ]
+ * New upstream release
+
+ -- Sjoerd Simons <sjoerd at debian.org> Sun, 03 Jul 2011 11:18:29 -0700
pulseaudio (0.9.22-1) experimental; urgency=low
commit 63dbcc6356a50c457ac982d6e2dc0783392a5817
Merge: b02c58a67b9f648d3046189b071d1c0a0a90e571 dba33e466e17070333b7f587b07a47dcf5037f8c
Author: Sjoerd Simons <sjoerd at debian.org>
Date: Sun Jul 3 11:17:21 2011 -0700
Merge commit 'upstream/0.9.23'
--
pulseaudio packaging
More information about the pkg-pulseaudio-devel
mailing list