[pkg-bacula-commits] [SCM] Bacula, a network backup, recovery and verification program branch, master, updated. debian/5.0.3-1-146-g5dbb0c2

[Luca Capello]

The following commit has been merged in the master branch:
commit 5dbb0c2e824cf88219cb16f9348c5dacf7d7dcdb
Author: Luca Capello <luca at pca.it>
Date:   Sat Jun 2 17:20:19 2012 +0200

    debian/bacula-console*: move binaries to /usr/sbin/

diff --git a/debian/NEWS b/debian/NEWS
index 064c139..6c54170 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,19 +1,30 @@
 bacula (5.0.3+dfsgreal-1) unstable; urgency=low
 
-  Significant changes since versions before 5.0.3:
-
-  The binary /usr/bin/bacula-console (formerly a wrapper around
-  /usr/sbin/bconsole) has been dropped as it made assumptions about where your
-  configuration files is.  Please use 'bconsole -c /path/to/config' (which is
-  basically what bconsole did). A symlink bacula-console -> bconsole is set up
-  to make the binary match the package name.
-
-  bacula-fd, -sd, and -director now ship /etc/default/bacula-{fd,sd,dir}
-  accordingly. The new files contain possibilities to disable the service,
-  provide additional arguments passed to the daemon, and specify a
-  configuration file other than the default. Do not delete these files.
-
- -- Jan Hauke Rahm <jhr at debian.org>  Thu, 28 Apr 2011 21:47:05 +0200
+  Significant changes since versions before 5.0.3+dfsgreal-1:
+
+  [ Jan Hauke Rahm ]
+  * bacula-fd, -sd, and -director now ship /etc/default/bacula-{fd,sd,dir}
+    accordingly. The new files contain possibilities to disable the service,
+    provide additional arguments passed to the daemon, and specify a
+    configuration file other than the default. Do not delete these files.
+
+  * The binary /usr/bin/bconsole (formerly a wrapper around
+    /usr/sbin/bacula-console) has been dropped as it made assumptions
+    about where your configuration file is (/etc/bacula/bconsole.conf).
+    It is now a symlink to /usr/sbin/bconsole: if no configuration file is
+    specified, /etc/bacula/bconsole.conf is used by default.
+
+  [ Luca Capello ]
+  * Upstream installs both console binaries (bat and bconsole) into
+    /usr/sbin/, while Debian were installing them into /usr/bin/.
+    However, in such case there is no real advantage in deviating from
+    upstream, also because the default configuration files have anyway
+    tighter ownership (root:bacula) and permissions (640).  Thus, both
+    console binaries have been migrated to /usr/sbin/, with symlinks in
+    place to allow a smooth migration from squeeze and they will be
+    removed once wheezy is released.  The same
+
+ -- Luca Capello <luca at pca.it>  Sat, 02 Jun 2012 17:14:28 +0200
 
 bacula (3.0.0-1) unstable; urgency=low
 
diff --git a/debian/bacula-console-qt.install b/debian/bacula-console-qt.install
index dba9e4b..feab15a 100644
--- a/debian/bacula-console-qt.install
+++ b/debian/bacula-console-qt.install
@@ -1 +1 @@
-usr/sbin/bat usr/bin
+usr/sbin/bat
diff --git a/debian/bacula-console-qt.links b/debian/bacula-console-qt.links
index 8ff8cf3..bfa7ad1 100644
--- a/debian/bacula-console-qt.links
+++ b/debian/bacula-console-qt.links
@@ -1,2 +1,3 @@
 usr/share/man/man1/bat.1.gz usr/share/man/man1/bacula-console-qt.1.gz
-usr/bin/bat usr/bin/bacula-console-qt
+usr/sbin/bat usr/sbin/bacula-console-qt
+usr/sbin/bat usr/bin/bat
diff --git a/debian/bacula-console-qt.menu b/debian/bacula-console-qt.menu
index 7546787..223aa71 100644
--- a/debian/bacula-console-qt.menu
+++ b/debian/bacula-console-qt.menu
@@ -1,2 +1,2 @@
 ?package(bacula-console-qt):needs="X11" section="Applications/System/Administration" \
-  title="Bacula qtConsole" command="/usr/bin/bat"
+  title="Bacula qtConsole" command="/usr/sbin/bat"
diff --git a/debian/bacula-console.install b/debian/bacula-console.install
index f283839..2a60dc7 100644
--- a/debian/bacula-console.install
+++ b/debian/bacula-console.install
@@ -1 +1 @@
-usr/sbin/bconsole usr/bin
+usr/sbin/bconsole
diff --git a/debian/bacula-console.links b/debian/bacula-console.links
index aa925fd..a72ddeb 100644
--- a/debian/bacula-console.links
+++ b/debian/bacula-console.links
@@ -1,2 +1,3 @@
 usr/share/man/man8/bconsole.8.gz usr/share/man/man8/bacula-console.8.gz
-usr/bin/bconsole usr/sbin/bacula-console
+usr/sbin/bconsole usr/sbin/bacula-console
+usr/sbin/bconsole usr/bin/bconsole
diff --git a/debian/bacula-console.menu b/debian/bacula-console.menu
index 0e35334..b33157d 100644
--- a/debian/bacula-console.menu
+++ b/debian/bacula-console.menu
@@ -1,2 +1,2 @@
 ?package(bacula-console):needs="text" section="Applications/System/Administration" \
-  title="Bacula console" command="/usr/bin/bconsole"
+  title="Bacula console" command="/usr/sbin/bconsole"
diff --git a/debian/changelog b/debian/changelog
index e7b1cca..2be77cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -92,10 +92,18 @@ bacula (5.0.3+dfsgreal-1) UNRELEASED; urgency=low
     + add gawk script for catalog backup.
 
   [ Luca Capello ]
+  * debian/bacula-console*:
+    + move bconsole to /usr/sbin/ as intended by upstream, providing
+      symlinks in old place.
+  * debian/bacula-console-qt.install:
+    + move bat to /usr/sbin/ as intended by upstream.
   * debian/bacula-console-qt.links:
+    + move bat to /usr/sbin/ as intended by upstream, providing
+      symlinks in old place.
     + add symlinks to bacula-console-qt as well (binary and manpage) to
       match the package name.
   * debian/bacula-console-qt.menu:
+    + move bat to /usr/sbin/ as intended by upstream.
     - remove useless -c option, /etc/bacula/bat.conf is used by default
       if not specified.
   * debian/bacula-director-*.postinst:
@@ -104,6 +112,8 @@ bacula (5.0.3+dfsgreal-1) UNRELEASED; urgency=low
     + add bsd-mailx as alternative for mailx (thanks to lintian).
   * debian/copyright:
     + add current maintainer.
+  * debian/NEWS:
+    + add note about moving bat/bconsole to /usr/sbin/.
   * debian/patches/fix-binutils-gold-linking.patch:
     + import from upstream BTS (Closes: #553956).
   * debian/patches/upstream-1623_debian-591293___file_jpfid_idx.patch:

-- 
Bacula, a network backup, recovery and verification program