[josm/f14/master] Update to 3751 svn revision

Cédric OLIVIER cquad at fedoraproject.org
Thu Jan 6 21:05:41 UTC 2011


commit b2539d39bfab2c3ef6656e7bd17aefc891ac5a6a
Author: cquad <cquad at fedoraproject.org>
Date:   Thu Jan 6 22:03:54 2011 +0100

    Update to 3751 svn revision

 josm-0-disable_oauth.patch             |   32 ++++++++++++++++----------------
 josm-0-remove_metadata-extractor.patch |   18 +++++++++---------
 sources                                |    5 ++++-
 3 files changed, 29 insertions(+), 26 deletions(-)
---
diff --git a/josm-0-disable_oauth.patch b/josm-0-disable_oauth.patch
index f6896ce..6327265 100644
--- a/josm-0-disable_oauth.patch
+++ b/josm-0-disable_oauth.patch
@@ -2,23 +2,23 @@ diff -uNr josm-0-3751-original/build.xml josm-0/build.xml
 --- josm-0-3751-original/build.xml	2010-12-26 18:23:05.000000000 +0100
 +++ josm-0/build.xml	2011-01-05 21:08:18.275745311 +0100
 @@ -100,7 +100,6 @@
- 
- 			<!-- All jar files necessary to run only JOSM (no tests) -->
- 			<zipfileset src="lib/metadata-extractor-2.3.1-nosun.jar" />
--			<zipfileset src="lib/signpost-core-1.2.1.1.jar" />
- 		</jar>
- 	</target>
- 
+ 
+ 			<!-- All jar files necessary to run only JOSM (no tests) -->
+ 			<zipfileset src="lib/metadata-extractor-2.3.1-nosun.jar" />
+-			<zipfileset src="lib/signpost-core-1.2.1.1.jar" />
+ 		</jar>
+ 	</target>
+ 
 @@ -120,7 +119,8 @@
- 
- 	<target name="compile" depends="init">
- 		<javac srcdir="src" classpathref="classpath" destdir="build"
--				target="1.5" source="1.5" debug="on" encoding="UTF-8">
-+				target="1.5" source="1.5" debug="on" encoding="UTF-8"
-+				excludes="org/openstreetmap/josm/gui/oauth/,org/openstreetmap/josm/data/oauth/">
- 			<compilerarg value="-Xlint:deprecation"/>
- 			<compilerarg value="-Xlint:unchecked"/>
- 		</javac>
+ 
+ 	<target name="compile" depends="init">
+ 		<javac srcdir="src" classpathref="classpath" destdir="build"
+-				target="1.5" source="1.5" debug="on" encoding="UTF-8">
++				target="1.5" source="1.5" debug="on" encoding="UTF-8"
++				excludes="org/openstreetmap/josm/gui/oauth/,org/openstreetmap/josm/data/oauth/">
+ 			<compilerarg value="-Xlint:deprecation"/>
+ 			<compilerarg value="-Xlint:unchecked"/>
+ 		</javac>
 diff -uNr josm-0-3751-original/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java josm-0/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java
 --- josm-0-3751-original/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java	2010-05-15 21:57:19.000000000 +0200
 +++ josm-0/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java	2011-01-05 21:13:19.364745387 +0100
diff --git a/josm-0-remove_metadata-extractor.patch b/josm-0-remove_metadata-extractor.patch
index a679f31..325018f 100644
--- a/josm-0-remove_metadata-extractor.patch
+++ b/josm-0-remove_metadata-extractor.patch
@@ -1,11 +1,11 @@
 --- build.xml.orginal	2011-01-05 21:08:18.275745000 +0100
 +++ build.xml	2011-01-05 22:02:40.253745094 +0100
-@@ -98,8 +98,6 @@ Build-Date: ${build.tstamp}
- 			<zipfileset dir="data" prefix="data" />
- 			<zipfileset dir="src/org/openstreetmap/gui/jmapviewer/images" prefix="org/openstreetmap/gui/jmapviewer/images" />
- 
--			<!-- All jar files necessary to run only JOSM (no tests) -->
--			<zipfileset src="lib/metadata-extractor-2.3.1-nosun.jar" />
- 		</jar>
- 	</target>
- 
+@@ -98,8 +98,6 @@ Build-Date: ${build.tstamp}
+ 			<zipfileset dir="data" prefix="data" />
+ 			<zipfileset dir="src/org/openstreetmap/gui/jmapviewer/images" prefix="org/openstreetmap/gui/jmapviewer/images" />
+ 
+-			<!-- All jar files necessary to run only JOSM (no tests) -->
+-			<zipfileset src="lib/metadata-extractor-2.3.1-nosun.jar" />
+ 		</jar>
+ 	</target>
+ 
diff --git a/sources b/sources
index 1d46436..aa868b6 100644
--- a/sources
+++ b/sources
@@ -1 +1,4 @@
-80a851935deba949fd01b20548603a5f  josm-0.3751svn.tar.gz
+2f8ae3ed99fec3ef001e90f64b1c4d5a  josm-0-add_javadoc.patch
+16082875ca084839044517e64d39d965  josm-0-disable_oauth.patch
+6c70ddff6ee09af17880d403d8fa5a9e  josm-0-remove_metadata-extractor.patch
+a762f7f9d808d87f4e6654372892435e  josm-0-remove_svn_call.patch


More information about the scm-commits mailing list