[DebianGIS-dev] r1716 - packages/josm/trunk/debian/patches

[nd-guest at alioth.debian.org]

Author: nd-guest
Date: 2008-07-13 19:46:03 +0000 (Sun, 13 Jul 2008)
New Revision: 1716

Modified:
   packages/josm/trunk/debian/patches/00list
   packages/josm/trunk/debian/patches/10_build.dpatch
   packages/josm/trunk/debian/patches/40_elemstyles.dpatch
Log:
update patches.


Modified: packages/josm/trunk/debian/patches/00list
===================================================================
--- packages/josm/trunk/debian/patches/00list	2008-07-13 19:45:10 UTC (rev 1715)
+++ packages/josm/trunk/debian/patches/00list	2008-07-13 19:46:03 UTC (rev 1716)
@@ -1,5 +1,5 @@
 10_build
 20_bts
-30_graphics
+#30_graphics
 40_elemstyles
-50_sun
+#50_sun

Modified: packages/josm/trunk/debian/patches/10_build.dpatch
===================================================================
--- packages/josm/trunk/debian/patches/10_build.dpatch	2008-07-13 19:45:10 UTC (rev 1715)
+++ packages/josm/trunk/debian/patches/10_build.dpatch	2008-07-13 19:46:03 UTC (rev 1716)
@@ -59,11 +59,3 @@
  			</manifest>
  		</jar>
  	</target>
-@@ -46,6 +45,7 @@
- 	<target name="compile" depends="init">
- 		<javac srcdir="src" classpathref="classpath" destdir="build" target="1.5" debug="on">
- 			<compilerarg value="-Xlint:deprecation"/>
-+            <compilerarg value="-warn:-serial,unusedImport"/>
- 		</javac>
- 	</target>
- 

Modified: packages/josm/trunk/debian/patches/40_elemstyles.dpatch
===================================================================
--- packages/josm/trunk/debian/patches/40_elemstyles.dpatch	2008-07-13 19:45:10 UTC (rev 1715)
+++ packages/josm/trunk/debian/patches/40_elemstyles.dpatch	2008-07-13 19:46:03 UTC (rev 1716)
@@ -1,8 +1,9 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
 ## 40_elemstyles.dpatch by Andreas Putzo <andreas at putzo.net>
 ##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: The icons have been removed from the JAR file because they are
+## DP: already provided by the openstreetmap-map-icons-* packages.
+## DP: Point josm to the correct directory so that the icons are found.
 
 @DPATCH@
 diff -urNad josm-0.0.0.20080518~/src/org/openstreetmap/josm/gui/mappaint/ElemStyleHandler.java josm-0.0.0.20080518/src/org/openstreetmap/josm/gui/mappaint/ElemStyleHandler.java