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

[Luca Capello]

The following commit has been merged in the master branch:
commit a2b2e43956b51fc6c7151d5a66572ab3572b5672
Author: Luca Capello <luca at pca.it>
Date:   Thu Jun 7 11:28:49 2012 +0200

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

diff --git a/debian/NEWS b/debian/NEWS
index a8df20f..c13b346 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -15,16 +15,16 @@ bacula (5.2.6+dfsg-1) unstable; urgency=low
     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
-
- -- Alexander Golovko <alexandro at ankalagon.ru>  Tue, 05 Jun 2012 22:25:27 +0400
+  * Upstream installs console and tray-monitor binaries (bat, bconsole and
+    bacula-tray-monitor) 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, these 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.
+
+ -- Luca Capello <luca at pca.it>  Thu, 07 Jun 2012 11:25:40 +0200
 
 bacula (3.0.0-1) unstable; urgency=low
 
diff --git a/debian/bacula-traymonitor.install b/debian/bacula-traymonitor.install
index 210022e..5f6439d 100644
--- a/debian/bacula-traymonitor.install
+++ b/debian/bacula-traymonitor.install
@@ -1,2 +1,2 @@
-usr/sbin/bacula-tray-monitor	usr/bin
+usr/sbin/bacula-tray-monitor
 src/tray-monitor/generic.xpm	usr/share/pixmaps
diff --git a/debian/bacula-traymonitor.links b/debian/bacula-traymonitor.links
index 19a2b3f..f485480 100644
--- a/debian/bacula-traymonitor.links
+++ b/debian/bacula-traymonitor.links
@@ -1,2 +1,4 @@
-usr/bin/bacula-tray-monitor usr/bin/bacula-traymonitor
 usr/share/man/man1/bacula-tray-monitor.1.gz usr/share/man/man1/bacula-traymonitor.1.gz
+usr/sbin/bacula-tray-monitor usr/sbin/bacula-traymonitor
+usr/sbin/bacula-tray-monitor usr/bin/bacula-tray-monitor
+usr/sbin/bacula-tray-monitor usr/bin/bacula-traymonitor
diff --git a/debian/changelog b/debian/changelog
index 1224f29..843ba1a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -121,15 +121,20 @@ bacula (5.2.6+dfsg-1) UNRELEASED; urgency=low
   * debian/bacula-director-*.postinst:
     - remove path for sh call (thanks to lintian).
   * debian/bacula-traymonitor.install:
+    + move bacula-tray-monitor to /usr/sbin/ as intended by upstream.
     + dh_install can not rename files, so the icon must be renamed in
       debian/rules.
+  * debian/bacula-traymonitor.links:
+    + move bacula-tray-monitor to /usr/sbin/ as intended by upstream,
+      providing symlinks in old place.
   * debian/control:
     + add myself to Uploaders:.
     + 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/.
+    + add note about moving bat/bconsole/bacula-tray-monitor to
+      /usr/sbin/ as intended by upstream.
   * debian/patches/fix-binutils-gold-linking.patch:
     + import from upstream BTS (Closes: #553956).
   * debian/patches/fix-scriptdir-examples-devices.patch:

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