[pkg-bacula-commits] [SCM] Bacula, a network backup, recovery and verification program branch, master, updated. debian/5.2.6+dfsg-1-9-gfe62935

[Luca Capello]

The following commit has been merged in the master branch:
commit fe62935d7d3cf2ecf61437ffb15f69255e73b172
Author: Luca Capello <luca at pca.it>
Date:   Thu Jun 28 17:09:56 2012 +0200

    debian/bacula-director-*.postinst: (#656912) replace DBNAME

diff --git a/debian/bacula-director-mysql.postinst b/debian/bacula-director-mysql.postinst
index 16ee2ce..e4afc0f 100644
--- a/debian/bacula-director-mysql.postinst
+++ b/debian/bacula-director-mysql.postinst
@@ -64,6 +64,8 @@ configure)
 	-e s~XXX_FDPASSWORD_XXX~$FDPASSWD~ \
 		$DEFCONFIG/bacula-dir.conf > $TARGET
 
+	sed -i -e "s/XXX_DBNAME_XXX/$dbc_dbname/" /etc/bacula/scripts/delete_catalog_backup
+
 	sh $POSTINST_COMMON
 
 	echo "Ok."
diff --git a/debian/bacula-director-pgsql.postinst b/debian/bacula-director-pgsql.postinst
index 4afae3f..67576b8 100644
--- a/debian/bacula-director-pgsql.postinst
+++ b/debian/bacula-director-pgsql.postinst
@@ -73,6 +73,8 @@ configure)
                 $DEFCONFIG/bacula-dir.conf > $TARGET
         fi
 
+	sed -i -e "s/XXX_DBNAME_XXX/$dbc_dbname/" /etc/bacula/scripts/delete_catalog_backup
+
 	sh $POSTINST_COMMON
 	echo "Ok."
 	;;
diff --git a/debian/bacula-director-sqlite3.postinst b/debian/bacula-director-sqlite3.postinst
index 7312db0..61cd2f0 100644
--- a/debian/bacula-director-sqlite3.postinst
+++ b/debian/bacula-director-sqlite3.postinst
@@ -68,6 +68,8 @@ configure)
 		-e s~XXX_DBPASSWORD_XXX~~ \
 			$DEFCONFIG/bacula-dir.conf > $TARGET
         
+	sed -i -e "s/XXX_DBNAME_XXX/$dbc_dbname/" /etc/bacula/scripts/delete_catalog_backup
+
 	sh $POSTINST_COMMON
 
 	echo "Ok."
diff --git a/debian/changelog b/debian/changelog
index a6e336e..6cb974d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,9 @@ bacula (5.2.6+dfsg-2) UNRELEASED; urgency=low
     debian/bacula-traymonitor.postinst:
     + also replace *PASSWORD in config files, thanks to Richard
       Hartmann <richih.mailinglist at gmail.com> (Closes: #675227).
+  * debian/bacula-director-*.postinst:
+    + replace XXX_DBNAME_XXX, thanks to Guillaume Delacour
+      <gui at iroqwa.org> (Closes: #656912).
   * debian/bacula-director-*.postinst,
     debian/bacula-fd.postinst, debian/bacula-sd.postinst:
     + move set call at the top.

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