The following commit has been merged in the master branch:
commit ce8ba30945256b126f514df87d1ffd29fc898564
Author: David Paleino <da...@debian.org>
Date: Fri Mar 12 23:57:28 2010 +0100
Update patch
diff --git a/debian/patches/60-disable_oauth.patch
b/debian/patches/60-disable_oauth.patch
index 317eebb..d4da2af 100644
--- a/debian/patches/60-disable_oauth.patch
+++ b/debian/patches/60-disable_oauth.patch
@@ -4,7 +4,7 @@ Subject: disable everything OAuth-related, since we're missing
packaged
Forwarded: not-needed, Debian-specific
---
- build.xml
| 5 +
+ build.xml
| 3 -
src/org/openstreetmap/josm/actions/ShowStatusReportAction.java
| 5 +
src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java
| 12 +++-
src/org/openstreetmap/josm/gui/MainApplication.java
| 4 -
@@ -15,7 +15,7 @@ Forwarded: not-needed, Debian-specific
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, 84 insertions(+), 28 deletions(-)
+ 11 files changed, 82 insertions(+), 28 deletions(-)
--- josm.orig/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java
+++ josm/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java
@@ -436,20 +436,16 @@ Forwarded: not-needed, Debian-specific
*
--- josm.orig/build.xml
+++ josm/build.xml
-@@ -107,9 +107,12 @@ Debian-Release: ${debian.version}
-
- <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>
- <ant target="build" dir="i18n"/>
- </target>
+@@ -107,7 +107,8 @@ Debian-Release: ${debian.version}
+
+ <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>
---
josm.orig/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java
+++
josm/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java
@@ -25,13 +25,17 @@ import javax.swing.JPanel;
--
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
