[DebianGIS-dev] [SCM] josm branch, master, updated. debian/0.0.svn3196-1-13-g520ef90

[David Paleino]

The following commit has been merged in the master branch:
commit 520ef90131a9c789b0bd2c11990d00e54dc4339e
Author: David Paleino <dapal at debian.org>
Date:   Sat Jun 12 13:15:37 2010 +0200

    debian/patches/* refreshed

diff --git a/debian/changelog b/debian/changelog
index 3a3bb94..bd5ea87 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 josm (0.0.svn3329-1) UNRELEASED; urgency=low
 
   * New upstream release
+  * debian/patches/* refreshed
 
- -- David Paleino <dapal at debian.org>  Sat, 12 Jun 2010 13:11:16 +0200
+ -- David Paleino <dapal at debian.org>  Sat, 12 Jun 2010 13:15:25 +0200
 
 josm (0.0.svn3208-1) unstable; urgency=low
 
diff --git a/debian/patches/10-build.patch b/debian/patches/10-build.patch
index e04cc66..f2455de 100644
--- a/debian/patches/10-build.patch
+++ b/debian/patches/10-build.patch
@@ -22,7 +22,7 @@ Forwarded: no
  		</fileset>
  	</path>
  
-@@ -41,14 +42,7 @@
+@@ -42,14 +43,7 @@
  	  -->
  	<target name="create-revision">
  		<property name="revision.dir" value="${build.dir}"/>
@@ -38,7 +38,7 @@ Forwarded: no
  		<tstamp>
  			<format property="build.tstamp" pattern="yyyy-MM-dd HH:mm:ss"/>
  		</tstamp>
-@@ -60,20 +54,13 @@
+@@ -61,20 +55,13 @@
  Revision: ${version.entry.commit.revision}
  Is-Local-Build: true
  Build-Date: ${build.tstamp}
@@ -60,7 +60,7 @@ Forwarded: no
  		<property name="version.entry.commit.revision" value="UNKNOWN"/>
  		<property name="version.entry.commit.date" value="UNKNOWN"/>
  		<echo>Revision ${version.entry.commit.revision}</echo>
-@@ -81,24 +68,25 @@ Build-Date: ${build.tstamp}
+@@ -82,24 +69,25 @@ Build-Date: ${build.tstamp}
  		<copy file="README" todir="build"/>
  		<copy file="LICENSE" todir="build"/>
  
@@ -91,7 +91,7 @@ Forwarded: no
  		</jar>
  	</target>
  
-@@ -122,6 +110,7 @@ Build-Date: ${build.tstamp}
+@@ -123,6 +111,7 @@ Build-Date: ${build.tstamp}
  			<compilerarg value="-Xlint:deprecation"/>
  			<compilerarg value="-Xlint:unchecked"/>
  		</javac>
@@ -99,7 +99,7 @@ Forwarded: no
  	</target>
  
  	<target name="init">
-@@ -132,6 +121,7 @@ Build-Date: ${build.tstamp}
+@@ -133,6 +122,7 @@ Build-Date: ${build.tstamp}
  	<target name="clean">
  		<delete dir="build" />
  		<delete dir="dist" />
diff --git a/debian/patches/60-disable_oauth.patch b/debian/patches/60-disable_oauth.patch
index c050463..2d6c3fc 100644
--- a/debian/patches/60-disable_oauth.patch
+++ b/debian/patches/60-disable_oauth.patch
@@ -97,7 +97,7 @@ Forwarded: not-needed, Debian-specific
              OsmApiException oae = (OsmApiException) e;
 --- josm.orig/src/org/openstreetmap/josm/gui/MainApplication.java
 +++ josm/src/org/openstreetmap/josm/gui/MainApplication.java
-@@ -19,7 +19,7 @@ import java.util.Map;
+@@ -24,7 +24,7 @@ import java.util.Map;
  import javax.swing.JFrame;
  
  import org.openstreetmap.josm.Main;
@@ -106,7 +106,7 @@ Forwarded: not-needed, Debian-specific
  import org.openstreetmap.josm.gui.progress.ProgressMonitor;
  import org.openstreetmap.josm.io.DefaultProxySelector;
  import org.openstreetmap.josm.io.auth.CredentialsManagerFactory;
-@@ -154,7 +154,7 @@ public class MainApplication extends Mai
+@@ -177,7 +177,7 @@ public class MainApplication extends Mai
          DefaultAuthenticator.createInstance(CredentialsManagerFactory.getCredentialManager());
          Authenticator.setDefault(DefaultAuthenticator.getInstance());
          ProxySelector.setDefault(new DefaultProxySelector(ProxySelector.getDefault()));
@@ -435,7 +435,7 @@ Forwarded: not-needed, Debian-specific
       * Explains an OSM API exception because of a client timeout (HTTP 408).
 --- josm.orig/build.xml
 +++ josm/build.xml
-@@ -106,7 +106,8 @@ Debian-Release: ${debian.version}
+@@ -107,7 +107,8 @@ Debian-Release: ${debian.version}
  
  	<target name="compile" depends="init">
  		<javac srcdir="src" classpathref="classpath" destdir="build"
diff --git a/debian/patches/80-fix_images.patch b/debian/patches/80-fix_images.patch
index ec4390e..809842f 100644
--- a/debian/patches/80-fix_images.patch
+++ b/debian/patches/80-fix_images.patch
@@ -9,7 +9,7 @@ Forwarded: no
 
 --- josm.orig/data/defaultpresets.xml
 +++ josm/data/defaultpresets.xml
-@@ -2246,7 +2246,7 @@ are supplied, then "values" will be trea
+@@ -2256,7 +2256,7 @@ are supplied, then "values" will be trea
              <key key="amenity" value="cinema" />
              <text key="name" text="Name" default="" delete_if_empty="true" />
          </item>
@@ -18,7 +18,7 @@ Forwarded: no
              <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
                    fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
              <label text="Edit Library" />
-@@ -2803,7 +2803,7 @@ are supplied, then "values" will be trea
+@@ -2813,7 +2813,7 @@ are supplied, then "values" will be trea
              <label text="(Use international code, like +12-345-67890)" />
              <space />
          </item>

-- 
Java OpenStreetMap editor