Author: gmascellani-guest
Date: 2009-04-01 15:04:37 +0000 (Wed, 01 Apr 2009)
New Revision: 2125
Modified:
packages/josm/trunk/debian/patches/10_build.dpatch
packages/josm/trunk/debian/patches/20_bts.dpatch
Log:
Patches updated for last tested revision
Modified: packages/josm/trunk/debian/patches/10_build.dpatch
===================================================================
--- packages/josm/trunk/debian/patches/10_build.dpatch 2009-04-01 15:04:22 UTC
(rev 2124)
+++ packages/josm/trunk/debian/patches/10_build.dpatch 2009-04-01 15:04:37 UTC
(rev 2125)
@@ -6,8 +6,8 @@
@DPATCH@
diff -urNad trunk~/build.xml trunk/build.xml
---- trunk~/build.xml 2008-12-16 09:38:35.000000000 +0100
-+++ trunk/build.xml 2009-02-15 18:28:50.000000000 +0100
+--- trunk~/build.xml 2009-03-16 13:35:20.000000000 +0100
++++ trunk/build.xml 2009-04-01 15:09:59.000000000 +0200
@@ -1,39 +1,22 @@
<project name="josm" default="dist" basedir=".">
@@ -77,7 +77,7 @@
</manifest>
</jar>
</target>
-@@ -70,6 +58,7 @@
+@@ -84,6 +72,7 @@
target="1.5" source="1.5" debug="on"
encoding="UTF-8">
<compilerarg value="-Xlint:deprecation"/>
</javac>
@@ -85,7 +85,7 @@
</target>
<target name="init">
-@@ -80,6 +69,7 @@
+@@ -94,6 +83,7 @@
<target name="clean">
<delete dir="build" />
<delete dir="dist" />
@@ -94,24 +94,27 @@
</project>
diff -urNad trunk~/i18n/build.xml trunk/i18n/build.xml
---- trunk~/i18n/build.xml 2009-02-08 22:44:59.000000000 +0100
-+++ trunk/i18n/build.xml 2009-02-15 18:33:34.000000000 +0100
-@@ -45,7 +45,13 @@
- </exec>
+--- trunk~/i18n/build.xml 2009-03-18 19:06:54.000000000 +0100
++++ trunk/i18n/build.xml 2009-04-01 15:19:52.000000000 +0200
+@@ -58,10 +58,14 @@
+ </gettext-extract>
</target>
-- <target name="build" depends="josm.pot">
+- <target name="build" depends="po/josm.pot,init.gettext">
+- <copy file="i18n.properties" todir="build/org/openstreetmap/josm" />
+ <target name="build.check">
+ <condition property="build.run">
+ <not><available file="build-timestamp"/></not>
+ </condition>
+ </target>
-+
+
+- <gettext-merge keysFile="josm.pot" poDirectory="po"/>
+ <target name="build" depends="build.check" if="build.run">
- <copy file="i18n.properties" todir="build/org/openstreetmap/josm" />
++ <copy file="i18n.properties" todir="build/org/openstreetmap/josm" />
- <ant target="build-lang"><property name="language" value="bg"/></ant>
-@@ -69,10 +75,13 @@
+ <!--<gettext-dist targetBundle="org.openstreetmap.josm.i18n.Translation"
+ poDirectory="po" outputDirectory="build"/>-->
+@@ -88,10 +92,13 @@
<ant target="build-lang"><property name="language" value="sv"/></ant>
<ant target="build-lang"><property name="language" value="tr"/></ant>
@@ -126,34 +129,24 @@
<arg value="po"/>
</exec>
<xmlproperty file="REVISION" prefix="version" keepRoot="false"
collapseAttributes="true"/>
-@@ -85,14 +94,23 @@
+@@ -104,6 +111,13 @@
<attribute name="Translation-Date"
value="${version.entry.commit.date}"/>
</manifest>
</jar>
-+ -->
-
- </target>
-
++ -->
++ </target>
++
+ <target name="dist" depends="build">
+ <copy todir="../build">
+ <fileset dir="build"/>
+ </copy>
-+ </target>
-+
- <target name="build-lang">
- <property name="jlanguage" value="${language}"/>
-+ <!--
- <exec executable="msgmerge">
- <arg line="-U po/${language}.po po/josm.pot"/>
- </exec>
-+ -->
+ </target>
- <exec executable="msgfmt">
- <arg line="--verbose --java2 -dbuild
-rorg.openstreetmap.josm.i18n.Translation -l${jlanguage} po/${language}.po"/>
-@@ -107,6 +125,7 @@
- <fileset dir="." includes="trans_*.java"/>
+ <target name="build-lang">
+@@ -119,6 +133,7 @@
+ <delete>
+ <fileset dir="po" includes="*.*~" defaultexcludes="false"/>
</delete>
- <delete file="java_sourcefiles.txt"/>
+ <delete file="build-timestamp"/>
</target>
Modified: packages/josm/trunk/debian/patches/20_bts.dpatch
===================================================================
--- packages/josm/trunk/debian/patches/20_bts.dpatch 2009-04-01 15:04:22 UTC
(rev 2124)
+++ packages/josm/trunk/debian/patches/20_bts.dpatch 2009-04-01 15:04:37 UTC
(rev 2125)
@@ -6,9 +6,9 @@
@DPATCH@
diff -urNad trunk~/src/org/openstreetmap/josm/actions/AboutAction.java
trunk/src/org/openstreetmap/josm/actions/AboutAction.java
---- trunk~/src/org/openstreetmap/josm/actions/AboutAction.java 2009-01-23
22:22:10.000000000 +0100
-+++ trunk/src/org/openstreetmap/josm/actions/AboutAction.java 2009-02-15
18:50:17.000000000 +0100
-@@ -47,6 +47,7 @@
+--- trunk~/src/org/openstreetmap/josm/actions/AboutAction.java 2009-03-13
09:19:31.000000000 +0100
++++ trunk/src/org/openstreetmap/josm/actions/AboutAction.java 2009-04-01
15:22:10.000000000 +0200
+@@ -48,6 +48,7 @@
public class AboutAction extends JosmAction {
private static final String version;
@@ -16,7 +16,7 @@
private final static JTextArea revision;
private static String time;
-@@ -67,6 +68,10 @@
+@@ -70,6 +71,10 @@
Matcher match = versionPattern.matcher(revision.getText());
version = match.matches() ? match.group(1) : tr("UNKNOWN");
@@ -27,7 +27,7 @@
Pattern timePattern = Pattern.compile(".*?(?:Last Changed
Date|Main-Date): ([^\n]*).*", Pattern.CASE_INSENSITIVE|Pattern.DOTALL);
match = timePattern.matcher(revision.getText());
time = match.matches() ? match.group(1) : tr("UNKNOWN");
-@@ -124,6 +129,8 @@
+@@ -133,6 +138,8 @@
info.add(GBC.glue(0,10), GBC.eol());
info.add(new JLabel(tr("Version {0}",version)),
GBC.eol().fill(GBC.HORIZONTAL).insets(10,0,0,0));
info.add(GBC.glue(0,5), GBC.eol());
@@ -36,19 +36,19 @@
info.add(new JLabel(tr("Last change at {0}",time)),
GBC.eol().fill(GBC.HORIZONTAL).insets(10,0,0,0));
info.add(GBC.glue(0,5), GBC.eol());
info.add(new JLabel(tr("Java Version
{0}",System.getProperty("java.version"))),
GBC.eol().fill(GBC.HORIZONTAL).insets(10,0,0,0));
-@@ -131,7 +138,7 @@
+@@ -140,7 +147,7 @@
info.add(new JLabel(tr("Homepage")), GBC.std().insets(10,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(10,0,10,0));
- info.add(new UrlLabel("http://josm.openstreetmap.de/newticket";),
GBC.eol().fill(GBC.HORIZONTAL));
-+ info.add(new UrlLabel("http://bugs.debian.org";),
GBC.eol().fill(GBC.HORIZONTAL));
- info.add(new JLabel(tr("News about JOSM")),
GBC.std().insets(10,0,10,0));
- info.add(new UrlLabel("http://www.opengeodata.org/?cat=17";),
GBC.eol().fill(GBC.HORIZONTAL));
++ info.add(new UrlLabel("http://bugs.debian.org";),
GBC.eol().fill(GBC.HORIZONTAL));
+ about.addTab(tr("Info"), info);
+ about.addTab(tr("Readme"), createScrollPane(readme));
diff -urNad
trunk~/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java
trunk/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java
---- trunk~/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java
2009-01-23 22:22:10.000000000 +0100
-+++ trunk/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java
2009-02-15 18:50:17.000000000 +0100
-@@ -58,8 +58,8 @@
+--- trunk~/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java
2009-02-16 15:14:34.000000000 +0100
++++ trunk/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java
2009-04-01 15:21:03.000000000 +0200
+@@ -49,8 +49,8 @@
Object[] options = new String[]{tr("Do nothing"), tr("Report
Bug")};
int answer = JOptionPane.showOptionDialog(Main.parent, tr("An
unexpected exception occurred.\n\n" +
@@ -59,7 +59,7 @@
tr("Unexpected Exception"), JOptionPane.YES_NO_OPTION,
JOptionPane.ERROR_MESSAGE,
null, options, options[0]);
if (answer == 1) {
-@@ -73,10 +73,10 @@
+@@ -64,10 +64,10 @@
text += "\n" + stack.getBuffer().toString();
JPanel p = new JPanel(new GridBagLayout());
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
