[DebianGIS-dev] r1719 - in packages/josm/trunk/debian: . patches
nd-guest at alioth.debian.org
nd-guest at alioth.debian.org
Sun Jul 13 20:20:55 UTC 2008
Author: nd-guest
Date: 2008-07-13 20:20:54 +0000 (Sun, 13 Jul 2008)
New Revision: 1719
Removed:
packages/josm/trunk/debian/patches/30_graphics.dpatch
packages/josm/trunk/debian/patches/50_sun.dpatch
Modified:
packages/josm/trunk/debian/changelog
packages/josm/trunk/debian/patches/00list
Log:
fixate patches.
Modified: packages/josm/trunk/debian/changelog
===================================================================
--- packages/josm/trunk/debian/changelog 2008-07-13 20:15:45 UTC (rev 1718)
+++ packages/josm/trunk/debian/changelog 2008-07-13 20:20:54 UTC (rev 1719)
@@ -1,8 +1,6 @@
josm (0.0.0.20080713-1) UNRELEASED; urgency=low
[ Giovanni Mascellani ]
- * patches/50_sun: fix 0.6 API specific code (not yet used) which
- doesn't compile with gcj
* Bumped Standards-Version to 3.8.0 (no changes needed)
* Added Vcs-* fields in debian/control
@@ -19,7 +17,7 @@
* Added patch description to 40_elemstyles.dpatch.
* Mentioned Ellipsoid.java in copyright file.
- -- Andreas Putzo <andreas at putzo.net> Sun, 13 Jul 2008 20:15:04 +0000
+ -- Andreas Putzo <andreas at putzo.net> Sun, 13 Jul 2008 20:18:31 +0000
josm (0.0.0.20080510-1) unstable; urgency=low
Modified: packages/josm/trunk/debian/patches/00list
===================================================================
--- packages/josm/trunk/debian/patches/00list 2008-07-13 20:15:45 UTC (rev 1718)
+++ packages/josm/trunk/debian/patches/00list 2008-07-13 20:20:54 UTC (rev 1719)
@@ -1,5 +1,3 @@
10_build
20_bts
-#30_graphics
40_elemstyles
-#50_sun
Deleted: packages/josm/trunk/debian/patches/30_graphics.dpatch
===================================================================
--- packages/josm/trunk/debian/patches/30_graphics.dpatch 2008-07-13 20:15:45 UTC (rev 1718)
+++ packages/josm/trunk/debian/patches/30_graphics.dpatch 2008-07-13 20:20:54 UTC (rev 1719)
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 30_graphics.dpatch by Andreas Putzo <andreas at putzo.net>
-##
-## DP: Workaround setXORMode
-
- at DPATCH@
-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();
Deleted: packages/josm/trunk/debian/patches/50_sun.dpatch
===================================================================
--- packages/josm/trunk/debian/patches/50_sun.dpatch 2008-07-13 20:15:45 UTC (rev 1718)
+++ packages/josm/trunk/debian/patches/50_sun.dpatch 2008-07-13 20:20:54 UTC (rev 1719)
@@ -1,103 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 50_sun.dpatch by Giovanni Mascellani <g.mascellani at gmail.com>
-##
-## DP: Fix 0.6 API specific code (not yet used) which doesn't compile with gcj
-
- at DPATCH@
-diff -urNad josm-0.0.0.20080627~/src/org/openstreetmap/josm/gui/MainApplication.java josm-0.0.0.20080627/src/org/openstreetmap/josm/gui/MainApplication.java
---- josm-0.0.0.20080627~/src/org/openstreetmap/josm/gui/MainApplication.java 2008-06-29 12:39:39.000000000 +0200
-+++ josm-0.0.0.20080627/src/org/openstreetmap/josm/gui/MainApplication.java 2008-06-29 12:45:31.000000000 +0200
-@@ -171,6 +171,16 @@
- Main.loadPlugins(false);
- toolbar.refreshToolbarControl();
-
-+ String version = Main.pref.get("osm-server.version", "0.5");
-+ if (version != "0.5") {
-+ // Debian JOSM is not API 0.6 compatible
-+ JOptionPane.showMessageDialog(null,
-+ "This version of JOSM compiled for Debian cannot be used with 0.6 API.\n" +
-+ "Please, delete the \"osm-server.version\" line from your configuration file and restart JOSM.",
-+ "Not API 0.6 compatible JOSM", JOptionPane.ERROR_MESSAGE);
-+ System.exit(0);
-+ }
-+
- mainFrame.setVisible(true);
-
- if (!args.containsKey("no-fullscreen") && !args.containsKey("geometry") && Toolkit.getDefaultToolkit().isFrameStateSupported(JFrame.MAXIMIZED_BOTH))
-diff -urNad josm-0.0.0.20080627~/src/org/openstreetmap/josm/io/MyHttpHandler.java josm-0.0.0.20080627/src/org/openstreetmap/josm/io/MyHttpHandler.java
---- josm-0.0.0.20080627~/src/org/openstreetmap/josm/io/MyHttpHandler.java 2008-06-29 12:39:39.000000000 +0200
-+++ josm-0.0.0.20080627/src/org/openstreetmap/josm/io/MyHttpHandler.java 2008-06-29 12:45:31.000000000 +0200
-@@ -7,7 +7,7 @@
-
- // This is also a java.net.URLStreamHandler
- // Basically a copy of sun.net.www.protocol.http.Handler
--public class MyHttpHandler extends sun.net.www.protocol.http.Handler {
-+/*public class MyHttpHandler extends sun.net.www.protocol.http.Handler {
- protected String proxy;
- protected int proxyPort;
-
-@@ -30,4 +30,4 @@
- throws IOException {
- return new MyHttpURLConnection(u, p, this);
- }
--}
-+}*/
-diff -urNad josm-0.0.0.20080627~/src/org/openstreetmap/josm/io/MyHttpURLConnection.java josm-0.0.0.20080627/src/org/openstreetmap/josm/io/MyHttpURLConnection.java
---- josm-0.0.0.20080627~/src/org/openstreetmap/josm/io/MyHttpURLConnection.java 2008-06-29 12:39:39.000000000 +0200
-+++ josm-0.0.0.20080627/src/org/openstreetmap/josm/io/MyHttpURLConnection.java 2008-06-29 12:46:11.000000000 +0200
-@@ -6,7 +6,7 @@
- import java.net.URL;
- import java.net.Proxy;
-
--public class MyHttpURLConnection extends sun.net.www.protocol.http.HttpURLConnection {
-+/*public class MyHttpURLConnection extends sun.net.www.protocol.http.HttpURLConnection {
- protected MyHttpURLConnection(URL u, Proxy p, sun.net.www.protocol.http.Handler handler)
- {
- super(u,p,handler);
-@@ -20,4 +20,4 @@
- method = oldmethod;
- return temp;
- }
--}
-+}*/
-diff -urNad josm-0.0.0.20080627~/src/org/openstreetmap/josm/io/OsmServerWriter.java josm-0.0.0.20080627/src/org/openstreetmap/josm/io/OsmServerWriter.java
---- josm-0.0.0.20080627~/src/org/openstreetmap/josm/io/OsmServerWriter.java 2008-06-29 12:39:39.000000000 +0200
-+++ josm-0.0.0.20080627/src/org/openstreetmap/josm/io/OsmServerWriter.java 2008-06-29 12:45:31.000000000 +0200
-@@ -303,7 +303,7 @@
- */
- public void visit(Node n) {
- if (n.deleted) {
-- sendRequest("DELETE", "node", n, true);
-+ sendRequest("DELETE", "node", n, false);
- } else {
- sendRequest("PUT", "node", n, true);
- }
-@@ -315,7 +315,7 @@
- */
- public void visit(Way w) {
- if (w.deleted) {
-- sendRequest("DELETE", "way", w, true);
-+ sendRequest("DELETE", "way", w, false);
- } else {
- sendRequest("PUT", "way", w, true);
- }
-@@ -327,7 +327,7 @@
- */
- public void visit(Relation e) {
- if (e.deleted) {
-- sendRequest("DELETE", "relation", e, true);
-+ sendRequest("DELETE", "relation", e, false);
- } else {
- sendRequest("PUT", "relation", e, true);
- }
-@@ -368,8 +368,8 @@
- new URL(Main.pref.get("osm-server.url") +
- "/" + version + "/"),
- urlSuffix +
-- "/" + (osm.id==0 ? "create" : osm.id),
-- (java.net.URLStreamHandler)new MyHttpHandler());
-+ "/" + (osm.id==0 ? "create" : osm.id));
-+ //(java.net.URLStreamHandler)new MyHttpHandler());
- System.out.print("upload to: "+url+ "..." );
- activeConnection = (HttpURLConnection)url.openConnection();
- activeConnection.setConnectTimeout(15000);
More information about the Pkg-grass-devel
mailing list