[pkg-bacula-commits] [bacula] 06/06: script dvd-handler no longer installed by upstream

[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 f7efbfba36e6c744152397565b4ff1186436205d
Author: Carsten Leonhardt <leo at debian.org>
Date:   Mon Aug 14 23:35:00 2017 +0200

    script dvd-handler no longer installed by upstream
    
    We will remove existing copies following conffile removal policies.
    Adjusted maintscript handling accordingly.
---
 debian/bacula-sd.install                             | 1 -
 debian/bacula-sd.maintscript                         | 2 ++
 debian/changelog                                     | 6 ++++--
 debian/scripts/generate-doc-dir-to-symlink-migration | 4 +++-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/debian/bacula-sd.install b/debian/bacula-sd.install
index 4b60256..905028c 100644
--- a/debian/bacula-sd.install
+++ b/debian/bacula-sd.install
@@ -1,5 +1,4 @@
 etc/bacula/scripts/disk-changer
-etc/bacula/scripts/dvd-handler
 etc/bacula/scripts/mtx-changer
 etc/bacula/scripts/mtx-changer.conf
 usr/sbin/bacula-sd
diff --git a/debian/bacula-sd.maintscript b/debian/bacula-sd.maintscript
new file mode 100644
index 0000000..8aee025
--- /dev/null
+++ b/debian/bacula-sd.maintscript
@@ -0,0 +1,2 @@
+dir_to_symlink /usr/share/doc/bacula-sd bacula-common 7.0.5+dfsg-4~
+rm_conffile /etc/bacula/scripts/dvd-handler 9.0.3+dfsg-1~
diff --git a/debian/changelog b/debian/changelog
index 6207471..2fc15ee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 bacula (9.0.3+dfsg-1) unstable; urgency=low
 
   * New upstream release (Closes: #855645)
+  * script dvd-handler removed,
+    adjust maintscript handling accordingly
   * Refreshed debian patches "fix-default-config",
     "switch-nonfree-sha1-to-openssl.patch" and
     "non-forking-systemd-units.patch"
@@ -10,9 +12,9 @@ bacula (9.0.3+dfsg-1) unstable; urgency=low
     bacula-director-sqlite3. (Closes: #854684)
   * Let debian/scripts/install-dbconfig detect an unsupported bacula
     database version update and abort the build if needed
-  * updated upstreams signing key
+  * updated upstream signing key
 
- -- Carsten Leonhardt <leo at debian.org>  Mon, 14 Aug 2017 22:44:45 +0200
+ --
 
 bacula (7.4.4+dfsg-5) unstable; urgency=medium
 
diff --git a/debian/scripts/generate-doc-dir-to-symlink-migration b/debian/scripts/generate-doc-dir-to-symlink-migration
index 3c19b64..5ed8556 100755
--- a/debian/scripts/generate-doc-dir-to-symlink-migration
+++ b/debian/scripts/generate-doc-dir-to-symlink-migration
@@ -4,7 +4,9 @@
 # transition from doc dirs to symlinks
 
 # all binary packages except bacula-common
-PACKAGES="bacula-common-mysql bacula-common-pgsql bacula-common-sqlite3 bacula-console bacula-console-qt bacula-director-mysql bacula-director-pgsql bacula-director-sqlite3 bacula-fd bacula-sd"
+# bacula-sd now also removes "dvd-handler" so is handled manually
+PACKAGES="bacula-common-mysql bacula-common-pgsql bacula-common-sqlite3 bacula-console bacula-console-qt bacula-director-mysql bacula-director-pgsql bacula-director-sqlite3 bacula-fd"
+
 
 for pkg in $PACKAGES; do
     case $1 in

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