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

[nd-guest at alioth.debian.org]

Author: nd-guest
Date: 2008-03-25 20:03:00 +0000 (Tue, 25 Mar 2008)
New Revision: 1442

Added:
   packages/josm/trunk/debian/patches/50_OsmServerWriter.dpatch
Modified:
   packages/josm/trunk/debian/
   packages/josm/trunk/debian/changelog
   packages/josm/trunk/debian/patches/00list
   packages/josm/trunk/debian/patches/10_build.dpatch
Log:
* Allow upload with classpath
* Disable some compiler warnings



Property changes on: packages/josm/trunk/debian
___________________________________________________________________
Name: mergeWithUpstream
   + 1

Modified: packages/josm/trunk/debian/changelog
===================================================================
--- packages/josm/trunk/debian/changelog	2008-03-24 17:30:02 UTC (rev 1441)
+++ packages/josm/trunk/debian/changelog	2008-03-25 20:03:00 UTC (rev 1442)
@@ -1,8 +1,9 @@
 josm (0.0.0.20080316-2) UNRELEASED; urgency=low
 
-  * 
+  * Add 50_OsmServerWriter.dpatch to allow uploading with gcj.
+  * Suppress some compiler warnings (serial, unusedImport) in build.xml.
 
- -- Petter Reinholdtsen <pere at debian.org>  Sun, 16 Mar 2008 15:17:34 +0100
+ -- Andreas Putzo <andreas at putzo.net>  Tue, 25 Mar 2008 19:49:21 +0000
 
 josm (0.0.0.20080316-1) unstable; urgency=low
 

Modified: packages/josm/trunk/debian/patches/00list
===================================================================
--- packages/josm/trunk/debian/patches/00list	2008-03-24 17:30:02 UTC (rev 1441)
+++ packages/josm/trunk/debian/patches/00list	2008-03-25 20:03:00 UTC (rev 1442)
@@ -2,3 +2,4 @@
 20_bts
 30_graphics
 40_elemstyles
+50_OsmServerWriter

Modified: packages/josm/trunk/debian/patches/10_build.dpatch
===================================================================
--- packages/josm/trunk/debian/patches/10_build.dpatch	2008-03-24 17:30:02 UTC (rev 1441)
+++ packages/josm/trunk/debian/patches/10_build.dpatch	2008-03-25 20:03:00 UTC (rev 1442)
@@ -5,9 +5,9 @@
 ## DP: the dependencies into the target jar file.
 
 @DPATCH@
-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 22:51:40.000000000 +0000
+diff -urNad josm-0.0.0.20080316~/build.xml josm-0.0.0.20080316/build.xml
+--- josm-0.0.0.20080316~/build.xml	2008-01-30 17:02:38.000000000 +0000
++++ josm-0.0.0.20080316/build.xml	2008-03-25 19:54:41.000000000 +0000
 @@ -1,23 +1,14 @@
  <project name="josm" default="dist" basedir=".">
  
@@ -59,3 +59,11 @@
  			</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>
+ 

Added: packages/josm/trunk/debian/patches/50_OsmServerWriter.dpatch
===================================================================
--- packages/josm/trunk/debian/patches/50_OsmServerWriter.dpatch	                        (rev 0)
+++ packages/josm/trunk/debian/patches/50_OsmServerWriter.dpatch	2008-03-25 20:03:00 UTC (rev 1442)
@@ -0,0 +1,30 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 50_OsmServerWriter.dpatch by Andreas Putzo <andreas at putzo.net>
+##
+## DP: Create Outputstream prior connect() for uploading with the classpath library.
+
+ at DPATCH@
+diff -urNad josm-0.0.0.20080316~/src/org/openstreetmap/josm/io/OsmServerWriter.java josm-0.0.0.20080316/src/org/openstreetmap/josm/io/OsmServerWriter.java
+--- josm-0.0.0.20080316~/src/org/openstreetmap/josm/io/OsmServerWriter.java	2008-01-30 17:02:38.000000000 +0000
++++ josm-0.0.0.20080316/src/org/openstreetmap/josm/io/OsmServerWriter.java	2008-03-25 19:56:21.000000000 +0000
+@@ -191,15 +191,15 @@
+ 			activeConnection = (HttpURLConnection)url.openConnection();
+ 			activeConnection.setConnectTimeout(15000);
+ 			activeConnection.setRequestMethod(requestMethod);
+-			if (addBody)
++            addAuth(activeConnection);
++			if (addBody) {
+ 				activeConnection.setDoOutput(true);
+-			activeConnection.connect();
+-			System.out.println("connected");
+-			if (addBody) {
+ 				OutputStream out = activeConnection.getOutputStream();
+ 				OsmWriter.output(out, new OsmWriter.Single(osm, true));
+ 				out.close();
+-			}
++            }
++			activeConnection.connect();
++			System.out.println("connected");
+ 
+ 			int retCode = activeConnection.getResponseCode();
+ 			if (retCode == 200 && osm.id == 0)


Property changes on: packages/josm/trunk/debian/patches/50_OsmServerWriter.dpatch
___________________________________________________________________
Name: svn:executable
   + *