From c01c2a9374557e38d3e1ffa8e7bb8f644c05e33e Mon Sep 17 00:00:00 2001
From: Chris Frey <cdfrey@foursquare.net>
Date: Fri, 18 May 2012 20:22:53 -0400
Subject: [PATCH] debian/rpm: fixed desktop and backup menu icon names and
 .desktop config

---
 menu/barrybackup.desktop  |  2 +-
 menu/barrydesktop.desktop |  2 +-
 rpm/barry.spec            | 11 ++++++-----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/menu/barrybackup.desktop b/menu/barrybackup.desktop
index d2f354d8..4bbc6602 100644
--- a/menu/barrybackup.desktop
+++ b/menu/barrybackup.desktop
@@ -3,7 +3,7 @@ Encoding=UTF-8
 Name=Barry Backup
 Comment=Backup and restore databases on the BlackBerry Handheld
 Exec=barrybackup
-Icon=barry_logo_icon
+Icon=barry_backup_menu_icon
 Terminal=false
 Type=Application
 StartupWMClass=barrybackup-gui
diff --git a/menu/barrydesktop.desktop b/menu/barrydesktop.desktop
index 819b6f5b..b887f970 100644
--- a/menu/barrydesktop.desktop
+++ b/menu/barrydesktop.desktop
@@ -3,7 +3,7 @@ Encoding=UTF-8
 Name=Barry Desktop Panel
 Comment=Manage BlackBerry devices from a central GUI.
 Exec=barrydesktop
-Icon=barry_desktop_icon
+Icon=barry_desktop_menu_icon
 Terminal=false
 Type=Application
 StartupWMClass=barrydesktop
diff --git a/rpm/barry.spec b/rpm/barry.spec
index 648f176c..3a3bc15a 100644
--- a/rpm/barry.spec
+++ b/rpm/barry.spec
@@ -292,10 +292,10 @@ cd ../
 %if %{with_gui}
 cd gui/
 %{__make} DESTDIR=%{buildroot} install
-# Install barry logo icon
+# Install barry logo icon (name of icon must match the *.desktop file!)
 cd ../
 %{__mkdir_p} %{buildroot}%{_datadir}/pixmaps
-%{__cp} logo/barry_logo_icon.png %{buildroot}%{_datadir}/pixmaps
+%{__cp} logo/barry_logo_icon.png %{buildroot}%{_datadir}/pixmaps/barry_backup_menu_icon.png
 desktop-file-install --vendor netdirect \
    --dir %{buildroot}%{_datadir}/applications \
    menu/barrybackup.desktop
@@ -327,7 +327,7 @@ cd desktop/
 %{__rm} -f %{buildroot}%{_libdir}/*.la
 cd ../
 %{__mkdir_p} %{buildroot}%{_datadir}/pixmaps
-%{__cp} logo/barry_logo_icon.png %{buildroot}%{_datadir}/pixmaps/barry_desktop_icon.png
+%{__cp} logo/barry_logo_icon.png %{buildroot}%{_datadir}/pixmaps/barry_desktop_menu_icon.png
 desktop-file-install --vendor netdirect \
    --dir %{buildroot}%{_datadir}/applications \
    menu/barrydesktop.desktop
@@ -444,7 +444,7 @@ desktop-file-install --vendor netdirect \
 %defattr(-,root,root)
 %attr(0755,root,root) %{_bindir}/barrybackup
 %attr(0644,root,root) %{_datadir}/barry/glade/*.glade
-%attr(0644,root,root) %{_datadir}/pixmaps/barry_logo_icon.png
+%attr(0644,root,root) %{_datadir}/pixmaps/barry_backup_menu_icon.png
 %attr(0644,root,root) %{_datadir}/applications/*barrybackup.desktop
 %attr(0644,root,root) %{_mandir}/man1/barrybackup*
 %doc COPYING
@@ -476,7 +476,7 @@ desktop-file-install --vendor netdirect \
 %attr(0644,root,root) %{_datadir}/barry/desktop/0.22/*
 %attr(0644,root,root) %{_datadir}/barry/desktop/0.40/*
 %attr(0644,root,root) %{_datadir}/barry/desktop/images/*.png
-%attr(0644,root,root) %{_datadir}/pixmaps/barry_desktop_icon.png
+%attr(0644,root,root) %{_datadir}/pixmaps/barry_desktop_menu_icon.png
 %attr(0644,root,root) %{_datadir}/applications/*barrydesktop.desktop
 %attr(0644,root,root) %{_mandir}/man1/barrydesktop*
 %attr(-,root,root) %{_libdir}/libosyncwrap.so.*
@@ -499,6 +499,7 @@ desktop-file-install --vendor netdirect \
 %changelog
 * Tue May 15 2012 Chris Frey <cdfrey@foursquare.net> 0.18.3-0
 - version bump
+- renamed icon filenames to match .desktop file
 
 * Tue May 15 2012 Chris Frey <cdfrey@foursquare.net> 0.18.2-0
 - version bump
-- 
2.11.4.GIT