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

[Alexander Golovko]

The following commit has been merged in the master branch:
commit 06dd3b492ab9b9b54267dadd653d17e306a2d170
Author: Alexander Golovko <alexandro at ankalagon.ru>
Date:   Tue Jun 5 22:25:27 2012 +0400

    Some changes due to skipping 5.0.3+dfsgreal-1

diff --git a/debian/NEWS b/debian/NEWS
index 6c54170..3b668a7 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,6 +1,6 @@
-bacula (5.0.3+dfsgreal-1) unstable; urgency=low
+bacula (5.2.6+dfsg-1) unstable; urgency=low
 
-  Significant changes since versions before 5.0.3+dfsgreal-1:
+  Significant changes since versions before 5.2.6+dfsg-1:
 
   [ Jan Hauke Rahm ]
   * bacula-fd, -sd, and -director now ship /etc/default/bacula-{fd,sd,dir}
diff --git a/debian/additions/common-functions.dpkg b/debian/additions/common-functions.dpkg
index dd80ed3..44a17d5 100644
--- a/debian/additions/common-functions.dpkg
+++ b/debian/additions/common-functions.dpkg
@@ -88,7 +88,7 @@ setup_etc_default() {
 
 
     if [ -n "$3" ]; then
-        if dpkg --compare-versions "$3" lt "5.0.3+dfsgreal-1"; then
+        if dpkg --compare-versions "$3" lt "5.2.6+dfsg-1"; then
             if [ -f "/etc/bacula/do_not_run" ]; then
                 ENABLED="no"
             fi
diff --git a/debian/bacula-director-mysql.postinst b/debian/bacula-director-mysql.postinst
index e1ab30b..00e680c 100644
--- a/debian/bacula-director-mysql.postinst
+++ b/debian/bacula-director-mysql.postinst
@@ -48,7 +48,7 @@ setup_etc_default bacula-director-mysql $@
 case "$1" in
 configure)
 
-  if test -n "$2" && dpkg --compare-versions "$2" lt "5.0.3+dfsgreal-1"; then
+  if test -n "$2" && dpkg --compare-versions "$2" lt "5.2.6+dfsg-1"; then
     invoke-rc.d bacula-director stop || true
   fi
 
diff --git a/debian/bacula-director-pgsql.postinst b/debian/bacula-director-pgsql.postinst
index c125f8c..a328850 100644
--- a/debian/bacula-director-pgsql.postinst
+++ b/debian/bacula-director-pgsql.postinst
@@ -54,7 +54,7 @@ setup_etc_default bacula-director-pgsql $@
 case "$1" in
 configure)
 
-  if test -n "$2" && dpkg --compare-versions "$2" lt "5.0.3+dfsgreal-1"; then
+  if test -n "$2" && dpkg --compare-versions "$2" lt "5.2.6+dfsg-1"; then
     invoke-rc.d bacula-director stop || true
   fi
 	
diff --git a/debian/bacula-director-sqlite3.postinst b/debian/bacula-director-sqlite3.postinst
index ffd02a7..b7b6063 100644
--- a/debian/bacula-director-sqlite3.postinst
+++ b/debian/bacula-director-sqlite3.postinst
@@ -50,7 +50,7 @@ setup_etc_default bacula-director-sqlite3 $@
 case "$1" in
 configure)
 
-  if test -n "$2" && dpkg --compare-versions "$2" lt "5.0.3+dfsgreal-1"; then
+  if test -n "$2" && dpkg --compare-versions "$2" lt "5.2.6+dfsg-1"; then
     invoke-rc.d bacula-director stop || true
   fi
 
diff --git a/debian/changelog b/debian/changelog
index 5a3271e..a061583 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,22 +1,7 @@
 bacula (5.2.6+dfsg-1) UNRELEASED; urgency=low
 
   [ Alexander Golovko ]
-  * debian/patches/upstream-1623_debian-591293___file_jpfid_idx.patch,
-    debian/patches/upstream___Add-missing-bwild-bregex-man8-pages.patch:
-    - removed, already in upstream.
-  * debian/patches/*:
-    + update for applying to new upstream version.
-  * debian/bacula-sd-*.install:
-    + moved into template debian/bacula-sd-db.install.in.
-    + add new shared libraries libbaccats*.so.
-  * debian/patches/fix-libbaccats-rpath.patch:
-    + fix RPATH in libbaccats*.so.
-
- --
-
-bacula (5.0.3+dfsgreal-1) UNRELEASED; urgency=low
-
-  [ Alexander Golovko ]
+  * new upstream release (Closes: #648565).
   * debian/patches/switch-nonfree-sha1-to-openssl.patch
     (Closes: #658326):
     + switch from upstream nonfree SHA1 implementation to openssl
@@ -39,6 +24,13 @@ bacula (5.0.3+dfsgreal-1) UNRELEASED; urgency=low
     + 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:
+    + moved into template debian/bacula-sd-db.install.in.
+    + add new shared libraries libbaccats*.so.
+  * debian/patches/fix-libbaccats-rpath.patch:
+    + fix RPATH in libbaccats*.so.
 
   [ Bartosz Cisek ]
   * debian/rules:
@@ -137,10 +129,6 @@ bacula (5.0.3+dfsgreal-1) UNRELEASED; urgency=low
     + add note about moving bat/bconsole to /usr/sbin/.
   * debian/patches/fix-binutils-gold-linking.patch:
     + import from upstream BTS (Closes: #553956).
-  * debian/patches/upstream-1623_debian-591293___file_jpfid_idx.patch:
-    + import from Debian Git commit:fc7990a.
-  * debian/patches/upstream___Add-missing-bwild-bregex-man8-pages.patch:
-    + import from upstream Git commit:3cd099b.
   * debian/README.Debian:
     + explain why upstream sources are not DFSG-free.
   * debian/rules:
diff --git a/debian/control b/debian/control
index 6272afd..7bdb6d2 100644
--- a/debian/control
+++ b/debian/control
@@ -164,7 +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)
+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}
@@ -206,7 +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)
+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}
@@ -249,7 +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)
+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}

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