[DebianGIS-dev] [SCM] josm branch, master, updated. debian/0.0.svn3208-1-19-g14aac9f
The following commit has been merged in the master branch:
commit 66d7dc67b0855b16c115d187f288971b3c57951f
Author: David Paleino da...@debian.org
Date: Thu Jul 15 14:14:48 2010 +0200
debian/README.Debian deleted, josm is a wrapper that uses the alternatives
system
diff --git a/debian/README.Debian b/debian/README.Debian
deleted file mode 100644
index d9d459e..000
--- a/debian/README.Debian
+++ /dev/null
@@ -1,10 +0,0 @@
-Josm for Debian
-
-By default josm is launched using OpenJDK-6. This can be overridden
-by exporting the JAVACMD or JAVA_HOME environment variables before
-running josm.
-Note that JOSM doesn't follow the alternative system
-in /etc/alternatives/ that is usually used on Debian systems.
-
- -- Andreas Putzo andr...@putzo.net Sun, 13 Jul 2008 19:16:59 +
diff --git a/debian/changelog b/debian/changelog
index 2849849..5bc3607 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+josm (0.0.svn3329-2) UNRELEASED; urgency=low
+
+ * debian/README.Debian deleted, josm is a wrapper that uses the
+alternatives system
+
+ -- David Paleino da...@debian.org Thu, 15 Jul 2010 14:14:10 +0200
+
josm (0.0.svn3329-1) unstable; urgency=low
[ David Paleino ]
diff --git a/debian/josm.sh b/debian/josm.sh
index fabe3af..62ab577 100644
--- a/debian/josm.sh
+++ b/debian/josm.sh
@@ -14,7 +14,7 @@ for jcmd in $JAVA_CMDS; do
fi
done
-for jcmd in $JAVA_CMDS; do
+for jcmd in $JAVA_CMDS; do
if [ -x $jcmd -a -z ${JAVACMD} ]; then
JAVACMD=$jcmd
fi
@@ -23,7 +23,7 @@ done
if [ $JAVACMD ]; then
echo Using $JAVACMD to execute josm.
exec $JAVACMD $JAVA_OPTS -jar /usr/share/josm/josm.jar $@
-else
+else
echo No valid JVM found to run JOSM.
exit 1
fi
--
Java OpenStreetMap editor
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] [SCM] josm branch, master, updated. debian/0.0.svn3208-1-19-g14aac9f
The following commit has been merged in the master branch: commit 98a5b7334f50555c07d8f883883464d4fbf23acf Author: David Paleino da...@debian.org Date: Thu Jul 15 14:16:01 2010 +0200 debian/control: added Build-Depends on liboauth-signpost-java diff --git a/debian/changelog b/debian/changelog index 5bc3607..6e6e97a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,11 @@ josm (0.0.svn3329-2) UNRELEASED; urgency=low + * OAuth support is now enabled +- debian/control: added Build-Depends on liboauth-signpost-java * debian/README.Debian deleted, josm is a wrapper that uses the alternatives system - -- David Paleino da...@debian.org Thu, 15 Jul 2010 14:14:10 +0200 + -- David Paleino da...@debian.org Thu, 15 Jul 2010 14:15:29 +0200 josm (0.0.svn3329-1) unstable; urgency=low diff --git a/debian/control b/debian/control index d5ed992..6c2ef4c 100644 --- a/debian/control +++ b/debian/control @@ -18,6 +18,7 @@ Build-Depends: libmetadata-extractor-java, libgettext-ant-tasks-java, libterm-readkey-perl + , liboauth-signpost-java Standards-Version: 3.8.4 Homepage: http://josm.openstreetmap.de Vcs-Git: git://git.debian.org/pkg-grass/josm.git -- Java OpenStreetMap editor ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] [SCM] josm branch, master, updated. debian/0.0.svn3208-1-19-g14aac9f
The following commit has been merged in the master branch: commit 8cacfde2bee75087d0459104abd7a499c893b321 Author: David Paleino da...@debian.org Date: Thu Jul 15 14:16:35 2010 +0200 debian/rules: add signpost-core.jar to the CLASSPATH diff --git a/debian/changelog b/debian/changelog index 6e6e97a..1c01774 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,10 +2,11 @@ josm (0.0.svn3329-2) UNRELEASED; urgency=low * OAuth support is now enabled - debian/control: added Build-Depends on liboauth-signpost-java +- debian/rules: add signpost-core.jar to the CLASSPATH * debian/README.Debian deleted, josm is a wrapper that uses the alternatives system - -- David Paleino da...@debian.org Thu, 15 Jul 2010 14:15:29 +0200 + -- David Paleino da...@debian.org Thu, 15 Jul 2010 14:16:16 +0200 josm (0.0.svn3329-1) unstable; urgency=low diff --git a/debian/rules b/debian/rules index 71e2dc2..8f7a7ed 100755 --- a/debian/rules +++ b/debian/rules @@ -1,7 +1,7 @@ #!/usr/bin/make -f export JAVA_HOME=/usr/lib/jvm/default-java -export CLASSPATH=/usr/share/java/gettext-commons.jar:/usr/share/java/metadata-extractor.jar +export CLASSPATH=/usr/share/java/gettext-commons.jar:/usr/share/java/metadata-extractor.jar:/usr/share/java/signpost-core.jar SVNREPO := http://josm.openstreetmap.de/svn/trunk SVNI18NREPO := http://svn.openstreetmap.org/applications/editors/josm/i18n/ -- Java OpenStreetMap editor ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] [SCM] josm branch, master, updated. debian/0.0.svn3208-1-19-g14aac9f
The following commit has been merged in the master branch: commit 89691643cde3148d3e440f2437ed1790c2ad2428 Author: David Paleino da...@debian.org Date: Thu Jul 15 14:18:45 2010 +0200 debian/patches/series: 60-disable_oauth.patch disabled diff --git a/debian/changelog b/debian/changelog index 1c01774..04ac0b3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,10 +3,12 @@ josm (0.0.svn3329-2) UNRELEASED; urgency=low * OAuth support is now enabled - debian/control: added Build-Depends on liboauth-signpost-java - debian/rules: add signpost-core.jar to the CLASSPATH +- debian/patches/: + - series: 60-disable_oauth.patch disabled * debian/README.Debian deleted, josm is a wrapper that uses the alternatives system - -- David Paleino da...@debian.org Thu, 15 Jul 2010 14:16:16 +0200 + -- David Paleino da...@debian.org Thu, 15 Jul 2010 14:18:20 +0200 josm (0.0.svn3329-1) unstable; urgency=low diff --git a/debian/patches/series b/debian/patches/series index 0d72e85..6d571f1 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,6 +2,7 @@ 20-bts.patch 40-elemstyles.patch 50-preferences_world_readable.patch -60-disable_oauth.patch +#60-disable_oauth.patch +60-port_oauth_1.2.patch 70-default_look_and_feel.patch 80-fix_images.patch -- Java OpenStreetMap editor ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] [SCM] josm branch, master, updated. debian/0.0.svn3208-1-19-g14aac9f
The following commit has been merged in the master branch:
commit 5307acb112a85def4fa7e8e2f97e58543cb744a3
Author: David Paleino da...@debian.org
Date: Thu Jul 15 14:19:31 2010 +0200
debian/patches/10-build.patch: add signpost-core.jar to MANIFEST's
Class-Path
diff --git a/debian/changelog b/debian/changelog
index 04ac0b3..a22d533 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,10 +5,11 @@ josm (0.0.svn3329-2) UNRELEASED; urgency=low
- debian/rules: add signpost-core.jar to the CLASSPATH
- debian/patches/:
- series: 60-disable_oauth.patch disabled
+ - 10-build.patch: add signpost-core.jar to MANIFEST's Class-Path
* debian/README.Debian deleted, josm is a wrapper that uses the
alternatives system
- -- David Paleino da...@debian.org Thu, 15 Jul 2010 14:18:20 +0200
+ -- David Paleino da...@debian.org Thu, 15 Jul 2010 14:18:52 +0200
josm (0.0.svn3329-1) unstable; urgency=low
diff --git a/debian/patches/10-build.patch b/debian/patches/10-build.patch
index f2455de..04b90d6 100644
--- a/debian/patches/10-build.patch
+++ b/debian/patches/10-build.patch
@@ -80,7 +80,7 @@ Forwarded: no
attribute name=Main-Version
value=${version.entry.commit.revision} SVN/
attribute name=Main-Date
value=${version.entry.commit.date}/
+ attribute name=Debian-Release
value=${debian.version}/
-+ attribute name=Class-Path
value=/usr/share/java/gettext-commons.jar
/usr/share/java/metadata-extractor.jar/
++ attribute name=Class-Path
value=/usr/share/java/gettext-commons.jar
/usr/share/java/metadata-extractor.jar /usr/share/java/signpost-core.jar/
/manifest
zipfileset dir=images prefix=images /
zipfileset dir=data prefix=data /
--
Java OpenStreetMap editor
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] [SCM] josm branch, master, updated. debian/0.0.svn3208-1-19-g14aac9f
The following commit has been merged in the master branch:
commit 14aac9f98548d85385be21c08bdca6d1fcb316ab
Author: David Paleino da...@debian.org
Date: Thu Jul 15 14:27:26 2010 +0200
debian/patches/60-port_oauth_1.2.patch added: port josm to signpost 1.2
diff --git a/debian/changelog b/debian/changelog
index a22d533..dd1fea3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,10 +6,11 @@ josm (0.0.svn3329-2) UNRELEASED; urgency=low
- debian/patches/:
- series: 60-disable_oauth.patch disabled
- 10-build.patch: add signpost-core.jar to MANIFEST's Class-Path
+ - 60-port_oauth_1.2.patch added: port josm to signpost 1.2
* debian/README.Debian deleted, josm is a wrapper that uses the
alternatives system
- -- David Paleino da...@debian.org Thu, 15 Jul 2010 14:18:52 +0200
+ -- David Paleino da...@debian.org Thu, 15 Jul 2010 14:19:44 +0200
josm (0.0.svn3329-1) unstable; urgency=low
diff --git a/debian/patches/60-port_oauth_1.2.patch
b/debian/patches/60-port_oauth_1.2.patch
new file mode 100644
index 000..c794616
--- /dev/null
+++ b/debian/patches/60-port_oauth_1.2.patch
@@ -0,0 +1,58 @@
+From: David Paleino da...@debian.org
+Subject: port JOSM code to OAuth-Signpost 1.2
+Forwarded: https://josm.openstreetmap.de/ticket/5244
+
+---
+ src/org/openstreetmap/josm/data/oauth/OAuthParameters.java|6
+++---
+ src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java |4
++--
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+--- josm.orig/src/org/openstreetmap/josm/data/oauth/OAuthParameters.java
josm/src/org/openstreetmap/josm/data/oauth/OAuthParameters.java
+@@ -5,7 +5,7 @@ import oauth.signpost.OAuthConsumer;
+ import oauth.signpost.OAuthProvider;
+ import oauth.signpost.basic.DefaultOAuthConsumer;
+ import oauth.signpost.basic.DefaultOAuthProvider;
+-import oauth.signpost.signature.SignatureMethod;
++import oauth.signpost.signature.HmacSha1MessageSigner;
+
+ import org.openstreetmap.josm.data.Preferences;
+ import org.openstreetmap.josm.tools.CheckParameterUtil;
+@@ -133,7 +133,8 @@ public class OAuthParameters {
+ * @return the consumer
+ */
+ public OAuthConsumer buildConsumer() {
+-return new DefaultOAuthConsumer(consumerKey, consumerSecret,
SignatureMethod.HMAC_SHA1);
++OAuthConsumer consumer = new DefaultOAuthConsumer(consumerKey,
consumerSecret);
++return consumer;
+ }
+
+ /**
+@@ -146,7 +147,6 @@ public class OAuthParameters {
+ public OAuthProvider buildProvider(OAuthConsumer consumer) throws
IllegalArgumentException {
+ CheckParameterUtil.ensureParameterNotNull(consumer, consumer);
+ return new DefaultOAuthProvider(
+-consumer,
+ requestTokenUrl,
+ accessTokenUrl,
+ authoriseUrl
+---
josm.orig/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java
josm/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java
+@@ -129,7 +129,7 @@ public class OsmOAuthAuthorizationClient
+ try {
+ monitor.beginTask();
+ monitor.indeterminateSubTask(tr(Retrieving OAuth Request Token
from ''{0}'', oauthProviderParameters.getRequestTokenUrl()));
+-provider.retrieveRequestToken(null);
++provider.retrieveRequestToken(consumer, null);
+ return OAuthToken.createToken(consumer);
+ } catch(OAuthCommunicationException e){
+ if (canceled)
+@@ -162,7 +162,7 @@ public class OsmOAuthAuthorizationClient
+ try {
+ monitor.beginTask();
+ monitor.indeterminateSubTask(tr(Retrieving OAuth Access Token
from ''{0}'', oauthProviderParameters.getAccessTokenUrl()));
+-provider.retrieveAccessToken(null);
++provider.retrieveAccessToken(consumer, null);
+ return OAuthToken.createToken(consumer);
+ } catch(OAuthCommunicationException e){
+ if (canceled)
--
Java OpenStreetMap editor
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
