Author: gmascellani-guest Date: 2009-09-14 13:56:51 +0000 (Mon, 14 Sep 2009) New Revision: 2445
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: Patch updated for latest revision Modified: packages/josm/trunk/debian/patches/10_build.dpatch =================================================================== --- packages/josm/trunk/debian/patches/10_build.dpatch 2009-09-14 13:52:01 UTC (rev 2444) +++ packages/josm/trunk/debian/patches/10_build.dpatch 2009-09-14 13:56:51 UTC (rev 2445) @@ -1,18 +1,149 @@ #! /bin/sh /usr/share/dpatch/dpatch-run ## 10_build.dpatch by Andreas Putzo <andr...@putzo.net> ## -## DP: Adjustments to the ant build file, mainly to not include +## DP: Adjustments to the ant build file, mainly to not include ## DP: the dependencies into the target jar file. @DPATCH@ -diff -urNad josm-0.0.svn1981~/build.xml josm-0.0.svn1981/build.xml ---- josm-0.0.svn1981~/build.xml 2009-09-11 23:56:17.000000000 +0200 -+++ josm-0.0.svn1981/build.xml 2009-09-11 23:59:21.000000000 +0200 -@@ -68,6 +68,7 @@ - <compilerarg value="-Xlint:deprecation"/> - <compilerarg value="-Xlint:unchecked"/> - </javac> -+ <ant target="build" dir="i18n"/> - </target> +diff -urNad trunk~/build.xml trunk/build.xml +--- trunk~/build.xml 2009-08-09 22:43:59.000000000 +0200 ++++ trunk/build.xml 2009-09-14 15:42:24.000000000 +0200 +@@ -4,47 +4,40 @@ + <property name="build.dir" value="build"/> + + <!-- Java classpath addition (all jar files to compile tests with this) --> +- <path id="classpath"> +- <fileset dir="lib"> +- <include name="**/*.jar"/> ++ <path id="classpath"> ++ <fileset dir="/usr/share/java"> ++ <include name="gettext-commons.jar"/> ++ <include name="metadata-extractor.jar"/> + </fileset> + </path> + + <target name="dist" depends="compile"> +- +- <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false"> +- <env key="LANG" value="C"/> +- <arg value="info"/> +- <arg value="--xml"/> +- <arg value="."/> +- </exec> + <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/> +- <delete file="REVISION"/> + <property name="version.entry.commit.revision" value="UNKNOWN"/> + <property name="version.entry.commit.date" value="UNKNOWN"/> + + <copy file="CONTRIBUTION" todir="build"/> + <copy file="README" todir="build"/> +- <copy file="LICENSE" todir="build"/> ++ <copy file="LICENSE" todir="build"/> ++ ++ <ant target="dist" dir="i18n"/> + + <!-- styles --> +- <copy file="styles/standard/elemstyles.xml" todir="build/styles/standard"/> ++ <copy file="styles/standard/elemstyles.xml" todir="build/styles/standard"/> ++ ++ <property environment="env"/> + + <!-- create josm-custom.jar --> +- <delete file="dist/josm-custom.jar"/> + <jar destfile="dist/josm-custom.jar" basedir="build"> + <manifest> + <attribute name="Main-class" value="JOSM" /> + <attribute name="Main-Version" value="${version.entry.commit.revision} SVN"/> +- <attribute name="Main-Date" value="${version.entry.commit.date}"/> ++ <attribute name="Main-Date" value="${version.entry.commit.date}"/> ++ <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 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" /> + </jar> + </target> + +@@ -67,7 +60,8 @@ + target="1.5" source="1.5" debug="on" encoding="UTF-8"> + <compilerarg value="-Xlint:deprecation"/> + <compilerarg value="-Xlint:unchecked"/> +- </javac> ++ </javac> ++ <ant target="build" dir="i18n"/> + </target> + + <target name="init"> +@@ -77,7 +71,8 @@ + + <target name="clean"> + <delete dir="build" /> +- <delete dir="dist" /> ++ <delete dir="dist" /> ++ <ant target="clean" dir="i18n"/> + </target> + + <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-09-14 15:42:24.000000000 +0200 +@@ -58,10 +58,14 @@ + </gettext-extract> + </target> - <target name="init"> +- <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" /> + + <!--<gettext-dist targetBundle="org.openstreetmap.josm.i18n.Translation" + poDirectory="po" outputDirectory="build"/>--> +@@ -93,10 +97,13 @@ + <ant target="build-lang"><property name="language" value="tr"/></ant> + <ant target="build-lang"><property name="language" value="zh_TW"/></ant> + ++ <touch file="build-timestamp"/> ++ ++ <!-- + <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"/> +@@ -109,6 +116,13 @@ + <attribute name="Translation-Date" value="${version.entry.commit.date}"/> + </manifest> + </jar> ++ --> ++ </target> ++ ++ <target name="dist" depends="build"> ++ <copy todir="../build"> ++ <fileset dir="build"/> ++ </copy> + </target> + + <target name="build-lang"> +@@ -124,6 +138,7 @@ + <delete> + <fileset dir="po" includes="*.*~" defaultexcludes="false"/> + </delete> ++ <delete file="build-timestamp"/> + </target> + + </project> Modified: packages/josm/trunk/debian/patches/20_bts.dpatch =================================================================== --- packages/josm/trunk/debian/patches/20_bts.dpatch 2009-09-14 13:52:01 UTC (rev 2444) +++ packages/josm/trunk/debian/patches/20_bts.dpatch 2009-09-14 13:56:51 UTC (rev 2445) @@ -6,8 +6,8 @@ @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-07-09 10:53:33.000000000 +0200 -+++ trunk/src/org/openstreetmap/josm/actions/AboutAction.java 2009-07-17 14:23:15.000000000 +0200 +--- trunk~/src/org/openstreetmap/josm/actions/AboutAction.java 2009-08-02 14:36:40.000000000 +0200 ++++ trunk/src/org/openstreetmap/josm/actions/AboutAction.java 2009-09-14 15:42:51.000000000 +0200 @@ -49,6 +49,7 @@ public class AboutAction extends JosmAction { @@ -16,7 +16,7 @@ private final static JTextArea revision; private static String time; -@@ -71,6 +72,10 @@ +@@ -72,6 +73,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"); -@@ -134,6 +139,8 @@ +@@ -136,6 +141,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)); -@@ -141,7 +148,7 @@ +@@ -143,7 +150,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,30 +46,31 @@ 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-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 @@ +--- trunk~/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java 2009-08-02 18:54:11.000000000 +0200 ++++ trunk/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java 2009-09-14 15:49:59.000000000 +0200 +@@ -53,8 +53,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" + + int answer = OptionPaneUtil.showOptionDialog(Main.parent, tr("An unexpected exception occurred.\n\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]); + options, options[0]); if (answer == 1) { -@@ -63,10 +63,10 @@ +@@ -66,10 +66,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") + -- "<br>" + tr("Include your steps to get to the error (as detailed as possible)!") + -+ p.add(new JLabel("<html>" + tr("Please report a bug against josm.") + -+ "<br>" + tr("Include your steps to get to the error (as detailed as possible)!") + - "<br>" + tr("Try updating to the newest version of JOSM and all plugins before reporting a bug.") + -- "<br>" + tr("Be sure to include the following information:") + "</html>"), GBC.eol()); -+ "<br>" + tr("Be sure to include the following information:") + "</html>"), GBC.eol()); +- "<br>" + tr("Include your steps to get to the error (as detailed as possible)!") + +- "<br>" + tr("Try updating to the newest version of JOSM and all plugins before reporting a bug.") + +- "<br>" + tr("Be sure to include the following information:") + "</html>"), GBC.eol()); ++ p.add(new JLabel("<html>" + tr("Please report a bug against josm.") + ++ "<br>" + tr("Include your steps to get to the error (as detailed as possible)!") + ++ "<br>" + tr("Try updating to the newest version of JOSM and all plugins before reporting a bug.") + ++ "<br>" + tr("Be sure to include the following information:") + "</html>"), GBC.eol()); try { Toolkit.getDefaultToolkit().getSystemClipboard().setContents(new StringSelection(text), new ClipboardOwner(){ public void lostOwnership(Clipboard clipboard, Transferable contents) {} Modified: packages/josm/trunk/debian/patches/40_elemstyles.dpatch =================================================================== --- packages/josm/trunk/debian/patches/40_elemstyles.dpatch 2009-09-14 13:52:01 UTC (rev 2444) +++ packages/josm/trunk/debian/patches/40_elemstyles.dpatch 2009-09-14 13:56:51 UTC (rev 2445) @@ -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-17 14:23:27.000000000 +0200 ++++ trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java 2009-09-14 15:56:15.000000000 +0200 @@ -55,8 +55,10 @@ { LinkedList<String> f = new LinkedList<String>(iconDirs); _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel