[Pkg-pulseaudio-devel] [SCM] pulseaudio packaging branch, master, updated. debian/0.9.14-1-6-g6428435

sjoerd at users.alioth.debian.org sjoerd at users.alioth.debian.org
Fri Feb 20 23:52:36 UTC 2009


The branch, master has been updated
       via  64284358b57f645adffd8b106a76ba5cb7a61381 (commit)
       via  29e51f0d09bc8bae147d556f0254d93f5b8ce633 (commit)
       via  a8aa2baddafa3345f05a7809f280a18cc0268101 (commit)
       via  339e06d3cd5b3d152398424d6e90ed7315be7f48 (commit)
       via  0ea7868271f1491fc4e823180d09eae78c683cd2 (commit)
       via  1a0de177bc5c8458612a780104423b49c2c58a1f (commit)
      from  a0df59aed8ce30e282e19cac75177446f584c81e (commit)


- Shortlog ------------------------------------------------------------
6428435 Make the start option of the init script report the right status. Fix suggested by Aron Griffis (Closes: #488752)
29e51f0 fix for #488754 also fixes #498457
a8aa2ba Don't put stop links in rc0 and rc6. Pulse doens't really need it. Patch supplied by James Westby (Closes: #494959)
339e06d Wait up to 5 seconds for pulseaudio to stop. Fix suggested by Aron Griffis (Closes: #488754)
0ea7868 Bump shlibs of libpulse0 (Closes: #514645)
1a0de17 Build against libcap2-dev (Closes: #489060)

Summary of changes:
 debian/changelog        |   13 +++++++++++++
 debian/control          |    2 +-
 debian/libpulse0.shlibs |    2 +-
 debian/pulseaudio.init  |    7 ++++---
 debian/rules            |    2 +-
 5 files changed, 20 insertions(+), 6 deletions(-)
-----------------------------------------------------------------------
Details of changes:

commit 64284358b57f645adffd8b106a76ba5cb7a61381
Author: Sjoerd Simons <sjoerd at debian.org>
Date:   Fri Feb 20 23:44:22 2009 +0000

    Make the start option of the init script report the right status. Fix suggested by Aron Griffis (Closes: #488752)

diff --git a/debian/changelog b/debian/changelog
index 37651be..d0c0bef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,10 @@ pulseaudio (0.9.14-2) UNRELEASED; urgency=low
     (Closes: #488754, #498457)
   * Don't put stop links in rc0 and rc6. Pulse doens't really need it. Patch
     supplied by James Westby (Closes: #494959)
+  * Make the start option of the init script report the right status. Fix
+    suggested by Aron Griffis (Closes: #488752)
 
- -- Sjoerd Simons <sjoerd at debian.org>  Fri, 20 Feb 2009 23:35:31 +0000
+ -- Sjoerd Simons <sjoerd at debian.org>  Fri, 20 Feb 2009 23:43:31 +0000
 
 pulseaudio (0.9.14-1) experimental; urgency=low
 
diff --git a/debian/pulseaudio.init b/debian/pulseaudio.init
index b3d92a8..5bb7b79 100755
--- a/debian/pulseaudio.init
+++ b/debian/pulseaudio.init
@@ -28,6 +28,7 @@ test "$PULSEAUDIO_SYSTEM_START" != "1" && exit 0
 pulseaudio_start () {
 	log_begin_msg "Starting PulseAudio Daemon"
 	start-stop-daemon -x $DAEMON -p $PIDFILE --start -- --system --daemonize --high-priority --log-target=syslog --disallow-module-loading=$DISALLOW_MODULE_LOADING
+	status=$?
 	if [ -e /var/run/pulse/.esd_auth ]; then
 		chown pulse:pulse-access /var/run/pulse/.esd_auth
 		chmod 640 /var/run/pulse/.esd_auth
@@ -36,7 +37,7 @@ pulseaudio_start () {
 		chown pulse:pulse-access /var/run/pulse/.pulse-cookie
 		chmod 640 /var/run/pulse/.pulse-cookie
 	fi
-	log_end_msg $?
+	log_end_msg ${status}
 }
 
 pulseaudio_stop () {

commit 29e51f0d09bc8bae147d556f0254d93f5b8ce633
Author: Sjoerd Simons <sjoerd at debian.org>
Date:   Fri Feb 20 23:39:06 2009 +0000

    fix for #488754 also fixes #498457

diff --git a/debian/changelog b/debian/changelog
index ec86ad5..37651be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,7 @@ pulseaudio (0.9.14-2) UNRELEASED; urgency=low
   * Build against libcap2-dev (Closes: #489060)
   * Bump shlibs of libpulse0 (Closes: #514645)
   * Wait up to 5 seconds for pulseaudio to stop. Fix suggested by Aron Griffis
-    (Closes: #488754)
+    (Closes: #488754, #498457)
   * Don't put stop links in rc0 and rc6. Pulse doens't really need it. Patch
     supplied by James Westby (Closes: #494959)
 

commit a8aa2baddafa3345f05a7809f280a18cc0268101
Author: Sjoerd Simons <sjoerd at debian.org>
Date:   Fri Feb 20 23:36:57 2009 +0000

    Don't put stop links in rc0 and rc6. Pulse doens't really need it. Patch supplied by James Westby (Closes: #494959)

diff --git a/debian/changelog b/debian/changelog
index c29a8fa..ec86ad5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,10 @@ pulseaudio (0.9.14-2) UNRELEASED; urgency=low
   * Bump shlibs of libpulse0 (Closes: #514645)
   * Wait up to 5 seconds for pulseaudio to stop. Fix suggested by Aron Griffis
     (Closes: #488754)
+  * Don't put stop links in rc0 and rc6. Pulse doens't really need it. Patch
+    supplied by James Westby (Closes: #494959)
 
- -- Sjoerd Simons <sjoerd at debian.org>  Fri, 20 Feb 2009 23:31:54 +0000
+ -- Sjoerd Simons <sjoerd at debian.org>  Fri, 20 Feb 2009 23:35:31 +0000
 
 pulseaudio (0.9.14-1) experimental; urgency=low
 
diff --git a/debian/pulseaudio.init b/debian/pulseaudio.init
index e769317..b3d92a8 100755
--- a/debian/pulseaudio.init
+++ b/debian/pulseaudio.init
@@ -6,7 +6,7 @@
 # Should-Start:      dbus
 # Should-Stop:       dbus
 # Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
+# Default-Stop:      1
 # Short-Description: Start the PulseAudio sound server
 # Description:       System mode startup script for
 #                    the PulseAudio sound server.
diff --git a/debian/rules b/debian/rules
index a2515ad..88bc046 100755
--- a/debian/rules
+++ b/debian/rules
@@ -37,4 +37,4 @@ update-patch-series:
 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
+DEB_UPDATE_RCD_PARAMS = start 25 2 3 4 5 . stop 15 1 .

commit 339e06d3cd5b3d152398424d6e90ed7315be7f48
Author: Sjoerd Simons <sjoerd at debian.org>
Date:   Fri Feb 20 23:33:41 2009 +0000

    Wait up to 5 seconds for pulseaudio to stop. Fix suggested by Aron Griffis (Closes: #488754)

diff --git a/debian/changelog b/debian/changelog
index 6504947..c29a8fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,10 @@ pulseaudio (0.9.14-2) UNRELEASED; urgency=low
 
   * Build against libcap2-dev (Closes: #489060)
   * Bump shlibs of libpulse0 (Closes: #514645)
+  * Wait up to 5 seconds for pulseaudio to stop. Fix suggested by Aron Griffis
+    (Closes: #488754)
 
- -- Sjoerd Simons <sjoerd at debian.org>  Fri, 20 Feb 2009 23:25:24 +0000
+ -- Sjoerd Simons <sjoerd at debian.org>  Fri, 20 Feb 2009 23:31:54 +0000
 
 pulseaudio (0.9.14-1) experimental; urgency=low
 
diff --git a/debian/pulseaudio.init b/debian/pulseaudio.init
index 86e6eb9..e769317 100755
--- a/debian/pulseaudio.init
+++ b/debian/pulseaudio.init
@@ -41,7 +41,7 @@ pulseaudio_start () {
 
 pulseaudio_stop () {
 	log_begin_msg "Stopping PulseAudio Daemon"
-	start-stop-daemon -p $PIDFILE --stop || echo -n "... pulseaudio is not running"
+	start-stop-daemon -p $PIDFILE --stop --retry 5 || echo -n "... pulseaudio is not running"
 	log_end_msg $?
 }
 

commit 0ea7868271f1491fc4e823180d09eae78c683cd2
Author: Sjoerd Simons <sjoerd at debian.org>
Date:   Fri Feb 20 23:25:52 2009 +0000

    Bump shlibs of libpulse0 (Closes: #514645)

diff --git a/debian/changelog b/debian/changelog
index dcd7a57..6504947 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 pulseaudio (0.9.14-2) UNRELEASED; urgency=low
 
   * Build against libcap2-dev (Closes: #489060)
+  * Bump shlibs of libpulse0 (Closes: #514645)
 
- -- Sjoerd Simons <sjoerd at debian.org>  Fri, 20 Feb 2009 23:21:26 +0000
+ -- Sjoerd Simons <sjoerd at debian.org>  Fri, 20 Feb 2009 23:25:24 +0000
 
 pulseaudio (0.9.14-1) experimental; urgency=low
 
diff --git a/debian/libpulse0.shlibs b/debian/libpulse0.shlibs
index 02e7d42..eb11d86 100644
--- a/debian/libpulse0.shlibs
+++ b/debian/libpulse0.shlibs
@@ -1,2 +1,2 @@
-libpulse 0 libpulse0 (>= 0.9.8)
+libpulse 0 libpulse0 (>= 0.9.14)
 libpulse-simple 0 libpulse0

commit 1a0de177bc5c8458612a780104423b49c2c58a1f
Author: Sjoerd Simons <sjoerd at debian.org>
Date:   Fri Feb 20 23:22:37 2009 +0000

    Build against libcap2-dev (Closes: #489060)

diff --git a/debian/changelog b/debian/changelog
index 3aa9a49..dcd7a57 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pulseaudio (0.9.14-2) UNRELEASED; urgency=low
+
+  * Build against libcap2-dev (Closes: #489060)
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Fri, 20 Feb 2009 23:21:26 +0000
+
 pulseaudio (0.9.14-1) experimental; urgency=low
 
   * New Upstream Version
diff --git a/debian/control b/debian/control
index 25288dc..6b642be 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ 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,
-    libcap-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+    libcap2-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,

-- 
pulseaudio packaging



More information about the Pkg-pulseaudio-devel mailing list