This is an automated email from the git hooks/post-receive script. fsateler pushed a commit to branch master in repository pulseaudio.
commit 480b9384b94a4cb115168ccbfcb4c7e427aec526 Author: Felipe Sateler <[email protected]> Date: Fri Apr 25 17:09:10 2014 -0300 Remove pulseaudio init script, place it under examples. Closes: #696842 --- debian/changelog | 2 ++ debian/pulseaudio.NEWS | 10 ++++++++++ debian/{pulseaudio.default => pulseaudio.default.example} | 0 debian/pulseaudio.examples | 1 + debian/{pulseaudio.init => pulseaudio.init.example} | 5 +++++ debian/pulseaudio.maintscript | 2 ++ debian/pulseaudio.postinst | 13 +++++++++++++ 7 files changed, 33 insertions(+) diff --git a/debian/changelog b/debian/changelog index acb8aeb..053875e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,8 @@ pulseaudio (5.0-3) UNRELEASED; urgency=medium - neither are the pulseaudio configuration files * Do not start pulseaudio in X session if it was already started. Closes: #743813 + * Remove pulseaudio init script, place it under examples. + Closes: #696842 -- Felipe Sateler <[email protected]> Mon, 14 Apr 2014 10:02:36 -0300 diff --git a/debian/pulseaudio.NEWS b/debian/pulseaudio.NEWS new file mode 100644 index 0000000..f387ba1 --- /dev/null +++ b/debian/pulseaudio.NEWS @@ -0,0 +1,10 @@ +pulseaudio (5.0-3) UNRELEASED; urgency=medium + + Pulseaudio no longer installs the initscript for a system wide daemon. + If you use systemwide mode (you probably shouldn't), you can find the init + script plus default file in /usr/share/doc/pulseaudio/examples/ + + If you have modified the init script or the default file, you will find a + backup of the file with a .dpkg-bak suffix. + + -- Felipe Sateler <[email protected]> Fri, 25 Apr 2014 16:24:07 -0300 diff --git a/debian/pulseaudio.default b/debian/pulseaudio.default.example similarity index 100% rename from debian/pulseaudio.default rename to debian/pulseaudio.default.example diff --git a/debian/pulseaudio.examples b/debian/pulseaudio.examples new file mode 100644 index 0000000..6c171cc --- /dev/null +++ b/debian/pulseaudio.examples @@ -0,0 +1 @@ +debian/pulseaudio.*.example diff --git a/debian/pulseaudio.init b/debian/pulseaudio.init.example similarity index 91% rename from debian/pulseaudio.init rename to debian/pulseaudio.init.example index 4167faa..cdf1e46 100644 --- a/debian/pulseaudio.init +++ b/debian/pulseaudio.init.example @@ -11,6 +11,11 @@ # Description: System mode startup script for # the PulseAudio sound server. ### END INIT INFO +# +# Example init file for a system wide pulseaudio daemon. +# If you use system wide mode, you are on your own! +# http://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/WhatIsWrongWithSystemWide/ +# DAEMON=/usr/bin/pulseaudio PIDDIR=/var/run/pulse diff --git a/debian/pulseaudio.maintscript b/debian/pulseaudio.maintscript new file mode 100644 index 0000000..ba25fc9 --- /dev/null +++ b/debian/pulseaudio.maintscript @@ -0,0 +1,2 @@ +rm_conffile /etc/default/pulseaudio 5.0-3~ +rm_conffile /etc/init.d/pulseaudio 5.0-3~ diff --git a/debian/pulseaudio.postinst b/debian/pulseaudio.postinst index a0f4b9d..7f01bf3 100644 --- a/debian/pulseaudio.postinst +++ b/debian/pulseaudio.postinst @@ -38,4 +38,17 @@ esac #DEBHELPER# +# This has to be after the debhelper block, so that dpkg-maintscript-helper +# has had a chance to remove the init file +# This init file was removed in 5.0-3, remove the links if +# no version with local modifications remain +if [ "$1" = "configure" ] ; then + if dpkg --compare-versions "$2" lt "5.0-3~" ; then + if [ ! -f /etc/init.d/pulseaudio ] ; then + update-rc.d pulseaudio remove + fi + fi +fi + + exit 0 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-pulseaudio/pulseaudio.git _______________________________________________ pkg-pulseaudio-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-pulseaudio-devel
