[DebianGIS-dev] r1810 - packages/josm/trunk/debian/patches
gmascellani-guest at alioth.debian.org
gmascellani-guest at alioth.debian.org
Mon Dec 22 23:01:21 UTC 2008
Author: gmascellani-guest
Date: 2008-12-22 23:01:21 +0000 (Mon, 22 Dec 2008)
New Revision: 1810
Modified:
packages/josm/trunk/debian/patches/10_build.dpatch
packages/josm/trunk/debian/patches/20_bts.dpatch
Log:
Modified to comply with new upstream release
Modified: packages/josm/trunk/debian/patches/10_build.dpatch
===================================================================
--- packages/josm/trunk/debian/patches/10_build.dpatch 2008-12-22 22:49:13 UTC (rev 1809)
+++ packages/josm/trunk/debian/patches/10_build.dpatch 2008-12-22 23:01:21 UTC (rev 1810)
@@ -5,15 +5,15 @@
## DP: the dependencies into the target jar file.
@DPATCH@
-diff -urNad josm-0.0.0.20080316~/build.xml josm-0.0.0.20080316/build.xml
---- josm-0.0.0.20080316~/build.xml 2008-01-30 17:02:38.000000000 +0000
-+++ josm-0.0.0.20080316/build.xml 2008-03-25 19:54:41.000000000 +0000
-@@ -1,23 +1,14 @@
+diff -urNad josm-0.0.0.20081222~/build.xml josm-0.0.0.20081222/build.xml
+--- josm-0.0.0.20081222~/build.xml 2008-12-22 23:14:17.000000000 +0100
++++ josm-0.0.0.20081222/build.xml 2008-12-22 23:16:13.000000000 +0100
+@@ -1,39 +1,23 @@
<project name="josm" default="dist" basedir=".">
- <!-- All jar files necessary to run only JOSM (no tests) -->
- <fileset id="josm_required_libs" dir="lib">
-- <include name="gettext-commons-0.9.jar"/>
+- <include name="gettext-commons-0.9.2.jar"/>
- <include name="metadata-extractor-2.3.1-nosun.jar"/>
- </fileset>
-
@@ -32,30 +32,100 @@
- <unjar dest="build">
- <fileset refid="josm_required_libs" />
- </unjar>
+-
+- <!-- translation -->
+- <unjar dest="build">
+- <fileset dir="lib">
+- <include name="josm-translation.jar" />
+- </fileset>
+- </unjar>
- <!-- images -->
- <copy todir="build/images">
-@@ -31,14 +22,22 @@
+- <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
++ <!--<exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
+ <env key="LANG" value="C"/>
+ <arg value="info"/>
+- <arg value="--xml"/>
++ <arg value="-xml"/>
+ <arg value="."/>
+ </exec>
+ <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
+- <delete file="REVISION"/>
++ <delete file="REVISION"/>-->
+ <property name="version.entry.commit.revision" value="UNKNOWN"/>
+ <property name="version.entry.commit.date" value="UNKNOWN"/>
- <!-- styles -->
- <copy todir="build/styles">
-- <fileset dir="styles" />
-+ <fileset dir="styles">
-+ <include name="standard/elemstyles.xml"/>
-+ </fileset>
- </copy>
+@@ -51,11 +35,12 @@
+ <copy file="README" todir="build"/>
+ <copy file="LICENSE" todir="build"/>
-+ <!-- revision -->
-+ <copy todir="build/">
-+ <fileset file="REVISION" />
-+ </copy>
++ <ant target="build" dir="i18n"/>
+
+ <!-- styles -->
+ <copy file="styles/standard/elemstyles.xml" todir="build/styles/standard"/>
+
<!-- create josm-custom.jar -->
- <delete file="dist/josm-custom.jar"/>
+- <delete file="dist/josm-custom.jar"/>
<jar destfile="dist/josm-custom.jar" basedir="build">
<manifest>
- <attribute name="Main-class" value="org.openstreetmap.josm.gui.MainApplication" />
-+ <attribute name="Class-Path" value="/usr/share/java/gettext-commons.jar /usr/share/java/metadata-extractor.jar" />
- </manifest>
- </jar>
+ <attribute name="Main-class" value="JOSM" />
+@@ -80,6 +65,7 @@
+ <target name="clean">
+ <delete dir="build" />
+ <delete dir="dist" />
++ <ant target="clean" dir="i18n"/>
</target>
+
+ </project>
+diff -urNad josm-0.0.0.20081222~/i18n/build.xml josm-0.0.0.20081222/i18n/build.xml
+--- josm-0.0.0.20081222~/i18n/build.xml 2008-12-22 23:14:17.000000000 +0100
++++ josm-0.0.0.20081222/i18n/build.xml 2008-12-22 23:15:43.000000000 +0100
+@@ -41,7 +41,7 @@
+ </exec>
+ </target>
+
+- <target name="build" depends="josm.pot">
++ <target name="build">
+ <copy file="i18n.properties" todir="build/org/openstreetmap/josm" />
+
+ <ant target="build-lang"><property name="language" value="cs"/></ant>
+@@ -55,29 +55,33 @@
+ <ant target="build-lang"><property name="language" value="sl"/></ant>
+ <ant target="build-lang"><property name="language" value="sv"/></ant>
+
+- <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
++ <!--<exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
+ <env key="LANG" value="C"/>
+ <arg value="info"/>
+- <arg value="--xml"/>
++ <arg value="-xml"/>
+ <arg value="po"/>
+ </exec>
+ <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
+- <delete file="REVISION"/>
++ <delete file="REVISION"/>-->
+
+- <jar destfile="${i18n.jar}" basedir="build">
++ <!--<jar destfile="${i18n.jar}" basedir="build">
+ <manifest>
+ <attribute name="Extension-Name" value="JOSM Translation into various languages" />
+ <attribute name="Translation-Version" value="${version.entry.commit.revision}"/>
+ <attribute name="Translation-Date" value="${version.entry.commit.date}"/>
+ </manifest>
+- </jar>
++ </jar>-->
++
++ <copy todir="../build">
++ <fileset dir="build"/>
++ </copy>
+
+ </target>
+
+ <target name="build-lang">
+- <exec executable="msgmerge">
++ <!--<exec executable="msgmerge">
+ <arg line="-U po/${language}.po po/josm.pot"/>
+- </exec>
++ </exec>-->
+
+ <exec executable="msgfmt">
+ <arg line="--verbose --java2 -dbuild -rorg.openstreetmap.josm.i18n.Translation -l${language} po/${language}.po"/>
Modified: packages/josm/trunk/debian/patches/20_bts.dpatch
===================================================================
--- packages/josm/trunk/debian/patches/20_bts.dpatch 2008-12-22 22:49:13 UTC (rev 1809)
+++ packages/josm/trunk/debian/patches/20_bts.dpatch 2008-12-22 23:01:21 UTC (rev 1810)
@@ -5,19 +5,19 @@
## DP: Pattern match debian version in about dialog.
@DPATCH@
-diff -urNad josm-0.0.0.20080518~/src/org/openstreetmap/josm/actions/AboutAction.java josm-0.0.0.20080518/src/org/openstreetmap/josm/actions/AboutAction.java
---- josm-0.0.0.20080518~/src/org/openstreetmap/josm/actions/AboutAction.java 2008-05-18 17:16:19.000000000 +0200
-+++ josm-0.0.0.20080518/src/org/openstreetmap/josm/actions/AboutAction.java 2008-05-18 17:18:35.000000000 +0200
-@@ -52,7 +52,7 @@
- static {
- revision = loadFile(Main.class.getResource("/REVISION"));
+diff -urNad josm-0.0.0.20081222~/src/org/openstreetmap/josm/actions/AboutAction.java josm-0.0.0.20081222/src/org/openstreetmap/josm/actions/AboutAction.java
+--- josm-0.0.0.20081222~/src/org/openstreetmap/josm/actions/AboutAction.java 2008-12-22 22:41:42.000000000 +0100
++++ josm-0.0.0.20081222/src/org/openstreetmap/josm/actions/AboutAction.java 2008-12-22 22:41:50.000000000 +0100
+@@ -67,7 +67,7 @@
+ }
+ revision = loadFile(u);
-- Pattern versionPattern = Pattern.compile(".*?Revision: ([0-9]*).*", Pattern.CASE_INSENSITIVE|Pattern.DOTALL);
-+ Pattern versionPattern = Pattern.compile(".*?Revision: ([[0-9].-]*).*", Pattern.CASE_INSENSITIVE|Pattern.DOTALL);
+- Pattern versionPattern = Pattern.compile(".*?(?:Revision|Main-Version): ([0-9]*(?: SVN)?).*", Pattern.CASE_INSENSITIVE|Pattern.DOTALL);
++ Pattern versionPattern = Pattern.compile(".*?(?:Revision|Main-Version): ([[0-9].-]*(?: SVN)?).*", Pattern.CASE_INSENSITIVE|Pattern.DOTALL);
Matcher match = versionPattern.matcher(revision.getText());
- version = match.matches() ? match.group(1) : "UNKNOWN";
+ version = match.matches() ? match.group(1) : tr("UNKNOWN");
-@@ -83,7 +83,7 @@
+@@ -125,7 +125,7 @@
info.add(new JLabel(tr("Homepage")), GBC.std().insets(0,0,10,0));
info.add(new UrlLabel("http://josm.openstreetmap.de"), GBC.eol().fill(GBC.HORIZONTAL));
info.add(new JLabel(tr("Bug Reports")), GBC.std().insets(0,0,10,0));
@@ -26,26 +26,29 @@
info.add(new JLabel(tr("News about JOSM")), GBC.std().insets(0,0,10,0));
info.add(new UrlLabel("http://www.opengeodata.org/?cat=17"), GBC.eol().fill(GBC.HORIZONTAL));
-diff -urNad josm-0.0.0.20080518~/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java josm-0.0.0.20080518/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java
---- josm-0.0.0.20080518~/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java 2008-05-18 17:16:19.000000000 +0200
-+++ josm-0.0.0.20080518/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java 2008-05-18 17:17:33.000000000 +0200
-@@ -84,8 +84,8 @@
+diff -urNad josm-0.0.0.20081222~/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java josm-0.0.0.20081222/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java
+--- josm-0.0.0.20081222~/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java 2008-12-22 22:41:42.000000000 +0100
++++ josm-0.0.0.20081222/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java 2008-12-22 22:42:28.000000000 +0100
+@@ -91,8 +91,8 @@
Object[] options = new String[]{tr("Do nothing"), tr("Report Bug")};
int answer = JOptionPane.showOptionDialog(Main.parent, tr("An unexpected exception occurred.\n\n" +
-- "This is always a coding error. If you are running the latest\n" +
+- "This is always a coding error. If you are running the latest\n" +
- "version of JOSM, please consider being kind and file a bug report."),
+ "Please consider being kind and file a bug report.\n" +
+ "See http://bugs.debian.org for a guide how to do this."),
tr("Unexpected Exception"), JOptionPane.YES_NO_OPTION, JOptionPane.ERROR_MESSAGE,
null, options, options[0]);
if (answer == 1) {
-@@ -117,7 +117,7 @@
+@@ -124,9 +124,9 @@
sb.append("\n"+stack.getBuffer().toString());
JPanel p = new JPanel(new GridBagLayout());
-- p.add(new JLabel(tr("Please report a ticket at http://josm.openstreetmap.de/newticket, including your steps to get to\n" +
-+ p.add(new JLabel(tr("Please report a bug against josm, including your steps to get to\n" +
- "the error and be sure to include the following information")), GBC.eol());
+- p.add(new JLabel(tr("<html>Please report a ticket at {0}<br>" +
++ p.add(new JLabel(tr("<html>Please report a bug against josm.<br>" +
+ "Include your steps to get to the error (as detailed as possible)!<br>" +
+- "Be sure to include the following information:</html>", "http://josm.openstreetmap.de/newticket")), GBC.eol());
++ "Be sure to include the following information:</html>")), GBC.eol());
try {
- Toolkit.getDefaultToolkit().getSystemClipboard().setContents(new StringSelection(sb.toString()), new ClipboardOwner(){
+ Toolkit.getDefaultToolkit().getSystemClipboard().setContents(new StringSelection(sb.toString()), new ClipboardOwner(){
+ public void lostOwnership(Clipboard clipboard, Transferable contents) {}
More information about the Pkg-grass-devel
mailing list