[SCM] josm branch, master, updated. debian/0.0.svn3751-4-1-g77242e5

[Giovanni Mascellani]

The following commit has been merged in the master branch:
commit 77242e5896d46fa33102d01e98185122700d71b8
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date:   Sun Feb 20 17:08:04 2011 +0100

    Icon fixed.

diff --git a/debian/changelog b/debian/changelog
index c7cac41..2ae0245 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+josm (0.0.svn3751-5) UNRELEASED; urgency=low
+
+  * Fixed icon installation.
+  * josm.desktop uses 128x128 PNG icon (josm.menu cannot because menu specification
+    requires an icon to ba at maximum 32x32).
+
+ -- Giovanni Mascellani <gio at debian.org>  Sun, 20 Feb 2011 18:22:04 +0100
+
 josm (0.0.svn3751-4) unstable; urgency=low
 
   * Fixed present icons searching even when they come from mappaint icons
diff --git a/debian/install b/debian/install
deleted file mode 100644
index ac26613..0000000
--- a/debian/install
+++ /dev/null
@@ -1 +0,0 @@
-debian/icons/josm.png	usr/share/pixmaps/
diff --git a/debian/josm.desktop b/debian/josm.desktop
index b4f248f..2fabaa9 100644
--- a/debian/josm.desktop
+++ b/debian/josm.desktop
@@ -4,7 +4,7 @@ Name=Josm
 GenericName=Java OpenStreetMap Editor
 Comment=Editor for OpenStreetMap.org
 Exec=josm
-Icon=josm-32
+Icon=josm
 StartupNotify=false
 Terminal=false
 Type=Application
diff --git a/debian/rules b/debian/rules
index 8f7a7ed..3e39bb3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,6 +34,7 @@ override_dh_auto_install:
 	install -m 755 $(CURDIR)/debian/josm.sh $(CURDIR)/debian/josm/usr/bin/josm
 	install -m 644 $(CURDIR)/debian/icons/josm-16.xpm $(CURDIR)/debian/josm/usr/share/pixmaps/josm-16.xpm
 	install -m 644 $(CURDIR)/debian/icons/josm-32.xpm $(CURDIR)/debian/josm/usr/share/pixmaps/josm-32.xpm
+	install -m 644 $(CURDIR)/images/logo.png $(CURDIR)/debian/josm/usr/share/pixmaps/josm.png
 	install -m 644 $(CURDIR)/debian/josm.desktop $(CURDIR)/debian/josm/usr/share/applications/josm.desktop
 
 

-- 
Java OpenStreetMap editor