[pkg-bacula-commits] [bacula] 03/06: Move make_catalog_backup.pl to package bacula-director

[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 094e5198a66a7dd26810f5fdbf72d45b6eafaefa
Author: Carsten Leonhardt <leo at debian.org>
Date:   Mon Sep 19 13:33:46 2016 +0200

    Move make_catalog_backup.pl to package bacula-director
---
 debian/TODO                            |  9 +++++++++
 debian/bacula-director-mysql.install   |  1 -
 debian/bacula-director-pgsql.install   |  1 -
 debian/bacula-director-sqlite3.install |  1 -
 debian/bacula-director.install         |  1 +
 debian/changelog                       |  1 +
 debian/control                         | 12 ++++++------
 debian/rules                           |  5 -----
 8 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/debian/TODO b/debian/TODO
index f58b896..4d8811a 100644
--- a/debian/TODO
+++ b/debian/TODO
@@ -39,6 +39,15 @@ Wishlist:
    see: https://wiki.debian.org/UscanEnhancements
  * autopostrm would ideally become a debhelper script ...
 
+Problems:
+
+ * dpkg --status bacula-director-(DBTYPE) lists conffiles as obsolete
+   that moved to bacula-director. We probably have to live with that
+   as moving conffiles between pacakges isn't well supported.
+   See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=595112 - but
+   this doesn't even take a move from dpkg- to ucf-handled conffiles
+   into account
+
 Review unmerged old changes:
 
  * Ask for passwords via debconf (git tag development/2011-04-29)
diff --git a/debian/bacula-director-mysql.install b/debian/bacula-director-mysql.install
index ee9337a..f1aaddc 100644
--- a/debian/bacula-director-mysql.install
+++ b/debian/bacula-director-mysql.install
@@ -1,4 +1,3 @@
 debian/additions/mysql/make_catalog_backup_awk      etc/bacula/scripts
-etc/bacula/scripts/make_catalog_backup.pl
 etc/bacula/scripts/make_mysql_tables usr/share/bacula-director
 etc/bacula/scripts/update_mysql* usr/share/bacula-director
diff --git a/debian/bacula-director-pgsql.install b/debian/bacula-director-pgsql.install
index b32249e..2a6df38 100644
--- a/debian/bacula-director-pgsql.install
+++ b/debian/bacula-director-pgsql.install
@@ -2,6 +2,5 @@ debian/additions/pgsql/database/7.4.1	usr/share/dbconfig-common/scripts/bacula-d
 debian/additions/pgsql/database/pgsql	usr/share/dbconfig-common/data/bacula-director-pgsql/install-dbadmin
 debian/additions/pgsql/make_catalog_backup_awk      etc/bacula/scripts
 etc/bacula/scripts/grant_postgresql_privileges usr/share/bacula-director
-etc/bacula/scripts/make_catalog_backup.pl
 etc/bacula/scripts/make_postgresql_tables	usr/share/bacula-director
 etc/bacula/scripts/update_postgres* usr/share/bacula-director
diff --git a/debian/bacula-director-sqlite3.install b/debian/bacula-director-sqlite3.install
index 08f0d6f..bd39def 100644
--- a/debian/bacula-director-sqlite3.install
+++ b/debian/bacula-director-sqlite3.install
@@ -1,4 +1,3 @@
 debian/additions/sqlite3/make_catalog_backup_awk      etc/bacula/scripts
-etc/bacula/scripts/make_catalog_backup.pl
 etc/bacula/scripts/make_sqlite*tables usr/share/bacula-director
 etc/bacula/scripts/update_sqlite* usr/share/bacula-director
diff --git a/debian/bacula-director.install b/debian/bacula-director.install
index 3cbfc6a..72b242a 100644
--- a/debian/bacula-director.install
+++ b/debian/bacula-director.install
@@ -1,5 +1,6 @@
 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
 etc/bacula/scripts/query.sql
 usr/sbin/bacula-dir
 usr/sbin/bregex
diff --git a/debian/changelog b/debian/changelog
index ca12b66..6636cbf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ bacula (7.4.3+dfsg-7) unstable; urgency=high
 
   * Handle make_catalog_backup script in postinst of package
     bacula-director, inserting the correct database user (Closes: #838080)
+  * Move make_catalog_backup.pl to package bacula-director
 
  --
 
diff --git a/debian/control b/debian/control
index 0b92581..d3e89f4 100644
--- a/debian/control
+++ b/debian/control
@@ -125,13 +125,13 @@ Depends:
  ${misc:Depends},
  ${shlibs:Depends}
 Replaces:
- bacula-director-mysql (<< 7.4.3+dfsg-3),
- bacula-director-pgsql (<< 7.4.3+dfsg-3),
- bacula-director-sqlite3 (<< 7.4.3+dfsg-3)
+ bacula-director-mysql (<< 7.4.3+dfsg-7),
+ bacula-director-pgsql (<< 7.4.3+dfsg-7),
+ bacula-director-sqlite3 (<< 7.4.3+dfsg-7)
 Breaks:
- bacula-director-mysql (<< 7.4.3+dfsg-3),
- bacula-director-pgsql (<< 7.4.3+dfsg-3),
- bacula-director-sqlite3 (<< 7.4.3+dfsg-3)
+ bacula-director-mysql (<< 7.4.3+dfsg-7),
+ bacula-director-pgsql (<< 7.4.3+dfsg-7),
+ bacula-director-sqlite3 (<< 7.4.3+dfsg-7)
 Description: network backup service - Director daemon
  Bacula is a set of programs to manage backup, recovery, and verification of
  data across a network of computers of different kinds.
diff --git a/debian/rules b/debian/rules
index 8669e7e..468c7ac 100755
--- a/debian/rules
+++ b/debian/rules
@@ -111,11 +111,6 @@ override_dh_install-arch:
 	######### dbconfig-common stuff
 	# The script install-dbconfig needs to be adapted when upstream changes the database format!
 	debian/scripts/install-dbconfig # handles install of all upgrade/install scripts to db version 11 and greater
-	# fix database type in some scripts
-	$(foreach db,$(VARIANTS),sed -i \
-	  -e "s/XX_DB_XX/$(db)/" \
-		-e "s/XX_DBLONGNAME_XX/$(LONGNAME_$(db))/" \
-		debian/bacula-director-$(db)/etc/bacula/scripts/make_catalog_backup.pl;)
 # create a reference of which database type is installed on the system
 # and a link to the dbconfig information that is dbtype independent
 	$(foreach db,$(VARIANTS), \

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