The following commit has been merged in the master branch:
commit 8d0ac014aa5e8bb109c4834721fcbd497b4ea8e6
Author: David Paleino <da...@debian.org>
Date: Wed Apr 21 13:49:01 2010 +0200
debian/patches/: 10-build.patch, 20-bts.patch, 60-disable_oauth.patch
refreshed
diff --git a/debian/changelog b/debian/changelog
index 441a573..4a98ddc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
josm (0.0.svn3196-1) UNRELEASED; urgency=low
* New upstream release
+ * debian/patches/:
+ - 10-build.patch, 20-bts.patch, 60-disable_oauth.patch
+ refreshed
- -- David Paleino <da...@debian.org> Wed, 21 Apr 2010 13:29:01 +0200
+ -- David Paleino <da...@debian.org> Wed, 21 Apr 2010 13:48:24 +0200
josm (0.0.svn3094-1) unstable; urgency=low
diff --git a/debian/patches/10-build.patch b/debian/patches/10-build.patch
index 991d1d5..e04cc66 100644
--- a/debian/patches/10-build.patch
+++ b/debian/patches/10-build.patch
@@ -10,7 +10,7 @@ Forwarded: no
--- josm.orig/build.xml
+++ josm/build.xml
-@@ -22,8 +22,9 @@
+@@ -21,8 +21,9 @@
<!-- Java classpath addition (all jar files to compile tests with this)
-->
<path id="classpath">
@@ -22,7 +22,7 @@ Forwarded: no
</fileset>
</path>
-@@ -42,14 +43,7 @@
+@@ -41,14 +42,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>
-@@ -61,20 +55,13 @@
+@@ -60,20 +54,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>
-@@ -82,24 +69,25 @@ Build-Date: ${build.tstamp}
+@@ -81,24 +68,25 @@ Build-Date: ${build.tstamp}
<copy file="README" todir="build"/>
<copy file="LICENSE" todir="build"/>
@@ -91,7 +91,7 @@ Forwarded: no
</jar>
</target>
-@@ -123,6 +111,7 @@ Build-Date: ${build.tstamp}
+@@ -122,6 +110,7 @@ Build-Date: ${build.tstamp}
<compilerarg value="-Xlint:deprecation"/>
<compilerarg value="-Xlint:unchecked"/>
</javac>
@@ -99,7 +99,7 @@ Forwarded: no
</target>
<target name="init">
-@@ -133,6 +122,7 @@ Build-Date: ${build.tstamp}
+@@ -132,6 +121,7 @@ Build-Date: ${build.tstamp}
<target name="clean">
<delete dir="build" />
<delete dir="dist" />
@@ -150,7 +150,7 @@ Forwarded: no
<exec executable="perl">
<arg line="i18n.pl ${i18n.install.dir}/ po/*.po"/>
</exec>
-@@ -102,10 +107,13 @@
+@@ -103,10 +108,13 @@
<ant target="build-lang"><property name="language" value="tr"/></ant>
<ant target="build-lang"><property name="language" value="zh_TW"/></ant>
@@ -165,7 +165,7 @@ Forwarded: no
<arg value="po"/>
</exec>
<xmlproperty file="REVISION" prefix="version" keepRoot="false"
collapseAttributes="true"/>
-@@ -118,6 +126,13 @@
+@@ -119,6 +127,13 @@
<attribute name="Translation-Date"
value="${version.entry.commit.date}"/>
</manifest>
</jar>
@@ -179,7 +179,7 @@ Forwarded: no
</target>
<target name="build-lang">
-@@ -133,6 +148,7 @@
+@@ -134,6 +149,7 @@
<delete>
<fileset dir="po" includes="*.*~" defaultexcludes="false"/>
</delete>
diff --git a/debian/patches/20-bts.patch b/debian/patches/20-bts.patch
index 51a8c08..9fb1a55 100644
--- a/debian/patches/20-bts.patch
+++ b/debian/patches/20-bts.patch
@@ -71,7 +71,7 @@ Forwarded: no
*
--- josm.orig/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java
+++ josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java
-@@ -62,8 +62,8 @@ public final class BugReportExceptionHan
+@@ -68,8 +68,8 @@ public final class BugReportExceptionHan
Main.parent,
"<html>"
+ tr("An unexpected exception occurred.<br>" +
@@ -82,29 +82,29 @@ Forwarded: no
)
+ "</html>",
tr("Unexpected Exception"),
-@@ -114,21 +114,13 @@ public final class BugReportExceptionHan
+@@ -120,21 +120,13 @@ public final class BugReportExceptionHan
JPanel p = new JPanel(new GridBagLayout());
p.add(new JMultilineLabel(
- tr("You have encountered an error in JOSM. Before you
file a bug report " +
-- "make sure you have updated to the latest version
of JOSM here:")), GBC.eol());
+- "make sure you have updated to the latest version of
JOSM here:")), GBC.eol());
- p.add(new UrlLabel("http://josm.openstreetmap.de/#Download";),
GBC.eop().insets(8,0,0,0));
+ tr("Please report a bug against josm.")), GBC.eol());
p.add(new JMultilineLabel(
- tr("You should also update your plugins. If neither
of those help please " +
-- "file a bug report in our bugtracker using this
link:")), GBC.eol());
+- "file a bug report in our bugtracker using this
link:")), GBC.eol());
- p.add(new UrlLabel(url.toString(),
"http://josm.openstreetmap.de/josmticket?...";), GBC.eop().insets(8,0,0,0));
-+ tr("Include your steps to get to the error (as
detailed as possible)!")), GBC.eol());
++ tr("Include your steps to get to the error (as
detailed as possible)!")), GBC.eol());
p.add(new JMultilineLabel(
- tr("There the error information provided below should
already be " +
-- "filled in for you. Please include information on
how to reproduce " +
-- "the error and try to supply as much detail as
possible.")), GBC.eop());
-+ tr("Try updating to the newest version of JOSM and
all plugins before reporting a bug.")), GBC.eol());
+- "filled in for you. Please include
information on how to reproduce " +
+- "the error and try to supply as much detail as
possible.")), GBC.eop());
++ tr("Try updating to the newest version of JOSM and
all plugins before reporting a bug.")), GBC.eol());
p.add(new JMultilineLabel(
- tr("Alternatively, if that does not work you can
manually fill in the information " +
-- "below at this URL:")), GBC.eol());
+- "below at this URL:")), GBC.eol());
- p.add(new UrlLabel("http://josm.openstreetmap.de/newticket";),
GBC.eop().insets(8,0,0,0));
-+ tr("Be sure to include the following
information:")), GBC.eop());
++ tr("Be sure to include the following information:")),
GBC.eop());
try {
Toolkit.getDefaultToolkit().getSystemClipboard().setContents(new
StringSelection(text), new ClipboardOwner(){
public void lostOwnership(Clipboard clipboard,
Transferable contents) {}
diff --git a/debian/patches/60-disable_oauth.patch
b/debian/patches/60-disable_oauth.patch
index d4da2af..c050463 100644
--- a/debian/patches/60-disable_oauth.patch
+++ b/debian/patches/60-disable_oauth.patch
@@ -14,8 +14,8 @@ Forwarded: not-needed, Debian-specific
src/org/openstreetmap/josm/io/OsmConnection.java
| 13 +++-
src/org/openstreetmap/josm/io/auth/CredentialsManager.java
| 6 +-
src/org/openstreetmap/josm/io/auth/JosmPreferencesCredentialManager.java
| 6 +-
- src/org/openstreetmap/josm/tools/ExceptionUtil.java
| 9 ++-
- 11 files changed, 82 insertions(+), 28 deletions(-)
+ src/org/openstreetmap/josm/tools/ExceptionUtil.java
| 8 ++
+ 11 files changed, 81 insertions(+), 28 deletions(-)
--- josm.orig/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java
+++ josm/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java
@@ -66,7 +66,7 @@ Forwarded: not-needed, Debian-specific
tr("Authorisation Failed"),
JOptionPane.ERROR_MESSAGE,
ht("/ErrorMessages#AuthenticationFailed")
-@@ -286,6 +288,7 @@ public class ExceptionDialogUtil {
+@@ -318,6 +320,7 @@ public class ExceptionDialogUtil {
*
* @param e the exception
*/
@@ -74,7 +74,7 @@ Forwarded: not-needed, Debian-specific
public static void
explainMissingOAuthAccessTokenException(MissingOAuthAccessTokenException e) {
HelpAwareOptionPane.showOptionDialog(
Main.parent,
-@@ -295,6 +298,7 @@ public class ExceptionDialogUtil {
+@@ -327,6 +330,7 @@ public class ExceptionDialogUtil {
ht("/ErrorMessages#MissingOAuthAccessToken")
);
}
@@ -82,7 +82,7 @@ Forwarded: not-needed, Debian-specific
/**
* Explains a {...@see UnknownHostException} which has caused an {...@see
OsmTransferException}.
-@@ -372,10 +376,12 @@ public class ExceptionDialogUtil {
+@@ -404,10 +408,12 @@ public class ExceptionDialogUtil {
return;
}
@@ -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;
-@@ -152,7 +152,7 @@ public class MainApplication extends Mai
+@@ -154,7 +154,7 @@ public class MainApplication extends Mai
DefaultAuthenticator.createInstance(CredentialsManagerFactory.getCredentialManager());
Authenticator.setDefault(DefaultAuthenticator.getInstance());
ProxySelector.setDefault(new
DefaultProxySelector(ProxySelector.getDefault()));
@@ -425,18 +425,17 @@ Forwarded: not-needed, Debian-specific
public static String explainFailedOAuthAuthentication(OsmApiException e) {
e.printStackTrace();
return tr("<html>"
-@@ -140,6 +143,8 @@ public class ExceptionUtil {
+@@ -140,6 +143,7 @@ public class ExceptionUtil {
e.getAccessedUrl() == null ? tr("unknown") :
e.getAccessedUrl()
);
}
+*/
-+
+
/**
- * Explains an error due to a 409 conflict
- *
+ * Explains an OSM API exception because of a client timeout (HTTP 408).
--- josm.orig/build.xml
+++ josm/build.xml
-@@ -107,7 +107,8 @@ Debian-Release: ${debian.version}
+@@ -106,7 +106,8 @@ Debian-Release: ${debian.version}
<target name="compile" depends="init">
<javac srcdir="src" classpathref="classpath" destdir="build"
--
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
