[pkg-bacula-commits] [bacula] 04/05: Move all common files from bacula-diretor-DBTYPE to bacula-director-common and provide necessary Breaks/Conflicts for the transition

[Carsten Leonhardt]

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

leo pushed a commit to branch migrate-files
in repository bacula.

commit 27c4733055595b343ec25a7a9848cd999c3b95eb
Author: Carsten Leonhardt <leo at debian.org>
Date:   Sat Jul 23 13:27:31 2016 +0200

    Move all common files from bacula-diretor-DBTYPE to bacula-director-common
    and provide necessary Breaks/Conflicts for the transition
---
 debian/bacula-director-common.install  | 5 +++++
 debian/bacula-director-mysql.install   | 5 -----
 debian/bacula-director-pgsql.install   | 7 +------
 debian/bacula-director-sqlite3.install | 5 -----
 debian/control                         | 8 ++++++++
 5 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/debian/bacula-director-common.install b/debian/bacula-director-common.install
index 57822cb..4f51cd6 100644
--- a/debian/bacula-director-common.install
+++ b/debian/bacula-director-common.install
@@ -1,4 +1,9 @@
 debian/additions/postinst-common	usr/share/bacula-director
+etc/bacula/scripts/*catalog_backup.pl
+etc/bacula/scripts/delete_catalog_backup usr/share/bacula-common/defconfig/scripts
+etc/bacula/scripts/make_catalog_backup
 etc/bacula/scripts/query.sql
+usr/sbin/bacula-dir
 usr/sbin/bregex
 usr/sbin/bwild
+usr/sbin/dbcheck
diff --git a/debian/bacula-director-mysql.install b/debian/bacula-director-mysql.install
index a52d387..f1aaddc 100644
--- a/debian/bacula-director-mysql.install
+++ b/debian/bacula-director-mysql.install
@@ -1,8 +1,3 @@
 debian/additions/mysql/make_catalog_backup_awk      etc/bacula/scripts
-etc/bacula/scripts/*catalog_backup.pl
-etc/bacula/scripts/delete_catalog_backup usr/share/bacula-common/defconfig/scripts
-etc/bacula/scripts/make_catalog_backup
 etc/bacula/scripts/make_mysql_tables usr/share/bacula-director
 etc/bacula/scripts/update_mysql* usr/share/bacula-director
-usr/sbin/bacula-dir
-usr/sbin/dbcheck
diff --git a/debian/bacula-director-pgsql.install b/debian/bacula-director-pgsql.install
index 01e13fd..2a6df38 100644
--- a/debian/bacula-director-pgsql.install
+++ b/debian/bacula-director-pgsql.install
@@ -1,11 +1,6 @@
-debian/additions/pgsql/database/pgsql	usr/share/dbconfig-common/data/bacula-director-pgsql/install-dbadmin
 debian/additions/pgsql/database/7.4.1	usr/share/dbconfig-common/scripts/bacula-director-pgsql/upgrade/pgsql
+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/*catalog_backup.pl
-etc/bacula/scripts/delete_catalog_backup usr/share/bacula-common/defconfig/scripts
 etc/bacula/scripts/grant_postgresql_privileges usr/share/bacula-director
-etc/bacula/scripts/make_catalog_backup
 etc/bacula/scripts/make_postgresql_tables	usr/share/bacula-director
 etc/bacula/scripts/update_postgres* usr/share/bacula-director
-usr/sbin/bacula-dir
-usr/sbin/dbcheck
diff --git a/debian/bacula-director-sqlite3.install b/debian/bacula-director-sqlite3.install
index 454b462..aaf6209 100644
--- a/debian/bacula-director-sqlite3.install
+++ b/debian/bacula-director-sqlite3.install
@@ -1,9 +1,4 @@
 debian/additions/sqlite3/delete_catalog_backup.md5sum usr/share/bacula-common/defconfig/scripts
 debian/additions/sqlite3/make_catalog_backup_awk      etc/bacula/scripts
-etc/bacula/scripts/*catalog_backup.pl
-etc/bacula/scripts/delete_catalog_backup usr/share/bacula-common/defconfig/scripts
-etc/bacula/scripts/make_catalog_backup
 etc/bacula/scripts/make_sqlite*tables usr/share/bacula-director
 etc/bacula/scripts/update_sqlite* usr/share/bacula-director
-usr/sbin/bacula-dir
-usr/sbin/dbcheck
diff --git a/debian/control b/debian/control
index dbadea3..2e74048 100644
--- a/debian/control
+++ b/debian/control
@@ -114,6 +114,14 @@ Depends:
  lsb-base,
  ${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)
+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)
 Description: network backup service - Director common files
  Bacula is a set of programs to manage backup, recovery, and verification of
  data across a network of computers of different kinds.

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