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

[Alexander Golovko]

The following commit has been merged in the master branch:
commit 7c92e3a835cb2c3d681fc9ad1f726b124cd8819e
Author: Alexander Golovko <alexandro at ankalagon.ru>
Date:   Sun Jun 3 23:31:44 2012 +0400

    Fix package upgrade regression
    
    Package can't be update since previous releases due to moving bacula-director
    init script from bacula-director-common package into bacula-director-<dbtype>
    packages.
    
    Force pre-depends on bacula-director-common first version, shipped without
    init script.

diff --git a/debian/changelog b/debian/changelog
index 2be77cc..d205d4a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,10 @@ bacula (5.0.3+dfsgreal-1) UNRELEASED; urgency=low
   * 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.
 
   [ Bartosz Cisek ]
   * debian/rules:
diff --git a/debian/control b/debian/control
index 2cad992..50afcbf 100644
--- a/debian/control
+++ b/debian/control
@@ -164,6 +164,7 @@ Description: backup system - debug symbols for the Director common files
 
 Package: bacula-director-sqlite3
 Architecture: any
+Pre-Depends: bacula-director-common (>= 5.0.3+dfsgreal-1)
 Depends: bacula-director-common (= ${binary:Version}), bacula-common-sqlite3
  (>= ${binary:Version}), sqlite3, file, dbconfig-common, ucf,
  ${shlibs:Depends}, ${misc:Depends}
@@ -205,6 +206,7 @@ Description: backup system - debug symbols for the SQLite 3 storage for Director
 
 Package: bacula-director-mysql
 Architecture: any
+Pre-Depends: bacula-director-common (>= 5.0.3+dfsgreal-1)
 Depends: bacula-director-common (= ${binary:Version}), bacula-common-mysql
  (>= ${binary:Version}), dbconfig-common, mysql-client, ucf,
  ${shlibs:Depends}, ${misc:Depends}
@@ -247,6 +249,7 @@ Description: backup system - debug symbols for the MySQL storage for Director
 
 Package: bacula-director-pgsql
 Architecture: any
+Pre-Depends: bacula-director-common (>= 5.0.3+dfsgreal-1)
 Depends: bacula-director-common (= ${binary:Version}), bacula-common-pgsql
  (>= ${binary:Version}), dbconfig-common, postgresql-client (>= 7.4), ucf,
  ${shlibs:Depends}, ${misc:Depends}

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