[DebianGIS-dev] r1681 - packages/josm/trunk/debian/patches
gmascellani-guest at alioth.debian.org
gmascellani-guest at alioth.debian.org
Sun Jun 29 10:47:15 UTC 2008
Author: gmascellani-guest
Date: 2008-06-29 10:47:14 +0000 (Sun, 29 Jun 2008)
New Revision: 1681
Modified:
packages/josm/trunk/debian/patches/50_sun.dpatch
Log:
Removed some uneeded hunks in 50_sun.dpatch
Modified: packages/josm/trunk/debian/patches/50_sun.dpatch
===================================================================
--- packages/josm/trunk/debian/patches/50_sun.dpatch 2008-06-27 16:53:46 UTC (rev 1680)
+++ packages/josm/trunk/debian/patches/50_sun.dpatch 2008-06-29 10:47:14 UTC (rev 1681)
@@ -4,10 +4,10 @@
## DP: Fix 0.6 API specific code (not yet used) which doesn't compile with gcj
@DPATCH@
-diff -urNad josm-0.0.0.20080518~/src/org/openstreetmap/josm/gui/MainApplication.java josm-0.0.0.20080518/src/org/openstreetmap/josm/gui/MainApplication.java
---- josm-0.0.0.20080518~/src/org/openstreetmap/josm/gui/MainApplication.java 2008-05-10 21:47:30.000000000 +0200
-+++ josm-0.0.0.20080518/src/org/openstreetmap/josm/gui/MainApplication.java 2008-06-27 18:19:17.000000000 +0200
-@@ -172,6 +172,16 @@
+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();
@@ -24,66 +24,45 @@
mainFrame.setVisible(true);
if (!args.containsKey("no-fullscreen") && !args.containsKey("geometry") && Toolkit.getDefaultToolkit().isFrameStateSupported(JFrame.MAXIMIZED_BOTH))
-diff -urNad josm-0.0.0.20080518~/src/org/openstreetmap/josm/io/MyHttpHandler.java josm-0.0.0.20080518/src/org/openstreetmap/josm/io/MyHttpHandler.java
---- josm-0.0.0.20080518~/src/org/openstreetmap/josm/io/MyHttpHandler.java 2008-06-27 18:18:15.000000000 +0200
-+++ josm-0.0.0.20080518/src/org/openstreetmap/josm/io/MyHttpHandler.java 2008-06-27 18:18:21.000000000 +0200
+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 gnu.java.net.protocol.http.Handler {
++/*public class MyHttpHandler extends sun.net.www.protocol.http.Handler {
protected String proxy;
protected int proxyPort;
-@@ -17,12 +17,12 @@
- proxyPort = -1;
- }
-
-- protected java.net.URLConnection openConnection(URL u)
-+ public java.net.URLConnection openConnection(URL u)
- throws IOException {
- return openConnection(u, (Proxy) null);
- }
- public MyHttpHandler(String proxy, int port) {
-- proxy = proxy;
-+ this.proxy = proxy;
- proxyPort = port;
- }
-
@@ -30,4 +30,4 @@
throws IOException {
return new MyHttpURLConnection(u, p, this);
}
-}
+}*/
-diff -urNad josm-0.0.0.20080518~/src/org/openstreetmap/josm/io/MyHttpURLConnection.java josm-0.0.0.20080518/src/org/openstreetmap/josm/io/MyHttpURLConnection.java
---- josm-0.0.0.20080518~/src/org/openstreetmap/josm/io/MyHttpURLConnection.java 2008-06-27 18:18:15.000000000 +0200
-+++ josm-0.0.0.20080518/src/org/openstreetmap/josm/io/MyHttpURLConnection.java 2008-06-27 18:18:21.000000000 +0200
-@@ -6,10 +6,11 @@
+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 {
-- protected MyHttpURLConnection(URL u, Proxy p, sun.net.www.protocol.http.Handler handler)
-+/*public class MyHttpURLConnection extends gnu.java.net.protocol.http.HTTPURLConnection {
-+ protected MyHttpURLConnection(URL u, Proxy p, gnu.java.net.protocol.http.Handler handler) throws IOException
++/*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);
-+ //super(u,p,handler);
-+ super(u);
- }
-
- public synchronized OutputStream getOutputStream()
-@@ -20,4 +21,4 @@
+ super(u,p,handler);
+@@ -20,4 +20,4 @@
method = oldmethod;
return temp;
}
-}
+}*/
-diff -urNad josm-0.0.0.20080518~/src/org/openstreetmap/josm/io/OsmServerWriter.java josm-0.0.0.20080518/src/org/openstreetmap/josm/io/OsmServerWriter.java
---- josm-0.0.0.20080518~/src/org/openstreetmap/josm/io/OsmServerWriter.java 2008-06-27 18:18:15.000000000 +0200
-+++ josm-0.0.0.20080518/src/org/openstreetmap/josm/io/OsmServerWriter.java 2008-06-27 18:18:21.000000000 +0200
+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) {
More information about the Pkg-grass-devel
mailing list