Author: nd-guest Date: 2008-03-11 22:05:53 +0000 (Tue, 11 Mar 2008) New Revision: 1399
Added: packages/josm/trunk/debian/patches/30_graphics.dpatch Removed: packages/josm/trunk/debian/patches/30_gcj.dpatch Modified: packages/josm/trunk/debian/patches/00list packages/josm/trunk/debian/patches/10_build.dpatch packages/josm/trunk/debian/patches/20_bts.dpatch Log: 30_gcj.dpatch is no longer needed. Add 30_graphics, setXORMode workaround Adjust versionpattern in 20_bts.dpatch to reflect debian version Modified: packages/josm/trunk/debian/patches/00list =================================================================== --- packages/josm/trunk/debian/patches/00list 2008-03-11 22:03:02 UTC (rev 1398) +++ packages/josm/trunk/debian/patches/00list 2008-03-11 22:05:53 UTC (rev 1399) @@ -1,3 +1,3 @@ 10_build 20_bts -30_gcj +30_graphics Modified: packages/josm/trunk/debian/patches/10_build.dpatch =================================================================== --- packages/josm/trunk/debian/patches/10_build.dpatch 2008-03-11 22:03:02 UTC (rev 1398) +++ packages/josm/trunk/debian/patches/10_build.dpatch 2008-03-11 22:05:53 UTC (rev 1399) @@ -5,16 +5,16 @@ ## DP: the dependencies into the target jar file. @DPATCH@ -diff -urNad josm-1.6~svn320~/build.xml josm-1.6~svn320/build.xml ---- josm-1.6~svn320~/build.xml 2007-09-05 09:14:52.000000000 +0000 -+++ josm-1.6~svn320/build.xml 2007-09-05 09:35:37.000000000 +0000 -@@ -1,33 +1,32 @@ +diff -urNad josm-0.0.0.20080311~/build.xml josm-0.0.0.20080311/build.xml +--- josm-0.0.0.20080311~/build.xml 2008-01-30 17:02:38.000000000 +0000 ++++ josm-0.0.0.20080311/build.xml 2008-03-11 20:47:24.000000000 +0000 +@@ -1,23 +1,14 @@ <project name="josm" default="dist" basedir="."> - <!-- All jar files necessary to run only JOSM (no tests) --> - <fileset id="josm_required_libs" dir="lib"> - <include name="gettext-commons-0.9.jar"/> -- <include name="metadata-extractor-2.3.1.jar"/> +- <include name="metadata-extractor-2.3.1-nosun.jar"/> - </fileset> - <!-- Java classpath addition (all jar files to compile tests with this) --> @@ -32,21 +32,20 @@ - <unjar dest="build"> - <fileset refid="josm_required_libs" /> - </unjar> -- + <!-- images --> <copy todir="build/images"> - <fileset dir="images" /> +@@ -34,11 +25,17 @@ + <fileset dir="styles" /> </copy> -+ <!-- readme --> -+ <copy todir="build"> -+ <fileset dir="."> -+ <include name="README"/> -+ <include name="CONTRIBUTION"/> -+ <include name="REVISION"/> -+ </fileset> -+ </copy> ++ <!-- revision --> ++ <copy todir="build/"> ++ <fileset file="REVISION" /> ++ </copy> ++ <!-- create josm-custom.jar --> + <delete file="dist/josm-custom.jar"/> <jar destfile="dist/josm-custom.jar" basedir="build"> <manifest> <attribute name="Main-class" value="org.openstreetmap.josm.gui.MainApplication" /> Modified: packages/josm/trunk/debian/patches/20_bts.dpatch =================================================================== --- packages/josm/trunk/debian/patches/20_bts.dpatch 2008-03-11 22:03:02 UTC (rev 1398) +++ packages/josm/trunk/debian/patches/20_bts.dpatch 2008-03-11 22:05:53 UTC (rev 1399) @@ -13,7 +13,7 @@ revision = loadFile(Main.class.getResource("/REVISION")); - Pattern versionPattern = Pattern.compile(".*?Revision: ([0-9]*).*", Pattern.CASE_INSENSITIVE|Pattern.DOTALL); -+ Pattern versionPattern = Pattern.compile(".*?Revision: ([a-z0-9+~:]*).*", Pattern.CASE_INSENSITIVE|Pattern.DOTALL); ++ Pattern versionPattern = Pattern.compile(".*?Revision: ([[0-9].-]*).*", Pattern.CASE_INSENSITIVE|Pattern.DOTALL); Matcher match = versionPattern.matcher(revision.getText()); version = match.matches() ? match.group(1) : "UNKNOWN"; Deleted: packages/josm/trunk/debian/patches/30_gcj.dpatch =================================================================== --- packages/josm/trunk/debian/patches/30_gcj.dpatch 2008-03-11 22:03:02 UTC (rev 1398) +++ packages/josm/trunk/debian/patches/30_gcj.dpatch 2008-03-11 22:05:53 UTC (rev 1399) @@ -1,89 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 30_gcj.dpatch by Andreas Putzo <[EMAIL PROTECTED]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - [EMAIL PROTECTED]@ -diff -urNad josm-0.0.0.20071008~/src/org/openstreetmap/josm/actions/HelpAction.java josm-0.0.0.20071008/src/org/openstreetmap/josm/actions/HelpAction.java ---- josm-0.0.0.20071008~/src/org/openstreetmap/josm/actions/HelpAction.java 2007-10-04 08:32:45.000000000 +0000 -+++ josm-0.0.0.20071008/src/org/openstreetmap/josm/actions/HelpAction.java 2007-10-09 18:24:03.000000000 +0000 -@@ -112,7 +112,8 @@ - setHelpUrl(url); - } else if (e.getActionCommand() == null) { - String topic = null; -- Point mouse = Main.parent.getMousePosition(); -+/* Point mouse = Main.parent.getMousePosition(); */ -+ Point mouse = null; - if (mouse != null) - topic = contextSensitiveHelp(SwingUtilities.getDeepestComponentAt(Main.parent, mouse.x, mouse.y)); - if (topic == null) { -diff -urNad josm-0.0.0.20071008~/src/org/openstreetmap/josm/gui/MapMover.java josm-0.0.0.20071008/src/org/openstreetmap/josm/gui/MapMover.java ---- josm-0.0.0.20071008~/src/org/openstreetmap/josm/gui/MapMover.java 2007-08-07 20:33:04.000000000 +0000 -+++ josm-0.0.0.20071008/src/org/openstreetmap/josm/gui/MapMover.java 2007-10-09 18:24:03.000000000 +0000 -@@ -33,7 +33,8 @@ - } - public void actionPerformed(ActionEvent e) { - if (action.equals(".") || action.equals(",")) { -- Point mouse = nc.getMousePosition(); -+/* Point mouse = nc.getMousePosition(); */ -+ Point mouse = null; - if (mouse == null) - mouse = new Point((int)nc.getBounds().getCenterX(), (int)nc.getBounds().getCenterY()); - MouseWheelEvent we = new MouseWheelEvent(nc, e.getID(), e.getWhen(), e.getModifiers(), mouse.x, mouse.y, 0, false, MouseWheelEvent.WHEEL_UNIT_SCROLL, 1, action.equals(",") ? -1 : 1); -diff -urNad josm-0.0.0.20071008~/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java josm-0.0.0.20071008/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java ---- josm-0.0.0.20071008~/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java 2007-08-10 19:12:53.000000000 +0000 -+++ josm-0.0.0.20071008/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java 2007-10-09 18:24:03.000000000 +0000 -@@ -183,7 +183,8 @@ - - instance.addMouseListener(new MouseAdapter(){ - private void openPopup(MouseEvent e) { -- Point p = listScrollPane.getMousePosition(); -+/* Point p = listScrollPane.getMousePosition(); - */ -+ Point p = null; - if (p == null) - return; // user is faster than swing with mouse movement - int index = instance.locationToIndex(e.getPoint()); -diff -urNad josm-0.0.0.20071008~/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java josm-0.0.0.20071008/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java ---- josm-0.0.0.20071008~/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java 2007-09-16 02:37:42.000000000 +0000 -+++ josm-0.0.0.20071008/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java 2007-10-09 18:30:01.000000000 +0000 -@@ -377,7 +377,9 @@ - Rectangle r = new Rectangle(p.x-e.icon.getIconWidth()/2, p.y-e.icon.getIconHeight()/2, e.icon.getIconWidth(), e.icon.getIconHeight()); - e.icon.paintIcon(mv, g, r.x, r.y); - Border b = null; -- Point mousePosition = mv.getMousePosition(); -+/* Point mousePosition = mv.getMousePosition(); */ -+/* TODO. Check. */ -+ Point mousePosition = null; - if (mousePosition == null) - continue; // mouse outside the whole window - if (!clickedFound && mousePressed && r.contains(mousePosition)) { -diff -urNad josm-0.0.0.20071008~/src/org/openstreetmap/josm/gui/layer/markerlayer/ButtonMarker.java josm-0.0.0.20071008/src/org/openstreetmap/josm/gui/layer/markerlayer/ButtonMarker.java ---- josm-0.0.0.20071008~/src/org/openstreetmap/josm/gui/layer/markerlayer/ButtonMarker.java 2007-08-07 20:33:04.000000000 +0000 -+++ josm-0.0.0.20071008/src/org/openstreetmap/josm/gui/layer/markerlayer/ButtonMarker.java 2007-10-09 18:24:03.000000000 +0000 -@@ -40,7 +40,8 @@ - buttonRectangle.setLocation(screen.x+4, screen.y+2); - symbol.paintIcon(mv, g, screen.x+4, screen.y+2); - Border b; -- Point mousePosition = mv.getMousePosition(); -+/* Point mousePosition = mv.getMousePosition(); - */ -+ Point mousePosition = null; - if (mousePosition == null) - return; // mouse outside the whole window - -diff -urNad josm-0.0.0.20071008~/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java josm-0.0.0.20071008/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java ---- josm-0.0.0.20071008~/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java 2007-08-10 19:12:53.000000000 +0000 -+++ josm-0.0.0.20071008/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java 2007-10-09 18:24:03.000000000 +0000 -@@ -94,7 +94,8 @@ - - @Override public void paint(Graphics g, MapView mv) { - boolean mousePressedTmp = mousePressed; -- Point mousePos = mv.getMousePosition(); -+/* Point mousePos = mv.getMousePosition(); - */ -+ Point mousePos = null; - String mkrCol = Main.pref.get("color.gps marker"); - String mkrColSpecial = Main.pref.get("color.layer "+name); - String mkrTextShow = Main.pref.get("marker.show "+name, "show"); Added: packages/josm/trunk/debian/patches/30_graphics.dpatch =================================================================== --- packages/josm/trunk/debian/patches/30_graphics.dpatch (rev 0) +++ packages/josm/trunk/debian/patches/30_graphics.dpatch 2008-03-11 22:05:53 UTC (rev 1399) @@ -0,0 +1,18 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 30_graphics.dpatch by Andreas Putzo <[EMAIL PROTECTED]> +## +## DP: Workaround setXORMode + [EMAIL PROTECTED]@ +diff -urNad josm-0.0.0.20071014~/src/org/openstreetmap/josm/gui/SelectionManager.java josm-0.0.0.20071014/src/org/openstreetmap/josm/gui/SelectionManager.java +--- josm-0.0.0.20071014~/src/org/openstreetmap/josm/gui/SelectionManager.java 2007-10-09 22:10:27.000000000 +0000 ++++ josm-0.0.0.20071014/src/org/openstreetmap/josm/gui/SelectionManager.java 2007-10-14 16:24:24.000000000 +0000 +@@ -221,7 +221,7 @@ + if (mousePos == null || mousePosStart == null || mousePos == mousePosStart) + return; + Graphics g = nc.getGraphics(); +- g.setColor(Color.BLACK); ++ g.setColor(Color.BLUE); + g.setXORMode(Color.WHITE); + + Rectangle r = getSelectionRectangle(); Property changes on: packages/josm/trunk/debian/patches/30_graphics.dpatch ___________________________________________________________________ Name: svn:executable + * _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel