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

[Luca Capello]

The following commit has been merged in the master branch:
commit 9298518b051e39512b624085bb8bdd3769e2c00e
Author: Luca Capello <luca at pca.it>
Date:   Thu Jun 7 10:00:56 2012 +0200

    debian/bacula-traymonitor.install: fix icon installation

diff --git a/debian/bacula-traymonitor.install b/debian/bacula-traymonitor.install
index 4da6816..210022e 100644
--- a/debian/bacula-traymonitor.install
+++ b/debian/bacula-traymonitor.install
@@ -1,2 +1,2 @@
 usr/sbin/bacula-tray-monitor	usr/bin
-src/tray-monitor/generic.xpm usr/share/pixmaps/bacula-traymonitor.xpm
+src/tray-monitor/generic.xpm	usr/share/pixmaps
diff --git a/debian/changelog b/debian/changelog
index b853350..1224f29 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -120,6 +120,9 @@ bacula (5.2.6+dfsg-1) UNRELEASED; urgency=low
       if not specified.
   * debian/bacula-director-*.postinst:
     - remove path for sh call (thanks to lintian).
+  * debian/bacula-traymonitor.install:
+    + dh_install can not rename files, so the icon must be renamed in
+      debian/rules.
   * debian/control:
     + add myself to Uploaders:.
     + add bsd-mailx as alternative for mailx (thanks to lintian).
@@ -137,6 +140,7 @@ bacula (5.2.6+dfsg-1) UNRELEASED; urgency=low
   * debian/rules:
     + add --with-dump-email=root and --with-job-email=root to CONF_ALL,
       thus removing the '@localhost' domain part (Closes: #519567).
+    + rename bacula-tray-monitor.xpm.
 
   [ Martin Pitt ]
   * debian/control (Closes: #639466):
diff --git a/debian/rules b/debian/rules
index 2e04953..e7dc873 100755
--- a/debian/rules
+++ b/debian/rules
@@ -133,6 +133,9 @@ override_dh_install:
 	$(foreach db,$(VARIANTS),$(shell debian/scripts/install-dbconfig $(db) 5.0.0 12)) # 5.0.0 upgrade 11 to 12
 	$(foreach db,$(VARIANTS),$(shell debian/scripts/install-dbconfig $(db) 5.2.0))    # 5.2.0 upgrade 12 to 14
 	$(foreach db,$(VARIANTS),$(shell debian/scripts/install-dbconfig $(db)))
+	# dh_install can not rename files, so doing here
+	mv debian/bacula-traymonitor/usr/share/pixmaps/generic.xpm \
+		debian/bacula-traymonitor/usr/share/pixmaps/bacula-tray-monitor.xpm
 
 override_dh_installdocs:
 	dh_installdocs -pbacula --link-doc=bacula-common

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