[pkg-bacula-commits] [bacula] 01/04: Move bcopy and btape from bacula-sd-DBTYPE to bacula-sd and change package descriptions accordingly

[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 40142a1b6ce389d7b728ea91520adb3dc87e721e
Author: Carsten Leonhardt <leo at debian.org>
Date:   Sun Jul 24 13:13:07 2016 +0200

    Move bcopy and btape from bacula-sd-DBTYPE to bacula-sd
    and change package descriptions accordingly
---
 debian/bacula-sd-db.install.in  |  2 --
 debian/bacula-sd-db.manpages.in |  1 -
 debian/bacula-sd.install        |  2 ++
 debian/bacula-sd.manpages       |  5 +++--
 debian/changelog                |  7 +++++--
 debian/control                  | 20 ++++++++++++++------
 6 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/debian/bacula-sd-db.install.in b/debian/bacula-sd-db.install.in
index 618f02e..cfd560c 100644
--- a/debian/bacula-sd-db.install.in
+++ b/debian/bacula-sd-db.install.in
@@ -1,3 +1 @@
 usr/sbin/bscan usr/bin
-usr/sbin/bcopy usr/bin
-usr/sbin/btape
diff --git a/debian/bacula-sd-db.manpages.in b/debian/bacula-sd-db.manpages.in
index 56c0349..8c3ff3a 100644
--- a/debian/bacula-sd-db.manpages.in
+++ b/debian/bacula-sd-db.manpages.in
@@ -1,2 +1 @@
-manpages/bcopy.8
 manpages/bscan.8
diff --git a/debian/bacula-sd.install b/debian/bacula-sd.install
index 05f7e11..4b60256 100644
--- a/debian/bacula-sd.install
+++ b/debian/bacula-sd.install
@@ -3,5 +3,7 @@ etc/bacula/scripts/dvd-handler
 etc/bacula/scripts/mtx-changer
 etc/bacula/scripts/mtx-changer.conf
 usr/sbin/bacula-sd
+usr/sbin/bcopy usr/bin
 usr/sbin/bextract
 usr/sbin/bls
+usr/sbin/btape
diff --git a/debian/bacula-sd.manpages b/debian/bacula-sd.manpages
index a0e7ea2..32f3775 100644
--- a/debian/bacula-sd.manpages
+++ b/debian/bacula-sd.manpages
@@ -1,4 +1,5 @@
 manpages/bacula-sd.8
-manpages/btape.8
-manpages/bls.8
+manpages/bcopy.8
 manpages/bextract.8
+manpages/bls.8
+manpages/btape.8
diff --git a/debian/changelog b/debian/changelog
index fb12ac7..f2a1142 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 bacula (7.4.3+dfsg-3) experimental; urgency=medium
 
+  Reorganisation of packages, providing the necessary Breaks/Conflicts for
+  the transitions:
+
   [ Sven Hartge ]
   * Fix dependencies between bacula-director-common and
     bacula-director-DBTYPE to allow move of init-script
@@ -9,8 +12,8 @@ bacula (7.4.3+dfsg-3) experimental; urgency=medium
   * Remove link /usr/bin/bconsole, finishing bconsole's transition to
     /usr/sbin/ started in 5.0.3+dfsgreal-1
   * Move all common files from bacula-diretor-DBTYPE to
-    bacula-director-common and provide necessary Breaks/Conflicts for the
-    transition
+    bacula-director-common
+  * Move bcopy and btape from bacula-sd-DBTYPE to bacula-sd
 
  --
 
diff --git a/debian/control b/debian/control
index 2e74048..2bf7ae3 100644
--- a/debian/control
+++ b/debian/control
@@ -281,6 +281,14 @@ Depends:
  ucf,
  ${misc:Depends},
  ${shlibs:Depends}
+Replaces:
+ bacula-sd-mysql (<< 7.4.3+dfsg-3),
+ bacula-sd-pgsql (<< 7.4.3+dfsg-3),
+ bacula-sd-sqlite3 (<< 7.4.3+dfsg-3)
+Breaks:
+ bacula-sd-mysql (<< 7.4.3+dfsg-3),
+ bacula-sd-pgsql (<< 7.4.3+dfsg-3),
+ bacula-sd-sqlite3 (<< 7.4.3+dfsg-3)
 Recommends: bacula-sd-sqlite3 (>= ${source:Version}) | bacula-sd-tools, mt-st
 Suggests: dds2tar, python, scsitools, sg3-utils
 Description: network backup service - storage daemon
@@ -313,8 +321,8 @@ Description: network backup service - SQLite 3 SD tools
  attributes and data to the physical media; in other words, it is
  responsible for reading and writing the backups.
  .
- This package contains SQLite 3 versions of the bscan and bcopy utilities,
- which are used for recovery when Bacula's catalog is unavailable.
+ This package contains the SQLite 3 version of the bscan utility,
+ which is used for recovery when Bacula's catalog is unavailable.
 
 Package: bacula-sd-mysql
 Architecture: any
@@ -336,8 +344,8 @@ Description: network backup service - MySQL SD tools
  attributes and data to the physical media; in other words, it is
  responsible for reading and writing the backups.
  .
- This package contains MySQL versions of the bscan and bcopy utilities,
- which are used for recovery when Bacula's catalog is unavailable.
+ This package contains the MySQL version of the bscan utility,
+ which is used for recovery when Bacula's catalog is unavailable.
 
 Package: bacula-sd-pgsql
 Architecture: any
@@ -359,8 +367,8 @@ Description: network backup service - PostgreSQL SD tools
  attributes and data to the physical media; in other words, it is
  responsible for reading and writing the backups.
  .
- This package contains PostgreSQL versions of the bscan and bcopy utilities,
- which are used for recovery when Bacula's catalog is unavailable.
+ This package contains the PostgreSQL version of the bscan utility,
+ which is used for recovery when Bacula's catalog is unavailable.
 
 Package: bacula-console
 Architecture: any

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