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

[pere at alioth.debian.org]

Author: pere
Date: 2008-03-30 15:53:14 +0000 (Sun, 30 Mar 2008)
New Revision: 1483

Removed:
   packages/josm/trunk/debian/patches/50_OsmServerWriter.dpatch
Modified:
   packages/josm/trunk/debian/changelog
   packages/josm/trunk/debian/control
   packages/josm/trunk/debian/patches/00list
Log:
Move to new upstream release.

Modified: packages/josm/trunk/debian/changelog
===================================================================
--- packages/josm/trunk/debian/changelog	2008-03-30 15:42:03 UTC (rev 1482)
+++ packages/josm/trunk/debian/changelog	2008-03-30 15:53:14 UTC (rev 1483)
@@ -1,13 +1,18 @@
-josm (0.0.0.20080316-3) UNRELEASED; urgency=low
+josm (0.0.0.20080330-1) unstable; urgency=low
 
+  [ Giovanni Mascellani ]
   * Added myself into uploaders
   * patches/40_elemstyles:
     + Icons are searched both in openstreetmap-map-icons-classic and
       openstreetmap-map-icons-square
     + elemstyles.xml doesn't contain absolute paths to icons
 
- -- Giovanni Mascellani <g.mascellani at gmail.com>  Fri, 28 Mar 2008 22:18:46 +0100
+  [ Petter Reinholdtsen ]
+  * New upstream version fetched using debian/rules get-orig-source.
+    - Drop patch 50_OsmServerWriter now applied upstream.
 
+ -- Petter Reinholdtsen <pere at debian.org>  Sun, 30 Mar 2008 17:52:44 +0200
+
 josm (0.0.0.20080316-2) unstable; urgency=low
 
   [ Andreas Putzo ]

Modified: packages/josm/trunk/debian/control
===================================================================
--- packages/josm/trunk/debian/control	2008-03-30 15:42:03 UTC (rev 1482)
+++ packages/josm/trunk/debian/control	2008-03-30 15:53:14 UTC (rev 1483)
@@ -2,7 +2,7 @@
 Section: utils
 Priority: extra
 Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
-Uploaders: Andreas Putzo <andreas at putzo.net>, Petter Reinholdtsen <pere at debian.org>, Giovanni Mascellani <g.mascellani at gmail.com>
+Uploaders: Andreas Putzo <andreas at putzo.net>, Giovanni Mascellani <g.mascellani at gmail.com>, Petter Reinholdtsen <pere at debian.org>
 Build-Depends: ant, cdbs, dpatch, debhelper (>= 5), java-gcj-compat-dev, libgettext-commons-java, libmetadata-extractor-java
 Standards-Version: 3.7.3
 Homepage: http://josm.openstreetmap.de

Modified: packages/josm/trunk/debian/patches/00list
===================================================================
--- packages/josm/trunk/debian/patches/00list	2008-03-30 15:42:03 UTC (rev 1482)
+++ packages/josm/trunk/debian/patches/00list	2008-03-30 15:53:14 UTC (rev 1483)
@@ -2,4 +2,3 @@
 20_bts
 30_graphics
 40_elemstyles
-50_OsmServerWriter

Deleted: packages/josm/trunk/debian/patches/50_OsmServerWriter.dpatch
===================================================================
--- packages/josm/trunk/debian/patches/50_OsmServerWriter.dpatch	2008-03-30 15:42:03 UTC (rev 1482)
+++ packages/josm/trunk/debian/patches/50_OsmServerWriter.dpatch	2008-03-30 15:53:14 UTC (rev 1483)
@@ -1,32 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 50_OsmServerWriter.dpatch by Andreas Putzo <andreas at putzo.net>
-##
-## DP: Setup the OutputStream for uploading before connecting to the OSM server.
-## DP:   While the classpath library (URLConnection) documents that this should happen after connect() 
-## DP:   it actually throws an exception in HttpURLConnection when done in that order.
-
- 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)