[DebianGIS-dev] r1816 - in packages/josm/trunk/debian: . patches

[gmascellani-guest at alioth.debian.org]

Author: gmascellani-guest
Date: 2008-12-23 14:21:07 +0000 (Tue, 23 Dec 2008)
New Revision: 1816

Modified:
   packages/josm/trunk/debian/changelog
   packages/josm/trunk/debian/control
   packages/josm/trunk/debian/patches/40_elemstyles.dpatch
Log:
Added ${misc:Depends} to dependencies


Modified: packages/josm/trunk/debian/changelog
===================================================================
--- packages/josm/trunk/debian/changelog	2008-12-23 12:23:04 UTC (rev 1815)
+++ packages/josm/trunk/debian/changelog	2008-12-23 14:21:07 UTC (rev 1816)
@@ -1,5 +1,32 @@
-josm (0.0.0.20081222-1) UNRELEASED; urgency=low
+josm (0.0.svn1137-0.5) unstable; urgency=low
 
+  * Added ${misc:Depends} into dependencies
+  * Fixed icon issue
+
+ -- Giovanni Mascellani <g.mascellani at gmail.com>  Tue, 23 Dec 2008 15:08:59 +0100
+
+josm (0.0.svn1137-0.4) unstable; urgency=low
+
+  * Fixed icons issue?
+  * Must verify behaivour for unexisting icons
+
+ -- Giovanni Mascellani <g.mascellani at gmail.com>  Tue, 23 Dec 2008 14:31:53 +0100
+
+josm (0.0.svn1137-0.3) unstable; urgency=low
+
+  * Fixed classpath issue
+  * Fixed icons issue?
+
+ -- Giovanni Mascellani <g.mascellani at gmail.com>  Tue, 23 Dec 2008 14:12:37 +0100
+
+josm (0.0.svn1137-0.2) unstable; urgency=low
+
+  * Fixed classpath issue?
+
+ -- Giovanni Mascellani <g.mascellani at gmail.com>  Tue, 23 Dec 2008 13:15:50 +0100
+
+josm (0.0.svn1137-0.1) unstable; urgency=low
+
   * New upstream SVN release. (Closes: #509239)
     - dpatch/*: fixed to comply with new upstream code
   * Added optional dependencies against sun-java5-jre and sun-java6-jre.
@@ -9,7 +36,7 @@
   * Shell wrapper now recognizes JAVA_OPTS environment variable.
     (Closes: #497559)
 
- -- Giovanni Mascellani <g.mascellani at gmail.com>  Mon, 22 Dec 2008 23:49:41 +0100
+ -- Giovanni Mascellani <g.mascellani at gmail.com>  Tue, 23 Dec 2008 12:03:09 +0100
 
 josm (0.0.0.20080713-1) unstable; urgency=low
 

Modified: packages/josm/trunk/debian/control
===================================================================
--- packages/josm/trunk/debian/control	2008-12-23 12:23:04 UTC (rev 1815)
+++ packages/josm/trunk/debian/control	2008-12-23 14:21:07 UTC (rev 1816)
@@ -12,7 +12,7 @@
 
 Package: josm
 Architecture: all
-Depends:  openjdk-6-jre | sun-java5-jre | sun-java6-jre, libgettext-commons-java, libmetadata-extractor-java, openstreetmap-map-icons-classic
+Depends:  openjdk-6-jre | sun-java5-jre | sun-java6-jre, libgettext-commons-java, libmetadata-extractor-java, openstreetmap-map-icons-classic, ${misc:Depends}
 Recommends: josm-plugins
 Description: Editor for OpenStreetMap
  JOSM is an editor for OpenStreetMap (OSM) written in Java.

Modified: packages/josm/trunk/debian/patches/40_elemstyles.dpatch
===================================================================
--- packages/josm/trunk/debian/patches/40_elemstyles.dpatch	2008-12-23 12:23:04 UTC (rev 1815)
+++ packages/josm/trunk/debian/patches/40_elemstyles.dpatch	2008-12-23 14:21:07 UTC (rev 1816)
@@ -6,14 +6,19 @@
 ## DP: Point josm to the correct directory so that the icons are found.
 
 @DPATCH@
-diff -urNad josm-0.0.0.20081222~/src/org/openstreetmap/josm/gui/mappaint/ElemStyleHandler.java josm-0.0.0.20081222/src/org/openstreetmap/josm/gui/mappaint/ElemStyleHandler.java
---- josm-0.0.0.20081222~/src/org/openstreetmap/josm/gui/mappaint/ElemStyleHandler.java	2008-09-21 14:03:38.000000000 +0200
-+++ josm-0.0.0.20081222/src/org/openstreetmap/josm/gui/mappaint/ElemStyleHandler.java	2008-12-23 00:00:20.000000000 +0100
-@@ -149,6 +149,7 @@
- 				for (int count=0; count<atts.getLength(); count++)
- 				{
- 					if (atts.getQName(count).equals("src"))
-+						// Icons should be taken from openstreetmap-map-* packages
- 						rule.icon.icon = MapPaintStyles.getIcon(atts.getValue(count), styleName);
- 					else if (atts.getQName(count).equals("annotate"))
- 						rule.icon.annotate = Boolean.parseBoolean (atts.getValue(count));
+diff -urNad josm-0.0.svn1137~/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java josm-0.0.svn1137/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
+--- josm-0.0.svn1137~/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java	2008-12-23 14:32:23.000000000 +0100
++++ josm-0.0.svn1137/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java	2008-12-23 14:33:09.000000000 +0100
+@@ -49,7 +49,11 @@
+ 
+ 	public static void readFromPreferences() {
+ 		/* don't prefix icon path, as it should be generic */
+-		String internalicon = "resource://images/styles/standard/;resource://images/styles/";
++		//String internalicon = "resource://images/styles/standard/;resource://images/styles/";
++		String internalicon = "/usr/share/icons/openstreetmap/classic.small;";
++		internalicon += "/usr/share/icons/openstreetmap/square.small;";
++		internalicon += "/usr/share/icons/openstreetmap/classic.big;";
++		internalicon += "/usr/share/icons/openstreetmap/square.big";
+ 		String internalfile = "standard=resource://styles/standard/elemstyles.xml";
+ 
+ 		iconDirs = Main.pref.get("mappaint.iconpaths");