[DebianGIS-dev] [SCM] josm branch, master, updated. debian/0.0.svn3592-1-3-g34d95d1

[David Paleino]

The following commit has been merged in the master branch:
commit 25fe9a5bb5473af50c88ec9dec6df03bafa74474
Author: David Paleino <dapal at debian.org>
Date:   Thu Oct 21 18:37:16 2010 +0200

    debian/rules: don't install XPM versions of the icons anymore

diff --git a/debian/changelog b/debian/changelog
index 905a6ff..e452299 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+josm (0.0.svn3592-2) UNRELEASED; urgency=low
+
+  * debian/rules:
+    - don't install XPM versions of the icons anymore
+
+ -- David Paleino <dapal at debian.org>  Thu, 21 Oct 2010 18:36:47 +0200
+
 josm (0.0.svn3592-1) unstable; urgency=low
 
   * New upstream snapshot
diff --git a/debian/rules b/debian/rules
index 8f7a7ed..da49542 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,8 +32,6 @@ override_dh_auto_install:
 	install -m 644 $(CURDIR)/dist/josm-custom.jar $(CURDIR)/debian/josm/usr/share/josm/josm-${DEB_UPSTREAM_VERSION}.jar
 	dh_link usr/share/josm/josm-${DEB_UPSTREAM_VERSION}.jar usr/share/josm/josm.jar
 	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)/debian/josm.desktop $(CURDIR)/debian/josm/usr/share/applications/josm.desktop
 
 

-- 
Java OpenStreetMap editor