* Apply patch for "init script fails to restart", thanks to Horst

  Schirmeier (closes: #453001).
* debian/rules: make configure-stamp depend on patch.

diff --git a/debian/changelog b/debian/changelog
index cc278582201384eb6012e9c68e123b3cea2edfbc..54bb1e72eabb2c526e5538cec1b751cd23b0f4f8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+iodine (0.4.0-5) unstable; urgency=low
+
+  * Apply patch for "init script fails to restart", thanks to Horst
+    Schirmeier (closes: #453001).
+  * debian/rules: make configure-stamp depend on patch.
+
+ -- gregor herrmann <gregor+debian@comodo.priv.at>  Mon, 26 Nov 2007 20:36:41 +0100
+
 iodine (0.4.0-4) unstable; urgency=low
 
   * Add French debconf translation, thanks to Christian Perrier

diff --git a/debian/iodine.iodined.init b/debian/iodine.iodined.init
index 0fb39ddad85bd2fc1139e2f9f12521229ef77f2a..7b7abe424c5ddd9cca2efbab874fac2fd674d927 100644 (file)
--- a/debian/iodine.iodined.init
+++ b/debian/iodine.iodined.init
@@ -57,6 +57,8 @@ get_config() {
 #
 do_start()
 {
+       # populate $DAEMON_ARGS
+       get_config
        # Return
        #   0 if daemon has been started
        #   1 if daemon was already running
@@ -99,7 +101,6 @@ do_stop()
 
 case "$1" in
   start)
-       get_config
        [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
        do_start
        case "$?" in

diff --git a/debian/rules b/debian/rules
index 272a4f63be9ad025f370cf5d7ecebb91494428d2..93e0261e84bd863d72bc7f6e2ad09469bc388a3a 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -20,12 +20,11 @@ else
 endif
 
 configure: configure-stamp
-configure-stamp:
+configure-stamp: patch
        dh_testdir
        touch configure-stamp
 
 build: build-stamp
-
 build-stamp: configure-stamp
        dh_testdir
        $(MAKE)
@@ -40,7 +39,7 @@ clean: unpatch
        debconf-updatepo
        dh_clean
 
-install: build patch
+install: build
        dh_testdir
        dh_testroot
        $(MAKE) install PREFIX=debian/iodine/usr