[Demudi-commits] r1156 - timidity/trunk/debian

[Joost Damad]

Author: andete-guest
Date: 2007-03-24 07:04:51 +0000 (Sat, 24 Mar 2007)
New Revision: 1156

Modified:
   timidity/trunk/debian/changelog
   timidity/trunk/debian/timidity.init
Log:
add RC bugfix


Modified: timidity/trunk/debian/changelog
===================================================================
--- timidity/trunk/debian/changelog	2007-03-23 18:55:49 UTC (rev 1155)
+++ timidity/trunk/debian/changelog	2007-03-24 07:04:51 UTC (rev 1156)
@@ -1,3 +1,11 @@
+timidity (2.13.2-9) unstable; urgency=low
+
+  * Apply patch from version 2.13.2-7.3 which crossed my upload and
+    fixes bug #414929.
+  * Fix changelog to properly include 2.13.2-7.3 entry.
+
+ -- Joost Yervante Damad <andete at debian.org>  Fri, 23 Mar 2007 19:55:50 +0100
+
 timidity (2.13.2-8) unstable; urgency=low
 
   * New maintainer (Closes: #415829)
@@ -4,6 +12,19 @@
  
  -- Joost Yervante Damad <andete at debian.org>  Fri, 23 Mar 2007 19:49:25 +0100
 
+timidity (2.13.2-7.3) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * High-urgency upload for RC bugfix.
+  * Call start-stop-daemon with --oknodo when stopping timidity in the
+    init script, so that a stopped daemon isn't treated as an error on
+    upgrade.  Closes: #414929.
+  * Also, don't use --exec with start-stop-daemon --stop, as this will
+    fail to find a running daemon if the on-disk binary has been moved
+    out from under us for any reason; use --name instead.
+
+ -- Steve Langasek <vorlon at debian.org>  Thu, 22 Mar 2007 16:05:48 -0700
+
 timidity (2.13.2-7.2) unstable; urgency=low
 
   * Non-maintainer upload with maintainer permission.

Modified: timidity/trunk/debian/timidity.init
===================================================================
--- timidity/trunk/debian/timidity.init	2007-03-23 18:55:49 UTC (rev 1155)
+++ timidity/trunk/debian/timidity.init	2007-03-24 07:04:51 UTC (rev 1156)
@@ -52,8 +52,8 @@
 	;;
   stop)
   	echo -n "Stopping $DESC: "
-	if start-stop-daemon --stop --quiet --pidfile ${PIDFILE} \
-	   --exec ${DAEMON} --retry 10 ; then
+       if start-stop-daemon --stop --quiet --oknodo --pidfile ${PIDFILE} \
+          --name $(basename ${DAEMON}) --retry 10 ; then
 		echo "timidity."
 	else
 		echo "(failed)."