Merge lp:~jelmer/tribunal/icon into lp:tribunal

[Jelmer Vernooij]

Install application icon using tribunal-gavel.

This makes us use xdg-icon-resource to install the application icon; this makes it possible to e.g. install in the users home directory.

[Martin Pool (mbp)]

review: Approve

=== modified file 'setup.py'
--- setup.py	2010-09-26 21:38:52 +0000
+++ setup.py	2010-11-30 18:41:52 +0000
@@ -12,7 +12,8 @@
         subprocess.check_call(['xdg-mime', 'install', 'tribunal-subunit.xml'])
         subprocess.check_call(['xdg-desktop-menu', 'install',
                                'tribunal-subunit.desktop'])
-
+        subprocess.check_call(['xdg-icon-resource', 'install', '--size', '64',
+            'tribunal/gavel_64x64.png', 'tribunal-gavel'])
 
 
 setup(name='tribunal',
@@ -26,7 +27,6 @@
           ['gavel_64x64.png', 'ui.glade']},
       data_files=[
           ('share/application-registry', ['tribunal.applications']),
-          ('share/pixmaps', ['tribunal/gavel_64x64.png']),
       ],
       scripts=['tribunal-subunit'],
       classifiers=[
 
=== modified file 'tribunal-subunit.desktop'
--- tribunal-subunit.desktop	2010-09-26 21:26:20 +0000
+++ tribunal-subunit.desktop	2010-11-30 18:41:52 +0000
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Name=Tribunal
 Comment=View Subunit File
-Icon=gavel_64x64
+Icon=tribunal-gavel
 Exec=tribunal-subunit %f
 Terminal=false
 Type=Application