[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 40bc02d874192855b980180a15d7732c2fa133a1
Author: Luca Capello <luca at pca.it>
Date:   Wed Jun 13 10:43:34 2012 +0200

    debian/bacula-director-common.bacula-director.init: restore
    
    When moving /etc/init.d/bacula-director to bacula-director-<dbtype>,
    any local changes should be preserved.  It is impossible to do that
    with dpkg-maintscript-helper, given that the new conffile is now
    shipped by three different packages.  Thus, instead of error-prone
    solutions and given that starting from upstream 5.2.7 there will be no
    more for bacula-director-<dbtype> packages, it is useless to do this
    transition right now.  Thanks to piuparts.
    
    This reverts part of 1b033cf and c370db1.

diff --git a/debian/bacula-director-db.bacula-director.init.in b/debian/bacula-director-common.bacula-director.init
similarity index 100%
rename from debian/bacula-director-db.bacula-director.init.in
rename to debian/bacula-director-common.bacula-director.init
diff --git a/debian/bacula-director-db.prerm.in b/debian/bacula-director-db.prerm.in
index 85512fb..9db9409 100644
--- a/debian/bacula-director-db.prerm.in
+++ b/debian/bacula-director-db.prerm.in
@@ -13,6 +13,9 @@ if [ -f /usr/share/dbconfig-common/dpkg/prerm.$THISDB ]; then
 	dbc_go bacula-director-$THISDB $@
 fi
 
+if test "$1" = "remove" -o "$1" = "deconfigure"; then
+  invoke-rc.d bacula-director stop || exit $?-
+fi
 
 # dh_installdeb will replace this with shell code automatically
 # generated by other debhelper scripts.
diff --git a/debian/bacula-director-mysql.postinst b/debian/bacula-director-mysql.postinst
index b7ea9be..fafdff6 100644
--- a/debian/bacula-director-mysql.postinst
+++ b/debian/bacula-director-mysql.postinst
@@ -82,6 +82,7 @@ esac
 # Do start daemon
 db_stop
 
+invoke-rc.d bacula-director start || exit $?-
 
 #DEBHELPER#
 
diff --git a/debian/bacula-director-pgsql.postinst b/debian/bacula-director-pgsql.postinst
index 2357063..95a25f3 100644
--- a/debian/bacula-director-pgsql.postinst
+++ b/debian/bacula-director-pgsql.postinst
@@ -92,6 +92,7 @@ esac
 # Do start daemon
 db_stop
 
+invoke-rc.d bacula-director start || exit $?-
 
 #DEBHELPER#
 
diff --git a/debian/bacula-director-sqlite3.postinst b/debian/bacula-director-sqlite3.postinst
index 5b482fd..d003252 100644
--- a/debian/bacula-director-sqlite3.postinst
+++ b/debian/bacula-director-sqlite3.postinst
@@ -86,6 +86,7 @@ esac
 # Do start daemon
 db_stop
 
+invoke-rc.d bacula-director start || exit $?-
 
 #DEBHELPER#
 
diff --git a/debian/changelog b/debian/changelog
index 9e0fdcb..29d4510 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,15 +15,11 @@ bacula (5.2.6+dfsg-1) UNRELEASED; urgency=low
   * debian/bacula-*.lintian-overrides:
     - remove, now useless.
   * debian/bacula-fd.init, debian/bacula-sd.init, 
-    debian/bacula-director-db.bacula-director.init.in:
+    debian/bacula-director-common.bacula-director.init:
     + Add LSB Description.
   * debian/patches/fix-mysql55-sql-syntax.patch (Closes: #674809):
     + Fix installation on MySQL 5.5, thanks to 
       Corey Hickey <bugfood-c at fatooh.org>.
-  * debian/control:
-    + Force updating bacula-director-common package before 
-      bacula-director-<dbtype> due to file conflicts after moving 
-      bacula-director init-script.
   * debian/patches/*:
     + update for applying to new upstream version.
   * debian/bacula-sd-*.install:
diff --git a/debian/control b/debian/control
index 7760621..1dfab6e 100644
--- a/debian/control
+++ b/debian/control
@@ -161,7 +161,6 @@ Description: backup system - debug symbols for the Director common files
 
 Package: bacula-director-sqlite3
 Architecture: any
-Pre-Depends: bacula-director-common (>= 5.2.6+dfsg-1)
 Depends: bacula-director-common (= ${binary:Version}), bacula-common-sqlite3
  (>= ${binary:Version}), sqlite3, file, dbconfig-common, ucf,
  ${shlibs:Depends}, ${misc:Depends}
@@ -203,7 +202,6 @@ Description: backup system - debug symbols for the SQLite 3 storage for Director
 
 Package: bacula-director-mysql
 Architecture: any
-Pre-Depends: bacula-director-common (>= 5.2.6+dfsg-1)
 Depends: bacula-director-common (= ${binary:Version}), bacula-common-mysql
  (>= ${binary:Version}), dbconfig-common, mysql-client, ucf,
  ${shlibs:Depends}, ${misc:Depends}
@@ -246,7 +244,6 @@ Description: backup system - debug symbols for the MySQL storage for Director
 
 Package: bacula-director-pgsql
 Architecture: any
-Pre-Depends: bacula-director-common (>= 5.2.6+dfsg-1)
 Depends: bacula-director-common (= ${binary:Version}), bacula-common-pgsql
  (>= ${binary:Version}), dbconfig-common, postgresql-client (>= 7.4), ucf,
  ${shlibs:Depends}, ${misc:Depends}
diff --git a/debian/rules b/debian/rules
index 8440a49..c37a1e1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -113,9 +113,7 @@ override_dh_shlibdeps:
 override_dh_installinit:
 	dh_installinit -pbacula-sd -- defaults 90 10
 	dh_installinit -pbacula-fd -- defaults 91 9
-	dh_installinit -pbacula-director-pgsql --name=bacula-director -- defaults 92 8
-	dh_installinit -pbacula-director-mysql --name=bacula-director -- defaults 92 8
-	dh_installinit -pbacula-director-sqlite3 --name=bacula-director -- defaults 92 8
+	dh_installinit -pbacula-director-common --name=bacula-director --no-start -- defaults 92 8
 
 override_dh_install:
 	chmod 755 debian/additions/postinst-common

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