[Pkg-voip-commits] r6908 - in /mumble/trunk/debian: changelog control patches/ patches/logrotate-when-not-started patches/series rules

[slicer-guest at alioth.debian.org]

Author: slicer-guest
Date: Mon Mar 23 13:54:12 2009
New Revision: 6908

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=6908
Log:
Add --oknodo to logrotate script. (Closes: #520639)

Added:
    mumble/trunk/debian/patches/
    mumble/trunk/debian/patches/logrotate-when-not-started
    mumble/trunk/debian/patches/series
Modified:
    mumble/trunk/debian/changelog
    mumble/trunk/debian/control
    mumble/trunk/debian/rules

Modified: mumble/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/changelog?rev=6908&op=diff
==============================================================================
--- mumble/trunk/debian/changelog (original)
+++ mumble/trunk/debian/changelog Mon Mar 23 13:54:12 2009
@@ -1,3 +1,9 @@
+mumble (1.1.8-2) UNRELEASED; urgency=low
+
+  * Add --oknodo to logrotate script. (Closes: #520639)
+
+ -- Thorvald Natvig <slicer at users.sourceforge.net>  Mon, 23 Mar 2009 14:25:50 +0100
+
 mumble (1.1.8-1) unstable; urgency=low
 
   [ Patrick Matthäi ]

Modified: mumble/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/control?rev=6908&op=diff
==============================================================================
--- mumble/trunk/debian/control (original)
+++ mumble/trunk/debian/control Mon Mar 23 13:54:12 2009
@@ -4,7 +4,7 @@
 Homepage: http://mumble.sourceforge.net/
 Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
 Uploaders: Patrick Matthäi <patrick.matthaei at web.de>, Thorvald Natvig <slicer at users.sourceforge.net>
-Build-Depends: debhelper (>= 5.0.51~), po-debconf, libogg-dev, libspeechd-dev, libasound2-dev, libboost-dev, libqt4-dev, libqt4-opengl-dev, libspeex-dev, libspeexdsp-dev, libpulse-dev, libssl-dev, libxevie-dev, libzeroc-ice33-dev | libzeroc-ice32-dev | libzeroc-ice-dev , ice33-translators | ice32-translators | ice-translators, libg15daemon-client-dev, libcap2-dev, libc6-dev-i386 [amd64], gcc-multilib [amd64]
+Build-Depends: debhelper (>= 5.0.51~), po-debconf, quilt (>= 0.40), libogg-dev, libspeechd-dev, libasound2-dev, libboost-dev, libqt4-dev, libqt4-opengl-dev, libspeex-dev, libspeexdsp-dev, libpulse-dev, libssl-dev, libxevie-dev, libzeroc-ice33-dev | libzeroc-ice32-dev | libzeroc-ice-dev , ice33-translators | ice32-translators | ice-translators, libg15daemon-client-dev, libcap2-dev, libc6-dev-i386 [amd64], gcc-multilib [amd64]
 Standards-Version: 3.8.1
 DM-Upload-Allowed: yes
 Vcs-Svn: svn://svn.debian.org/pkg-voip/mumble/trunk/

Added: mumble/trunk/debian/patches/logrotate-when-not-started
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/patches/logrotate-when-not-started?rev=6908&op=file
==============================================================================
--- mumble/trunk/debian/patches/logrotate-when-not-started (added)
+++ mumble/trunk/debian/patches/logrotate-when-not-started Mon Mar 23 13:54:12 2009
@@ -1,0 +1,12 @@
+diff --git a/scripts/murmur.logrotate b/scripts/murmur.logrotate
+index 204d504..a6b7a38 100644
+--- a/scripts/murmur.logrotate
++++ b/scripts/murmur.logrotate
+@@ -5,6 +5,6 @@
+ 	delaycompress
+ 	missingok
+ 	postrotate
+-		start-stop-daemon --quiet --stop --signal 1 --exec /usr/sbin/murmurd --user mumble-server --pidfile /var/run/mumble-server/mumble-server.pid
++		start-stop-daemon --quiet --oknodo --stop --signal 1 --exec /usr/sbin/murmurd --user mumble-server --pidfile /var/run/mumble-server/mumble-server.pid
+ 	endscript
+ }

Added: mumble/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/patches/series?rev=6908&op=file
==============================================================================
--- mumble/trunk/debian/patches/series (added)
+++ mumble/trunk/debian/patches/series Mon Mar 23 13:54:12 2009
@@ -1,0 +1,1 @@
+logrotate-when-not-started

Modified: mumble/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/rules?rev=6908&op=diff
==============================================================================
--- mumble/trunk/debian/rules (original)
+++ mumble/trunk/debian/rules Mon Mar 23 13:54:12 2009
@@ -3,10 +3,12 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+include /usr/share/quilt/quilt.make
+
 export DH_OPTIONS
 
 configure: configure-stamp
-configure-stamp:
+configure-stamp: $(QUILT_STAMPFN)
 	echo $(DEB_BUILD_ARCH)
 	dh_testdir
 	qmake-qt4 -recursive main.pro \
@@ -37,7 +39,7 @@
 	slice2html src/murmur/Murmur.ice --output-dir Ice
 	touch $@
 
-clean:
+clean:	unpatch
 	dh_testdir
 	dh_testroot
 	rm -f build-arch-stamp build-indep-stamp configure-stamp