[josm/f13/master] Update to 3751 svn revision
Cédric OLIVIER
cquad at fedoraproject.org
Thu Jan 6 22:04:16 UTC 2011
commit 632c47bfaf9f263669c2b1506d9493b7f6a7acbc
Author: cquad <cquad at fedoraproject.org>
Date: Thu Jan 6 23:03:56 2011 +0100
Update to 3751 svn revision
.gitignore | 1 +
REVISION.XML | 23 ---------
josm-0-disable_oauth.patch | 85 ++++++++++++++-----------------
josm-0-remove_metadata-extractor.patch | 11 ++--
josm-0.3514svn.tar.gz | Bin 6540554 -> 0 bytes
josm-0.3592svn.tar.gz | Bin 6569209 -> 0 bytes
josm-generate-tarball.sh | 4 +-
josm.spec | 13 ++++-
sources | 2 +-
9 files changed, 58 insertions(+), 81 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a5be18e..acdf9ea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
josm-0.3376svn.tar.gz
/josm-0.3514svn.tar.gz
+/josm-0.3751svn.tar.gz
diff --git a/josm-0-disable_oauth.patch b/josm-0-disable_oauth.patch
index 7f85661..6327265 100644
--- a/josm-0-disable_oauth.patch
+++ b/josm-0-disable_oauth.patch
@@ -1,7 +1,7 @@
-diff -uNr josm-0-3592-original/build.xml josm-0/build.xml
---- josm-0-3592-original/build.xml 2010-10-02 09:25:32.000000000 +0200
-+++ josm-0/build.xml 2010-10-07 19:04:29.741006661 +0200
-@@ -99,7 +99,6 @@
+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" />
@@ -9,7 +9,7 @@ diff -uNr josm-0-3592-original/build.xml josm-0/build.xml
</jar>
</target>
-@@ -119,7 +118,8 @@
+@@ -120,7 +119,8 @@
<target name="compile" depends="init">
<javac srcdir="src" classpathref="classpath" destdir="build"
@@ -19,17 +19,9 @@ diff -uNr josm-0-3592-original/build.xml josm-0/build.xml
<compilerarg value="-Xlint:deprecation"/>
<compilerarg value="-Xlint:unchecked"/>
</javac>
-@@ -231,6 +231,7 @@
- <classpath path="tools/animal-sniffer-ant-tasks-1.5.jar" />
- </typedef>
-
-+
- <delete dir="${dir}"/>
-
- <mkdir dir="${dir}"/>
-diff -uNr josm-0-3592-original/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java josm-0/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java
---- josm-0-3592-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 2010-10-07 19:06:39.974006768 +0200
+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
@@ -15,7 +15,7 @@
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.io.ChangesetClosedException;
@@ -93,19 +85,19 @@ diff -uNr josm-0-3592-original/src/org/openstreetmap/josm/gui/ExceptionDialogUti
if (e instanceof OsmApiException) {
OsmApiException oae = (OsmApiException) e;
-diff -uNr josm-0-3592-original/src/org/openstreetmap/josm/gui/MainApplication.java josm-0/src/org/openstreetmap/josm/gui/MainApplication.java
---- josm-0-3592-original/src/org/openstreetmap/josm/gui/MainApplication.java 2010-09-18 17:43:30.000000000 +0200
-+++ josm-0/src/org/openstreetmap/josm/gui/MainApplication.java 2010-10-07 19:07:41.757006720 +0200
-@@ -35,7 +35,7 @@
+diff -uNr josm-0-3751-original/src/org/openstreetmap/josm/gui/MainApplication.java josm-0/src/org/openstreetmap/josm/gui/MainApplication.java
+--- josm-0-3751-original/src/org/openstreetmap/josm/gui/MainApplication.java 2010-12-12 01:47:03.000000000 +0100
++++ josm-0/src/org/openstreetmap/josm/gui/MainApplication.java 2011-01-05 21:16:16.927620310 +0100
+@@ -33,7 +33,7 @@
+ import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.AutosaveTask;
import org.openstreetmap.josm.data.Preferences;
- import org.openstreetmap.josm.gui.layer.OsmDataLayer;
-import org.openstreetmap.josm.gui.preferences.server.OAuthAccessTokenHolder;
+//import org.openstreetmap.josm.gui.preferences.server.OAuthAccessTokenHolder;
import org.openstreetmap.josm.gui.progress.ProgressMonitor;
import org.openstreetmap.josm.io.DefaultProxySelector;
import org.openstreetmap.josm.io.auth.CredentialsManagerFactory;
-@@ -187,7 +187,7 @@
+@@ -186,7 +186,7 @@
DefaultAuthenticator.createInstance(CredentialsManagerFactory.getCredentialManager());
Authenticator.setDefault(DefaultAuthenticator.getInstance());
ProxySelector.setDefault(new DefaultProxySelector(ProxySelector.getDefault()));
@@ -114,9 +106,9 @@ diff -uNr josm-0-3592-original/src/org/openstreetmap/josm/gui/MainApplication.ja
// asking for help? show help and exit
if (args.containsKey("help")) {
-diff -uNr josm-0-3592-original/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java josm-0/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java
---- josm-0-3592-original/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java 2010-09-15 08:21:16.000000000 +0200
-+++ josm-0/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java 2010-10-07 19:09:01.691006362 +0200
+diff -uNr josm-0-3751-original/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java josm-0/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java
+--- josm-0-3751-original/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java 2010-09-15 08:21:16.000000000 +0200
++++ josm-0/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java 2011-01-05 21:17:32.968620350 +0100
@@ -39,7 +39,7 @@
/** the panel for the basic authentication parameters */
private BasicAuthenticationPreferencesPanel pnlBasicAuthPreferences;
@@ -191,9 +183,9 @@ diff -uNr josm-0-3592-original/src/org/openstreetmap/josm/gui/preferences/server
+*/
}
}
-diff -uNr josm-0-3592-original/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java josm-0/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java
---- josm-0-3592-original/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java 2010-09-15 08:21:16.000000000 +0200
-+++ josm-0/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java 2010-10-07 19:10:43.491881624 +0200
+diff -uNr josm-0-3751-original/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java josm-0/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java
+--- josm-0-3751-original/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java 2010-09-15 08:21:16.000000000 +0200
++++ josm-0/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java 2011-01-05 21:18:25.729620214 +0100
@@ -6,7 +6,7 @@
import java.util.logging.Logger;
@@ -265,9 +257,9 @@ diff -uNr josm-0-3592-original/src/org/openstreetmap/josm/gui/preferences/server
}
/**
-diff -uNr josm-0-3592-original/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java josm-0/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java
---- josm-0-3592-original/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java 2010-09-15 08:21:16.000000000 +0200
-+++ josm-0/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java 2010-10-07 19:12:45.976006671 +0200
+diff -uNr josm-0-3751-original/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java josm-0/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java
+--- josm-0-3751-original/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java 2010-09-15 08:21:16.000000000 +0200
++++ josm-0/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java 2011-01-05 21:20:11.283745270 +0100
@@ -25,13 +25,17 @@
import javax.swing.JTextField;
@@ -421,9 +413,9 @@ diff -uNr josm-0-3592-original/src/org/openstreetmap/josm/gui/preferences/server
}
}
-diff -uNr josm-0-3592-original/src/org/openstreetmap/josm/io/auth/CredentialsManager.java josm-0/src/org/openstreetmap/josm/io/auth/CredentialsManager.java
---- josm-0-3592-original/src/org/openstreetmap/josm/io/auth/CredentialsManager.java 2010-03-05 10:54:39.000000000 +0100
-+++ josm-0/src/org/openstreetmap/josm/io/auth/CredentialsManager.java 2010-10-07 19:13:22.002006397 +0200
+diff -uNr josm-0-3751-original/src/org/openstreetmap/josm/io/auth/CredentialsManager.java josm-0/src/org/openstreetmap/josm/io/auth/CredentialsManager.java
+--- josm-0-3751-original/src/org/openstreetmap/josm/io/auth/CredentialsManager.java 2010-03-05 10:54:39.000000000 +0100
++++ josm-0/src/org/openstreetmap/josm/io/auth/CredentialsManager.java 2011-01-05 21:20:50.548620368 +0100
@@ -4,7 +4,7 @@
import java.net.PasswordAuthentication;
import java.net.Authenticator.RequestorType;
@@ -449,9 +441,9 @@ diff -uNr josm-0-3592-original/src/org/openstreetmap/josm/io/auth/CredentialsMan
- public void storeOAuthAccessToken(OAuthToken accessToken) throws CredentialsManagerException;
+// public void storeOAuthAccessToken(OAuthToken accessToken) throws CredentialsManagerException;
}
-diff -uNr josm-0-3592-original/src/org/openstreetmap/josm/io/auth/JosmPreferencesCredentialManager.java josm-0/src/org/openstreetmap/josm/io/auth/JosmPreferencesCredentialManager.java
---- josm-0-3592-original/src/org/openstreetmap/josm/io/auth/JosmPreferencesCredentialManager.java 2010-09-04 15:52:04.000000000 +0200
-+++ josm-0/src/org/openstreetmap/josm/io/auth/JosmPreferencesCredentialManager.java 2010-10-07 19:14:02.398006630 +0200
+diff -uNr josm-0-3751-original/src/org/openstreetmap/josm/io/auth/JosmPreferencesCredentialManager.java josm-0/src/org/openstreetmap/josm/io/auth/JosmPreferencesCredentialManager.java
+--- josm-0-3751-original/src/org/openstreetmap/josm/io/auth/JosmPreferencesCredentialManager.java 2010-11-29 13:08:25.000000000 +0100
++++ josm-0/src/org/openstreetmap/josm/io/auth/JosmPreferencesCredentialManager.java 2011-01-05 21:21:43.397620310 +0100
@@ -7,7 +7,7 @@
import java.util.Map;
@@ -469,11 +461,10 @@ diff -uNr josm-0-3592-original/src/org/openstreetmap/josm/io/auth/JosmPreference
public OAuthToken lookupOAuthAccessToken() throws CredentialsManagerException {
String accessTokenKey = Main.pref.get("oauth.access-token.key", null);
String accessTokenSecret = Main.pref.get("oauth.access-token.secret", null);
-@@ -150,14 +151,14 @@
- return null;
+@@ -151,13 +152,14 @@
return new OAuthToken(accessTokenKey, accessTokenSecret);
}
--
+
+*/
/**
* Stores the OAuth Access Token <code>accessToken</code>.
@@ -486,15 +477,15 @@ diff -uNr josm-0-3592-original/src/org/openstreetmap/josm/io/auth/JosmPreference
if (accessToken == null) {
Main.pref.put("oauth.access-token.key", null);
Main.pref.put("oauth.access-token.secret", null);
-@@ -166,4 +167,5 @@
+@@ -166,4 +168,5 @@
Main.pref.put("oauth.access-token.secret", accessToken.getSecret());
}
}
+*/
}
-diff -uNr josm-0-3592-original/src/org/openstreetmap/josm/io/OsmConnection.java josm-0/src/org/openstreetmap/josm/io/OsmConnection.java
---- josm-0-3592-original/src/org/openstreetmap/josm/io/OsmConnection.java 2010-06-26 21:09:24.000000000 +0200
-+++ josm-0/src/org/openstreetmap/josm/io/OsmConnection.java 2010-10-07 19:14:57.042006535 +0200
+diff -uNr josm-0-3751-original/src/org/openstreetmap/josm/io/OsmConnection.java josm-0/src/org/openstreetmap/josm/io/OsmConnection.java
+--- josm-0-3751-original/src/org/openstreetmap/josm/io/OsmConnection.java 2010-06-26 21:09:24.000000000 +0200
++++ josm-0/src/org/openstreetmap/josm/io/OsmConnection.java 2011-01-05 21:58:45.794745266 +0100
@@ -12,12 +12,12 @@
import java.nio.charset.CharsetEncoder;
import java.util.logging.Logger;
@@ -546,9 +537,9 @@ diff -uNr josm-0-3592-original/src/org/openstreetmap/josm/io/OsmConnection.java
} else {
String msg = tr("Warning: unexpected value for preference ''{0}''. Got ''{1}''.", "osm-server.auth-method", authMethod);
System.err.println(msg);
-diff -uNr josm-0-3592-original/src/org/openstreetmap/josm/tools/ExceptionUtil.java josm-0/src/org/openstreetmap/josm/tools/ExceptionUtil.java
---- josm-0-3592-original/src/org/openstreetmap/josm/tools/ExceptionUtil.java 2010-09-25 10:39:16.000000000 +0200
-+++ josm-0/src/org/openstreetmap/josm/tools/ExceptionUtil.java 2010-10-07 19:16:01.070881526 +0200
+diff -uNr josm-0-3751-original/src/org/openstreetmap/josm/tools/ExceptionUtil.java josm-0/src/org/openstreetmap/josm/tools/ExceptionUtil.java
+--- josm-0-3751-original/src/org/openstreetmap/josm/tools/ExceptionUtil.java 2010-09-25 10:39:16.000000000 +0200
++++ josm-0/src/org/openstreetmap/josm/tools/ExceptionUtil.java 2011-01-05 22:00:11.276620459 +0100
@@ -18,10 +18,10 @@
import java.util.regex.Pattern;
diff --git a/josm-0-remove_metadata-extractor.patch b/josm-0-remove_metadata-extractor.patch
index 58a28aa..325018f 100644
--- a/josm-0-remove_metadata-extractor.patch
+++ b/josm-0-remove_metadata-extractor.patch
@@ -1,10 +1,9 @@
---- build.xml.original 2010-10-07 19:20:09.022959000 +0200
-+++ build.xml 2010-10-07 19:22:42.330972739 +0200
-@@ -96,9 +96,6 @@ Build-Date: ${build.tstamp}
- </manifest>
- <zipfileset dir="images" prefix="images" />
+--- 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>
diff --git a/josm-generate-tarball.sh b/josm-generate-tarball.sh
index e58a1d9..b528e1b 100755
--- a/josm-generate-tarball.sh
+++ b/josm-generate-tarball.sh
@@ -22,7 +22,9 @@ svn -r ${JOSM_SVN_TAG} export http://josm.openstreetmap.de/svn/trunk/ ${NAME_VER
rm -r ${NAME_VERSION}/src/org/apache
# Add REVISION.XML to source files
-cp ./REVISION.XML ${NAME_VERSION}/REVISION
+svn -r ${JOSM_SVN_TAG} co http://josm.openstreetmap.de/svn/trunk/ temporary_dir
+svn info --xml temporary_dir > ${NAME_VERSION}/REVISION
+rm -rf temporary_dir
# creating source tar
tar zcvf ${NAME_VERSION}.${JOSM_SVN_TAG}svn.tar.gz ${NAME_VERSION} #i18n plugins
diff --git a/josm.spec b/josm.spec
index 65afb87..de4f680 100644
--- a/josm.spec
+++ b/josm.spec
@@ -1,12 +1,12 @@
#
# spec file for package josm
-%global svn_revision 3592
+%global svn_revision 3751
Name: josm
Version: 0
-Release: 0.12.%{svn_revision}svn%{?dist}
+Release: 0.13.%{svn_revision}svn%{?dist}
Summary: An editor for OpenStreetMap (OSM)
Group: Applications/Internet
License: GPLv2+
@@ -16,7 +16,6 @@ Source1: %{name}
Source2: %{name}.desktop
Source3: %{name}-generate-tarball.sh
Source4: %{name}.1
-Source5: REVISION.XML
#Source built using the following commands : ./josm-generate-tarball.sh 3514
#patch to disable oauth, it is needed because oauth requires maven 2.0.9 and a maven > 2.0.8 seels to be only planned for F14
@@ -142,6 +141,14 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
+* Sun Jan 02 2011 Cedric OLIVIER <cedric.olivier at free.fr> 0-0.13.3751svn
+- Update to 3751 svn revision
+- The Validator plugin has been integrated into the main program
+- Scaling of objects is supported. (Ctrl+Alt in select mode)
+ info To rotate an object click Ctrl+Shift
+- Layers can be displayed transparently. (new button in layer list dialog)
+- Plugins imagery,wmsplugin,slippymap and remotecontrol are integrated into JOSM core
+
* Fri Nov 19 2010 Cedric OLIVIER <cedric.olivier at free.fr> 0-0.12.3592svn
- Solve Bug 641756 - JOSM chooses wrong Java version on startup
diff --git a/sources b/sources
index 8e7e902..1d46436 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-89b57012bbe2e356b2741562e1cb6677 josm-0.3514svn.tar.gz
+80a851935deba949fd01b20548603a5f josm-0.3751svn.tar.gz
More information about the scm-commits
mailing list