[Pkg-pulseaudio-devel] [SCM] pulseaudio packaging branch, master, updated. debian/0.9.6-2-32-g451b40b

neurocyte-guest at users.alioth.debian.org neurocyte-guest at users.alioth.debian.org
Wed Oct 31 13:31:15 UTC 2007


The branch, master has been updated
       via  451b40b57289d3e872fbfdd2f3c0f55a614df966 (commit)
       via  8235afffcf75963f9597966e8af3957a88b05ca0 (commit)
       via  5f55c4c1f7037dae769bbfdfc570d64d462c2251 (commit)
       via  a89f966483fd2e9f19c4509b560ae792044a43c3 (commit)
       via  5c83d1796b94bbca53f882e6028887d65b466a13 (commit)
      from  edac9f6b60acddc2d606e127ad5fce1443642524 (commit)


- Shortlog ------------------------------------------------------------
451b40b Update changelog
8235aff debian/patches: Added 0001-Set-ESD-socket-to-tmp-.esd-socket-to-match-up-with.patch
5f55c4c Add target to update patch series from git branch 'patches'
a89f966 Re-enable quilt patch system
5c83d17 Add minimum version of 0.9.7 to libpulse0 shlibs

Summary of changes:
 debian/changelog                                   |    5 +++-
 debian/control                                     |    2 +-
 debian/libpulse0.shlibs                            |    1 +
 ...ocket-to-tmp-.esd-socket-to-match-up-with.patch |   25 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 debian/rules                                       |    7 +++++
 6 files changed, 39 insertions(+), 2 deletions(-)
-----------------------------------------------------------------------
Details of changes:

commit 451b40b57289d3e872fbfdd2f3c0f55a614df966
Author: CJ van den Berg <cj at vdbonline.com>
Date:   Wed Oct 31 14:28:52 2007 +0100

    Update changelog

diff --git a/debian/changelog b/debian/changelog
index a24935e..fa60b42 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,8 +23,11 @@ pulseaudio (0.9.7-1) UNRELEASED; urgency=low
       esound-compat.
   * debian/pulseaudio-esound-compat.manpages: Move esdcompat manpage to
       pulseaudio-esound-compat.
+  * debian/libpulse0.shlibs: Add minimum version of 0.9.7 to libpulse0 shlibs.
+  * debian/patches:
+    + Added 0001-Set-ESD-socket-to-tmp-.esd-socket-to- match-up-with.patch
 
- -- CJ van den Berg <cj at vdbonline.com>  Tue, 30 Oct 2007 18:35:38 +0100
+ -- CJ van den Berg <cj at vdbonline.com>  Wed, 31 Oct 2007 14:26:14 +0100
 
 pulseaudio (0.9.6-2) unstable; urgency=low
 

commit 8235afffcf75963f9597966e8af3957a88b05ca0
Author: CJ van den Berg <cj at vdbonline.com>
Date:   Wed Oct 31 14:25:54 2007 +0100

    debian/patches: Added 0001-Set-ESD-socket-to-tmp-.esd-socket-to-match-up-with.patch

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
new file mode 100644
index 0000000..1efaae9
--- /dev/null
+++ b/debian/patches/0001-Set-ESD-socket-to-tmp-.esd-socket-to-match-up-with.patch
@@ -0,0 +1,25 @@
+From 4c1844dbd5fdd8128fc609764ecd7ef09a6a04ef 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 597993c..b09d0f2 100755
+--- a/src/daemon/default.pa.in
++++ b/src/daemon/default.pa.in
+@@ -46,7 +46,7 @@ load-module module-detect
+ .endif
+ 
+ ### Load several protocols
+-load-module module-esound-protocol-unix
++load-module module-esound-protocol-unix socket="/tmp/.esd/socket"
+ load-module module-native-protocol-unix
+ 
+ ### Network access (may be configured with paprefs, so leave this commented
+-- 
+1.5.3.4.8.g9de4b-dirty
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..7102271
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Set-ESD-socket-to-tmp-.esd-socket-to-match-up-with.patch

commit 5f55c4c1f7037dae769bbfdfc570d64d462c2251
Author: CJ van den Berg <cj at vdbonline.com>
Date:   Wed Oct 31 14:10:26 2007 +0100

    Add target to update patch series from git branch 'patches'

diff --git a/debian/rules b/debian/rules
index e8b13b6..e9df37c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,6 +22,12 @@ clean::
 	rm -f debian/pulseaudio.install.kfreebsd-i386
 	rm -f debian/pulseaudio.install.kfreebsd-amd64
 
+update-patch-series:
+	mkdir -p $(CURDIR)/debian/patches
+	rm -f $(CURDIR)/debian/patches/*.patch
+	git-format-patch -o $(CURDIR)/debian/patches patches ^upstream | \
+		xargs -n 1 basename > $(CURDIR)/debian/patches/series
+
 DEB_CONFIGURE_EXTRA_FLAGS = --with-realtime-group=pulse-rt
 DEB_FIXPERMS_EXCLUDE = usr/bin/pulseaudio
 DEB_DH_MAKESHLIBS_ARGS_ALL = --exclude=usr/lib/pulse-0.9/modules

commit a89f966483fd2e9f19c4509b560ae792044a43c3
Author: CJ van den Berg <cj at vdbonline.com>
Date:   Wed Oct 31 13:41:39 2007 +0100

    Re-enable quilt patch system

diff --git a/debian/control b/debian/control
index 7d6ce31..88888ee 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: sound
 Priority: optional
 Maintainer: CJ van den Berg <cj at vdbonline.com>
 Uploaders: Sjoerd Simons <sjoerd at debian.org>
-Build-Depends: debhelper (>= 5), cdbs, m4, libltdl3-dev,
+Build-Depends: debhelper (>= 5), cdbs, quilt, m4, libltdl3-dev,
     liboil0.3-dev (>= 0.3.0) | liboil-dev, libsamplerate0-dev,
     libsndfile1-dev (>= 1.0.10) | libsndfile-dev, libx11-dev,
     x11proto-core-dev, libxt-dev, libglib2.0-dev,
diff --git a/debian/rules b/debian/rules
index b5a06e7..e8b13b6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,7 @@
 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
 
 common-build-arch::
 	grep -v -e alsa -e evdev debian/pulseaudio.install > \

commit 5c83d1796b94bbca53f882e6028887d65b466a13
Author: CJ van den Berg <cj at vdbonline.com>
Date:   Wed Oct 31 13:55:56 2007 +0100

    Add minimum version of 0.9.7 to libpulse0 shlibs

diff --git a/debian/libpulse0.shlibs b/debian/libpulse0.shlibs
new file mode 100644
index 0000000..e2f3361
--- /dev/null
+++ b/debian/libpulse0.shlibs
@@ -0,0 +1 @@
+libpulse 0 libpulse0 (>= 0.9.7)

-- 
pulseaudio packaging



More information about the Pkg-pulseaudio-devel mailing list