[pkg-bacula-commits] [bacula] 05/06: let ucf know about previous md5sums of make_catalog_backup

[Carsten Leonhardt]

This is an automated email from the git hooks/post-receive script.

leo pushed a commit to branch master
in repository bacula.

commit 8fd9e05c4c03fc95b10faa69e2dd800359babb86
Author: Carsten Leonhardt <leo at debian.org>
Date:   Mon Sep 19 17:01:35 2016 +0200

    let ucf know about previous md5sums of make_catalog_backup
---
 debian/additions/make_catalog_backup.md5sum | 7 +++++++
 debian/bacula-director.install              | 2 ++
 debian/bacula-director.postinst             | 6 ++++--
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/debian/additions/make_catalog_backup.md5sum b/debian/additions/make_catalog_backup.md5sum
new file mode 100644
index 0000000..0974eea
--- /dev/null
+++ b/debian/additions/make_catalog_backup.md5sum
@@ -0,0 +1,7 @@
+# let ucf know about previous md5sums of make_catalog_backup
+1a86e58d4056ace0b0dbf37d292c08f8	5.0.2-2*
+53841c09e3d46794354e99557ae761b1	5.2.6+dfsg-[8-9]*
+3083f4acf8b2c996e84ff95991e7f3e4	7.0.5+dfsg-[2-4]
+3bbf9c68d1c19a5ca2ddefec05b628fd	7.4.0*.a~dfsg-1
+a211b5fe4b7a2085fe3e75aa53ec54ed	7.4.[12]*
+3d44e2dedc9ccd1461866a1fe5260ada	7.4.3+dfsg-[1-6]
diff --git a/debian/bacula-director.install b/debian/bacula-director.install
index 72b242a..51e713d 100644
--- a/debian/bacula-director.install
+++ b/debian/bacula-director.install
@@ -1,3 +1,5 @@
+# let ucf know about previous md5sums of make_catalog_backup
+debian/additions/make_catalog_backup.md5sum usr/share/bacula-common/defconfig/scripts
 etc/bacula/scripts/delete_catalog_backup usr/share/bacula-common/defconfig/scripts
 etc/bacula/scripts/make_catalog_backup usr/share/bacula-common/defconfig/scripts
 etc/bacula/scripts/make_catalog_backup.pl
diff --git a/debian/bacula-director.postinst b/debian/bacula-director.postinst
index 08cd609..f3c93da 100644
--- a/debian/bacula-director.postinst
+++ b/debian/bacula-director.postinst
@@ -98,8 +98,10 @@ case "$1" in
 	    ucfr -f bacula-director $DSTDIR/scripts/make_catalog_backup
         fi
 
-	tempfile=`tempfile -p "conf"`
+	tempfile=`tempfile -p "conf-"`
 	install -m 0755 -o root -g root $TEMPLATES/scripts/make_catalog_backup $tempfile
+	# let ucf know about previous md5sums of make_catalog_backup
+	cp $TEMPLATES/scripts/make_catalog_backup.md5sum $tempfile.md5sum
 
 	DBLONGNAME=$(cat /usr/share/bacula-common/dbtype | sed 's/pgsql/postgresql/')
 	sed "s/XX_DBLONGNAME_XX/$DBLONGNAME/" -i $tempfile
@@ -110,7 +112,7 @@ case "$1" in
 
 	ucf --debconf-ok --three-way $tempfile $DSTDIR/scripts/make_catalog_backup
 	ucfr bacula-director $DSTDIR/scripts/make_catalog_backup
-	rm -f $tempfile
+	rm -f $tempfile $tempfile.md5sum
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-bacula/bacula.git