[pkg-bacula-commits] [SCM] Bacula, a network backup, recovery and verification program branch, squeeze-backports, updated. debian/5.2.6+dfsg-5_bpo60+2

[Bart Swedrowski]

The following commit has been merged in the squeeze-backports branch:
commit ab040aa4480c7976427785e2a425c2fb34251c17
Author: Bart Swedrowski <bart at timedout.org>
Date:   Mon Oct 1 12:04:58 2012 +0100

    Change back to using /var/run

diff --git a/debian/additions/common-functions.init b/debian/additions/common-functions.init
index 367e4af..f2b7f00 100644
--- a/debian/additions/common-functions.init
+++ b/debian/additions/common-functions.init
@@ -4,8 +4,8 @@
 
 create_var_run_dir()
 {
-	if [ ! -d /run/bacula/ ]; then
-		mkdir -p -m 0755 /run/bacula/
-		chown bacula:daemon /run/bacula/
+	if [ ! -d /var/run/bacula/ ]; then
+		mkdir -p -m 0755 /var/run/bacula/
+		chown bacula:daemon /var/run/bacula/
 	fi
 }
diff --git a/debian/bacula-common.postrm b/debian/bacula-common.postrm
index 698849f..3ff9d98 100644
--- a/debian/bacula-common.postrm
+++ b/debian/bacula-common.postrm
@@ -6,7 +6,7 @@ set -e
 case "$1" in
 	purge)
 		rm -f /etc/bacula/common_default_passwords
-		rm -rf /run/bacula
+		rm -rf /var/run/bacula
 		rm -rf /var/log/bacula
 		rm -rf /var/lib/bacula
 	;;
diff --git a/debian/bacula-director-common.bacula-director.init b/debian/bacula-director-common.bacula-director.init
index 873de80..4d5db63 100644
--- a/debian/bacula-director-common.bacula-director.init
+++ b/debian/bacula-director-common.bacula-director.init
@@ -38,7 +38,7 @@ if [ -n "`getent services bacula-dir`" ]; then
 fi
  
 
-PIDFILE=/run/bacula/$NAME.$PORT.pid
+PIDFILE=/var/run/bacula/$NAME.$PORT.pid
 
 . /lib/lsb/init-functions
 . /usr/share/bacula-common/common-functions.init
@@ -87,6 +87,7 @@ case "$1" in
 		exit 0
 	fi
 
+        create_var_run_dir
 	log_daemon_msg "Starting $DESC..." "$NAME"
         if do_start ; then
                 log_end_msg 0
diff --git a/debian/bacula-fd.init b/debian/bacula-fd.init
index fc52573..eebfd9c 100644
--- a/debian/bacula-fd.init
+++ b/debian/bacula-fd.init
@@ -49,7 +49,7 @@ ARGS="${ARGS:-}"
 create_var_run_dir
 
 
-PIDFILE=/run/bacula/$NAME.$PORT.pid
+PIDFILE=/var/run/bacula/$NAME.$PORT.pid
 
 do_start()
 {
diff --git a/debian/bacula-sd.init b/debian/bacula-sd.init
index 2e0ecb5..5584fac 100644
--- a/debian/bacula-sd.init
+++ b/debian/bacula-sd.init
@@ -46,7 +46,7 @@ ARGS="${ARGS:-}"
 
 create_var_run_dir
 
-PIDFILE=/run/bacula/$NAME.$PORT.pid
+PIDFILE=/var/run/bacula/$NAME.$PORT.pid
 
 do_start()
 {
diff --git a/debian/changelog b/debian/changelog
index 848cb97..9ad6b8d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+bacula (5.2.6+dfsg-5~bpo60+2) squeeze-backports; urgency=low
+
+  [ Bart Swedrowski ]
+  * switch back to using /var/run
+
+ -- Bart Swedrowski <bart at timedout.org>  Mon, 01 Oct 2012 12:01:31 +0100
+
 bacula (5.2.6+dfsg-5~bpo60+1) squeeze-backports; urgency=low
 
   [ Bart Swedrowski ]
diff --git a/debian/control b/debian/control
index 08b8195..e318e8a 100644
--- a/debian/control
+++ b/debian/control
@@ -36,7 +36,7 @@ Package: bacula-common
 Replaces: bacula-director-common
 Architecture: any
 Pre-Depends: adduser
-Depends: initscripts (>= 2.88dsf-13.3), ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Suggests: bacula-doc
 Description: network backup service - common support files
  Bacula is a set of programs to manage backup, recovery, and verification of
@@ -275,7 +275,7 @@ Description: network backup service - client metapackage
 Package: bacula-fd
 Architecture: any
 Depends: bacula-common (= ${binary:Version}), lsb-base, ucf,
- initscripts (>= 2.88dsf-13.3), ${shlibs:Depends}, ${misc:Depends}
+ ${shlibs:Depends}, ${misc:Depends}
 Suggests: bacula-traymonitor
 Description: network backup service - file daemon
  Bacula is a set of programs to manage backup, recovery, and verification of
@@ -312,7 +312,7 @@ Description: network backup service - server metapackage
 Package: bacula-sd
 Architecture: any
 Depends: bacula-common (= ${binary:Version}), mtx, python, lsb-base, ucf,
- initscripts (>= 2.88dsf-13.3), ${shlibs:Depends}, ${misc:Depends}
+ ${shlibs:Depends}, ${misc:Depends}
 Recommends: mt-st, bacula-sd-sqlite3 (>= ${source:Version}) | bacula-sd-tools
 Suggests: dds2tar, scsitools, sg3-utils
 Description: network backup service - storage daemon
diff --git a/debian/rules b/debian/rules
index 5a9f95e..5a436c8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -46,7 +46,7 @@ CONF_ALL	= \
 	--with-pid-dir=/run/bacula \
 	--with-smtp-host=localhost \
 	--with-working-dir=/var/lib/bacula \
-	--with-subsys-dir=/run/lock \
+	--with-subsys-dir=/var/run/lock \
 	--with-dump-email=root \
 	--with-job-email=root \
 	--with-systemd=/lib/systemd/system \

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