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

[Luca Capello]

The following commit has been merged in the master branch:
commit 853b7190542a80e07f484f6737fc22278d6ef507
Author: Luca Capello <luca at pca.it>
Date:   Thu Jun 7 12:31:27 2012 +0200

    debian/*: (#466428) install .desktop files

diff --git a/debian/additions/bacula-console-gnome.desktop b/debian/additions/bacula-console-gnome.desktop
deleted file mode 100644
index 63344d2..0000000
--- a/debian/additions/bacula-console-gnome.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Type=Application
-Encoding=UTF-8
-Name=Bacula console
-Name[fr]=Console Bacula
-Comment=Bacula GNOME console
-Comment[es]=Consola GNOME para Bacula
-Comment[fr]=Console GNOME pour Bacula
-Exec=/usr/bin/bacula-console-gnome -c /etc/bacula/gnome-console.conf
-Terminal=false
-Categories=System;Application
diff --git a/debian/additions/bacula-tray-monitor.desktop b/debian/additions/bacula-tray-monitor.desktop
deleted file mode 100644
index d6ab68a..0000000
--- a/debian/additions/bacula-tray-monitor.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=Bacula Monitor
-Comment=Notification Tray Monitor
-Icon=/usr/share/pixmaps/bacula-tray-monitor.xpm
-Exec=/usr/sbin/bacula-tray-monitor -c /etc/bacula/tray-monitor.conf
-Terminal=false
-Type=Application
-Encoding=UTF-8
-X-Desktop-File-Install-Version=0.3
-Categories=System;Application;Utility;X-Red-Hat-Base;
diff --git a/debian/bacula-console-qt.install b/debian/bacula-console-qt.install
index feab15a..4ddd179 100644
--- a/debian/bacula-console-qt.install
+++ b/debian/bacula-console-qt.install
@@ -1 +1,3 @@
 usr/sbin/bat
+src/qt-console/images/bat_icon.png	usr/share/pixmaps
+scripts/bat.desktop	usr/share/applications
diff --git a/debian/bacula-traymonitor.install b/debian/bacula-traymonitor.install
index 5f6439d..bd15d66 100644
--- a/debian/bacula-traymonitor.install
+++ b/debian/bacula-traymonitor.install
@@ -1,2 +1,3 @@
 usr/sbin/bacula-tray-monitor
 src/tray-monitor/generic.xpm	usr/share/pixmaps
+scripts/bacula-tray-monitor.desktop	usr/share/applications
diff --git a/debian/changelog b/debian/changelog
index 91c66ab..0294695 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -104,11 +104,16 @@ bacula (5.2.6+dfsg-1) UNRELEASED; urgency=low
     + add gawk script for catalog backup.
 
   [ Luca Capello ]
+  * debian/additions/bacula-console-gnome.desktop:
+    - remove, deprecated upstream since 2.0.2-1 (see #391820).
+  * debian/additions/bacula-tray-monitor.desktop:
+    - remove, use upstream file.
   * 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.
+    + install upstream icon and .desktop files (Closes: #466428).
   * debian/bacula-console-qt.links:
     + move bat to /usr/sbin/ as intended by upstream, providing
       symlinks in old place.
@@ -124,6 +129,7 @@ bacula (5.2.6+dfsg-1) UNRELEASED; urgency=low
     + 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.
+    + install upstream .desktop file.
   * debian/bacula-traymonitor.links:
     + move bacula-tray-monitor to /usr/sbin/ as intended by upstream,
       providing symlinks in old place.

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