[Pkg-ocaml-maint-commits] r2968 - in /trunk/packages/mldonkey/trunk/debian: changelog mldonkey-server.init mldonkey-server.postinst mldonkey-server.prerm rules

[smimram at users.alioth.debian.org]

Author: smimram
Date: Thu Jul 20 18:38:32 2006
New Revision: 2968

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=2968
Log:
Retry to stop the deamon with --oknodo.

Added:
    trunk/packages/mldonkey/trunk/debian/mldonkey-server.prerm
Modified:
    trunk/packages/mldonkey/trunk/debian/changelog
    trunk/packages/mldonkey/trunk/debian/mldonkey-server.init
    trunk/packages/mldonkey/trunk/debian/mldonkey-server.postinst
    trunk/packages/mldonkey/trunk/debian/rules

Modified: trunk/packages/mldonkey/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/mldonkey/trunk/debian/changelog?rev=2968&op=diff
==============================================================================
--- trunk/packages/mldonkey/trunk/debian/changelog (original)
+++ trunk/packages/mldonkey/trunk/debian/changelog Thu Jul 20 18:38:32 2006
@@ -1,11 +1,14 @@
-mldonkey (2.7.7-5) UNRELEASED; urgency=low
-
+mldonkey (2.7.7-5) unstable; urgency=low
+
+  * Retry to stop the deamon with the --oknodo option of start-stop-daemon if
+    stopping fails in order to work around an old bug in the init.d script,
+    closes: #378934.
   * chown /var/run/mldonkey only if both variables MLDONKEY_USER and
     MLDONKEY_GROUP are set, closes: #378603.
   * Added arm_dynamic_loop_delay.dpatch on arm only to avoid a freeze of
     mldonkey, closes: #370107.
 
- -- Samuel Mimram <smimram at debian.org>  Wed, 19 Jul 2006 10:08:09 +0000
+ -- Samuel Mimram <smimram at debian.org>  Thu, 20 Jul 2006 18:26:02 +0000
 
 mldonkey (2.7.7-4) unstable; urgency=low
 

Modified: trunk/packages/mldonkey/trunk/debian/mldonkey-server.init
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/mldonkey/trunk/debian/mldonkey-server.init?rev=2968&op=diff
==============================================================================
--- trunk/packages/mldonkey/trunk/debian/mldonkey-server.init (original)
+++ trunk/packages/mldonkey/trunk/debian/mldonkey-server.init Thu Jul 20 18:38:32 2006
@@ -26,7 +26,7 @@
 
 . $CONFIG
 
-# /var/run is on tempfs now!
+# /var/run might be on tempfs, see #354701.
 if [ ! -d /var/run/mldonkey ]; then
     mkdir -m 755 /var/run/mldonkey
 fi

Modified: trunk/packages/mldonkey/trunk/debian/mldonkey-server.postinst
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/mldonkey/trunk/debian/mldonkey-server.postinst?rev=2968&op=diff
==============================================================================
--- trunk/packages/mldonkey/trunk/debian/mldonkey-server.postinst (original)
+++ trunk/packages/mldonkey/trunk/debian/mldonkey-server.postinst Thu Jul 20 18:38:32 2006
@@ -1,4 +1,9 @@
 #!/bin/sh -e
+
+function init_error
+{
+    exit 1
+}
 
 # Source debconf library
 . /usr/share/debconf/confmodule

Added: trunk/packages/mldonkey/trunk/debian/mldonkey-server.prerm
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/mldonkey/trunk/debian/mldonkey-server.prerm?rev=2968&op=file
==============================================================================
--- trunk/packages/mldonkey/trunk/debian/mldonkey-server.prerm (added)
+++ trunk/packages/mldonkey/trunk/debian/mldonkey-server.prerm Thu Jul 20 18:38:32 2006
@@ -1,0 +1,11 @@
+#!/bin/sh -e
+
+# Workaround bug in previous versions of the init.d script (--oknodo was
+# missing), see: #378934.
+function init_error
+{
+    echo "Retrying to stop daemon with oknodo."
+    start-stop-daemon --stop --oknodo --pidfile /var/run/mldonkey/mlnet.pid
+}
+
+#DEBHELPER#

Modified: trunk/packages/mldonkey/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/mldonkey/trunk/debian/rules?rev=2968&op=diff
==============================================================================
--- trunk/packages/mldonkey/trunk/debian/rules (original)
+++ trunk/packages/mldonkey/trunk/debian/rules Thu Jul 20 18:38:32 2006
@@ -147,7 +147,7 @@
 	dh_installexamples -a
 	dh_installmenu -a
 	dh_desktop -a
-	dh_installinit -a -- start 98 2 3 4 5 . stop 20 0 1 6 .
+	dh_installinit -a -pmldonkey-server --error-handler=init_error -- start 98 2 3 4 5 . stop 20 0 1 6 .
 	dh_installcron -a
 	dh_installman -a
 	dh_installchangelogs distrib/ChangeLog -a