[DebianGIS-dev] r2371 - packages/josm/trunk/debian/patches
gmascellani-guest at alioth.debian.org
gmascellani-guest at alioth.debian.org
Fri Jul 17 12:29:51 UTC 2009
Author: gmascellani-guest
Date: 2009-07-17 12:29:50 +0000 (Fri, 17 Jul 2009)
New Revision: 2371
Modified:
packages/josm/trunk/debian/patches/10_build.dpatch
packages/josm/trunk/debian/patches/20_bts.dpatch
packages/josm/trunk/debian/patches/40_elemstyles.dpatch
Log:
Patches moved to latest upstream revision (problem fixed)
Modified: packages/josm/trunk/debian/patches/10_build.dpatch
===================================================================
--- packages/josm/trunk/debian/patches/10_build.dpatch 2009-07-16 13:01:23 UTC (rev 2370)
+++ packages/josm/trunk/debian/patches/10_build.dpatch 2009-07-17 12:29:50 UTC (rev 2371)
@@ -7,8 +7,8 @@
@DPATCH@
diff -urNad trunk~/build.xml trunk/build.xml
--- trunk~/build.xml 2009-07-08 22:06:58.000000000 +0200
-+++ trunk/build.xml 2009-07-15 21:04:28.000000000 +0200
-@@ -4,47 +4,41 @@
++++ trunk/build.xml 2009-07-17 14:22:54.000000000 +0200
+@@ -4,47 +4,40 @@
<property name="build.dir" value="build"/>
<!-- Java classpath addition (all jar files to compile tests with this) -->
@@ -59,20 +59,17 @@
+ <attribute name="Debian-Release" value="${debian.version}"/>
+ <attribute name="Class-Path" value="/usr/share/java/gettext-commons.jar /usr/share/java/metadata-extractor.jar"/>
</manifest>
-- <zipfileset dir="presets" prefix="presets" />
-- <zipfileset dir="images" prefix="images" />
+ <zipfileset dir="presets" prefix="presets" />
+ <zipfileset dir="images" prefix="images" />
- <zipfileset src="lib/josm-translation.jar" />
-
- <!-- All jar files necessary to run only JOSM (no tests) -->
- <zipfileset src="lib/gettext-commons-0.9.6.jar" />
- <zipfileset src="lib/metadata-extractor-2.3.1-nosun.jar" />
-+ <fileset dir="presets"/>
-+ <fileset dir="images"/>
-+ <fileset file="lib/josm-translation.jar" />
</jar>
</target>
-@@ -66,7 +60,8 @@
+@@ -66,7 +59,8 @@
<javac srcdir="src" classpathref="classpath" destdir="build"
target="1.5" source="1.5" debug="on" encoding="UTF-8">
<compilerarg value="-Xlint:deprecation"/>
@@ -82,7 +79,7 @@
</target>
<target name="init">
-@@ -76,7 +71,8 @@
+@@ -76,7 +70,8 @@
<target name="clean">
<delete dir="build" />
@@ -94,7 +91,7 @@
<path id="test.classpath">
diff -urNad trunk~/i18n/build.xml trunk/i18n/build.xml
--- trunk~/i18n/build.xml 2009-07-09 10:54:34.000000000 +0200
-+++ trunk/i18n/build.xml 2009-07-15 21:04:02.000000000 +0200
++++ trunk/i18n/build.xml 2009-07-17 14:22:41.000000000 +0200
@@ -58,10 +58,14 @@
</gettext-extract>
</target>
Modified: packages/josm/trunk/debian/patches/20_bts.dpatch
===================================================================
--- packages/josm/trunk/debian/patches/20_bts.dpatch 2009-07-16 13:01:23 UTC (rev 2370)
+++ packages/josm/trunk/debian/patches/20_bts.dpatch 2009-07-17 12:29:50 UTC (rev 2371)
@@ -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-05-18 19:47:22.000000000 +0200
-+++ trunk/src/org/openstreetmap/josm/actions/AboutAction.java 2009-07-11 15:38:55.000000000 +0200
-@@ -48,6 +48,7 @@
+--- trunk~/src/org/openstreetmap/josm/actions/AboutAction.java 2009-07-09 10:53:33.000000000 +0200
++++ trunk/src/org/openstreetmap/josm/actions/AboutAction.java 2009-07-17 14:23:15.000000000 +0200
+@@ -49,6 +49,7 @@
public class AboutAction extends JosmAction {
private static final String version;
@@ -16,7 +16,7 @@
private final static JTextArea revision;
private static String time;
-@@ -70,6 +71,10 @@
+@@ -71,6 +72,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");
-@@ -133,6 +138,8 @@
+@@ -134,6 +139,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,7 +36,7 @@
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));
-@@ -140,7 +147,7 @@
+@@ -141,7 +148,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));
@@ -46,9 +46,9 @@
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-02-16 15:14:34.000000000 +0100
-+++ trunk/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java 2009-07-11 15:38:55.000000000 +0200
-@@ -49,8 +49,8 @@
+--- trunk~/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java 2009-06-16 10:40:40.000000000 +0200
++++ trunk/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java 2009-07-17 14:23:15.000000000 +0200
+@@ -50,8 +50,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,8 +59,8 @@
tr("Unexpected Exception"), JOptionPane.YES_NO_OPTION, JOptionPane.ERROR_MESSAGE,
null, options, options[0]);
if (answer == 1) {
-@@ -64,10 +64,10 @@
- text += "\n" + stack.getBuffer().toString();
+@@ -63,10 +63,10 @@
+ + stack.getBuffer().toString();
JPanel p = new JPanel(new GridBagLayout());
- p.add(new JLabel("<html>" + tr("Please report a ticket at {0}","http://josm.openstreetmap.de/newticket") +
Modified: packages/josm/trunk/debian/patches/40_elemstyles.dpatch
===================================================================
--- packages/josm/trunk/debian/patches/40_elemstyles.dpatch 2009-07-16 13:01:23 UTC (rev 2370)
+++ packages/josm/trunk/debian/patches/40_elemstyles.dpatch 2009-07-17 12:29:50 UTC (rev 2371)
@@ -8,7 +8,7 @@
@DPATCH@
diff -urNad trunk~/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
--- trunk~/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java 2009-07-07 19:54:54.000000000 +0200
-+++ trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java 2009-07-15 19:30:06.000000000 +0200
++++ trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java 2009-07-17 14:23:27.000000000 +0200
@@ -55,8 +55,10 @@
{
LinkedList<String> f = new LinkedList<String>(iconDirs);
More information about the Pkg-grass-devel
mailing list