[pkg-bacula-commits] [SCM] Bacula, a network backup, recovery and verification program branch, master, updated. debian/5.0.3-1-188-g83e100b

[Luca Capello]

The following commit has been merged in the master branch:
commit 83e100b4d9f278b8dcc7aea7dffdef7968ade629
Author: Luca Capello <luca at pca.it>
Date:   Wed Jun 13 10:55:46 2012 +0200

    debian/bacula-*.init: move set call just after the LSB snippet

diff --git a/debian/bacula-director-common.bacula-director.init b/debian/bacula-director-common.bacula-director.init
index fbc44a1..6c44117 100644
--- a/debian/bacula-director-common.bacula-director.init
+++ b/debian/bacula-director-common.bacula-director.init
@@ -19,6 +19,9 @@
 #       Modified for Debian GNU/Linux by Ian Murdock <imurdock at gnu.ai.mit.edu>.
 #       Customized for Bacula by Jose Luis Tallon <jltallon at adv-solutions.net>
 #
+
+set -e
+
 PATH=/sbin:/bin:/usr/sbin:/usr/bin
 DAEMON=/usr/sbin/bacula-dir
 NAME="bacula-dir"
@@ -30,8 +33,6 @@ if [ ! -f $DAEMON ] ; then
 	exit 0
 fi
 
-set -e
-
 if [ -n "`getent services bacula-dir`" ]; then
         PORT=`getent services bacula-dir | awk '{ gsub("/tcp","",$2); print $2; }'`
 fi
diff --git a/debian/bacula-fd.init b/debian/bacula-fd.init
index d4c5022..06c7bcd 100644
--- a/debian/bacula-fd.init
+++ b/debian/bacula-fd.init
@@ -21,6 +21,9 @@
 #	Modified for Debian GNU/Linux by Ian Murdock <imurdock at gnu.ai.mit.edu>.
 #	Customized for Bacula by Jose Luis Tallon <jltallon at adv-solutions.net>
 #
+
+set -e
+
 PATH=/sbin:/bin:/usr/sbin:/usr/bin
 DAEMON=/usr/sbin/bacula-fd
 NAME="bacula-fd"
@@ -29,8 +32,6 @@ DESC="Bacula File daemon"
 
 test -f $DAEMON || exit 0
 
-set -e
-
 if [ -n "`getent services bacula-fd`" ]; then
 	PORT=`getent services bacula-fd | awk '{ gsub("/tcp","",$2); print $2; }'`
 fi
diff --git a/debian/bacula-sd.init b/debian/bacula-sd.init
index 61c4131..cd3058b 100644
--- a/debian/bacula-sd.init
+++ b/debian/bacula-sd.init
@@ -19,6 +19,9 @@
 #       Modified for Debian GNU/Linux by Ian Murdock <imurdock at gnu.ai.mit.edu>
 #       Customized for Bacula by Jose Luis Tallon <jltallon at adv-solutions.net>
 #
+
+set -e
+
 PATH=/sbin:/bin:/usr/sbin:/usr/bin
 DAEMON=/usr/sbin/bacula-sd
 NAME="bacula-sd"
@@ -27,8 +30,6 @@ DESC="Bacula Storage daemon"
 
 test -f $DAEMON || exit 0
 
-set -e
-
 if [ -n "`getent services bacula-sd`" ]; then
         PORT=`getent services bacula-sd | awk '{ gsub("/tcp","",$2); print $2; }'`
 fi
diff --git a/debian/changelog b/debian/changelog
index c0451db..d0fabd7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -131,6 +131,9 @@ bacula (5.2.6+dfsg-1) UNRELEASED; urgency=low
   * debian/bacula-director-common.bacula-director.init:
     + if the bacula-dir daemon is not found, notice the user that one of
       the bacula-director-<dbtype> packages must be installed.
+  * debian/bacula-director-common.bacula-director.init,
+    debian/bacula-fd.init, debian/bacula-sd.init:
+    + move set call just after the LSB snippet.
   * debian/bacula-traymonitor.install:
     + move bacula-tray-monitor to /usr/sbin/ as intended by upstream.
     + dh_install can not rename files, so the icon must be renamed in

-- 
Bacula, a network backup, recovery and verification program