[pkg-bacula-commits] [bacula] 01/01: Revert "Dropped metapackage "bacula-client""

[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 6cdfbe8f12a60a5196b1cd92010e14cb1f004a4f
Author: Carsten Leonhardt <leo at debian.org>
Date:   Wed Sep 21 17:57:23 2016 +0200

    Revert "Dropped metapackage "bacula-client""
    
    This reverts commit 3e87a27bb161311ae41a327263ebdeccd0b35a77.
    
    Postponed to after 7.4.4+dfsg-1
---
 debian/changelog |  4 +---
 debian/control   | 23 +++++++++++++++++++----
 debian/rules     |  2 +-
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6630d91..df71bdf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,9 +3,7 @@ bacula (7.4.4+dfsg-1) unstable; urgency=medium
   * New upstream release
   * Refreshed debian patches and dropped
     fix-bring-back-tmpfiles-configuration.patch as it's no longer needed
-  * Moved "Suggests: bacula-doc" to package bacula-director
-  * Dropped metapackage "bacula-client"
-    The metapackage "bacula" still installs the same set of binary packages.
+  * Move "Suggests: bacula-doc" to package bacula-director
 
  --
 
diff --git a/debian/control b/debian/control
index 68a0c6d..7eaa1be 100644
--- a/debian/control
+++ b/debian/control
@@ -37,7 +37,7 @@ Homepage: http://www.bacula.org/
 Package: bacula
 Architecture: all
 Pre-Depends: ${misc:Pre-Depends}
-Depends: bacula-fd, bacula-server, ${misc:Depends}
+Depends: bacula-client, bacula-server, ${misc:Depends}
 Description: network backup service - metapackage
  Bacula is a set of programs to manage backup, recovery, and verification
  of computer data across a network of computers of different kinds.
@@ -213,6 +213,24 @@ Description: network backup service - PostgreSQL storage for Director
  This package stores Bacula's catalog in a PostgreSQL database, and thus is
  suited for large installations.
 
+Package: bacula-client
+Architecture: all
+Pre-Depends: ${misc:Pre-Depends}
+Depends:
+ bacula-console (>= ${source:Version}),
+ bacula-fd (>= ${source:Version}),
+ ${misc:Depends}
+Description: network backup service - client metapackage
+ Bacula is a set of programs to manage backup, recovery, and verification of
+ data across a network of computers of different kinds.
+ .
+ The Bacula Director service supervises all the backup, restore, verify, and
+ archive operations. It can run as a daemon or as a foreground service which
+ administrators can use to schedule backups and recover files.
+ .
+ The package is a metapackage for client installations (file daemon and
+ console only).
+
 Package: bacula-fd
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
@@ -222,8 +240,6 @@ Depends:
  ucf,
  ${misc:Depends},
  ${shlibs:Depends}
-Breaks: bacula-client (<< 7.4.4+dfsg-1)
-Replaces: bacula-client (<< 7.4.4+dfsg-1)
 Description: network backup service - file daemon
  Bacula is a set of programs to manage backup, recovery, and verification of
  data across a network of computers of different kinds.
@@ -236,7 +252,6 @@ Package: bacula-server
 Architecture: all
 Pre-Depends: ${misc:Pre-Depends}
 Depends:
- bacula-console (>= ${source:Version}),
  bacula-director (>= ${source:Version}),
  bacula-sd (>= ${source:Version}),
  bacula-bscan (>= ${source:Version}),
diff --git a/debian/rules b/debian/rules
index 447f89d..468c7ac 100755
--- a/debian/rules
+++ b/debian/rules
@@ -127,7 +127,7 @@ endif
 
 override_dh_installdocs:
 	dh_installdocs -pbacula --link-doc=bacula-server
-	dh_installdocs -Nbacula-common -Nbacula-server --remaining-packages --link-doc=bacula-common
+	dh_installdocs -Nbacula-common -Nbacula-client -Nbacula-server --remaining-packages --link-doc=bacula-common
 	dh_installdocs --remaining-packages
 
 # avoid compiling anything when building the metapackages

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