[DebianGIS-dev] r2362 - packages/josm/trunk/debian/patches
gmascellani-guest at alioth.debian.org
gmascellani-guest at alioth.debian.org
Wed Jul 15 19:11:03 UTC 2009
Author: gmascellani-guest
Date: 2009-07-15 19:11:02 +0000 (Wed, 15 Jul 2009)
New Revision: 2362
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 update for new release (bugs still to fix are present)
Modified: packages/josm/trunk/debian/patches/10_build.dpatch
===================================================================
--- packages/josm/trunk/debian/patches/10_build.dpatch 2009-07-15 19:07:33 UTC (rev 2361)
+++ packages/josm/trunk/debian/patches/10_build.dpatch 2009-07-15 19:11:02 UTC (rev 2362)
@@ -6,96 +6,95 @@
@DPATCH@
diff -urNad trunk~/build.xml trunk/build.xml
---- 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=".">
-
-- <!-- All jar files necessary to run only JOSM (no tests) -->
-- <fileset id="josm_required_libs" dir="lib">
-- <include name="gettext-commons-0.9.2.jar"/>
-- <include name="metadata-extractor-2.3.1-nosun.jar"/>
-- </fileset>
--
- <!-- Java classpath addition (all jar files to compile tests with this) -->
- <path id="classpath">
-- <fileset dir="lib">
-- <include name="**/*.jar"/>
+--- 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 @@
+ <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">
-- <!-- jars -->
-- <unjar dest="build">
-- <fileset refid="josm_required_libs" />
-- </unjar>
--
-- <!-- translation -->
-- <unjar dest="build">
-- <fileset dir="lib">
-- <include name="josm-translation.jar" />
-- </fileset>
-- </unjar>
-
-- <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>
-+ </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"/>
-
-@@ -51,16 +34,21 @@
- <copy file="README" todir="build"/>
- <copy file="LICENSE" todir="build"/>
-
-+ <ant target="dist" dir="i18n"/>
++ <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"/>
+
- <!-- styles -->
- <copy file="styles/standard/elemstyles.xml" todir="build/styles/standard"/>
-
-+ <property environment="env"/>
++ <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"/>
+
- <!-- 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}"/>
++ <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>
- </jar>
- </target>
-@@ -84,6 +72,7 @@
- target="1.5" source="1.5" debug="on" encoding="UTF-8">
- <compilerarg value="-Xlint:deprecation"/>
- </javac>
-+ <ant target="build" dir="i18n"/>
- </target>
-
- <target name="init">
-@@ -94,6 +83,7 @@
- <target name="clean">
- <delete dir="build" />
- <delete dir="dist" />
-+ <ant target="clean" dir="i18n"/>
- </target>
-
- </project>
++ <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" />
++ <fileset dir="presets"/>
++ <fileset dir="images"/>
++ <fileset file="lib/josm-translation.jar" />
+ </jar>
+ </target>
+
+@@ -66,7 +60,8 @@
+ <javac srcdir="src" classpathref="classpath" destdir="build"
+ target="1.5" source="1.5" debug="on" encoding="UTF-8">
+ <compilerarg value="-Xlint:deprecation"/>
+- </javac>
++ </javac>
++ <ant target="build" dir="i18n"/>
+ </target>
+
+ <target name="init">
+@@ -76,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-03-18 19:06:54.000000000 +0100
-+++ trunk/i18n/build.xml 2009-04-01 15:19:52.000000000 +0200
+--- trunk~/i18n/build.xml 2009-07-09 10:54:34.000000000 +0200
++++ trunk/i18n/build.xml 2009-07-15 21:04:02.000000000 +0200
@@ -58,10 +58,14 @@
</gettext-extract>
</target>
@@ -114,9 +113,9 @@
<!--<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>
+@@ -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"/>
+
@@ -129,7 +128,7 @@
<arg value="po"/>
</exec>
<xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
-@@ -104,6 +111,13 @@
+@@ -109,6 +116,13 @@
<attribute name="Translation-Date" value="${version.entry.commit.date}"/>
</manifest>
</jar>
@@ -143,7 +142,7 @@
</target>
<target name="build-lang">
-@@ -119,6 +133,7 @@
+@@ -124,6 +138,7 @@
<delete>
<fileset dir="po" includes="*.*~" defaultexcludes="false"/>
</delete>
Modified: packages/josm/trunk/debian/patches/20_bts.dpatch
===================================================================
--- packages/josm/trunk/debian/patches/20_bts.dpatch 2009-07-15 19:07:33 UTC (rev 2361)
+++ packages/josm/trunk/debian/patches/20_bts.dpatch 2009-07-15 19:11:02 UTC (rev 2362)
@@ -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-03-13 09:19:31.000000000 +0100
-+++ trunk/src/org/openstreetmap/josm/actions/AboutAction.java 2009-04-01 15:22:10.000000000 +0200
+--- 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 @@
public class AboutAction extends JosmAction {
@@ -47,7 +47,7 @@
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-04-01 15:21:03.000000000 +0200
++++ trunk/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java 2009-07-11 15:38:55.000000000 +0200
@@ -49,8 +49,8 @@
Object[] options = new String[]{tr("Do nothing"), tr("Report Bug")};
Modified: packages/josm/trunk/debian/patches/40_elemstyles.dpatch
===================================================================
--- packages/josm/trunk/debian/patches/40_elemstyles.dpatch 2009-07-15 19:07:33 UTC (rev 2361)
+++ packages/josm/trunk/debian/patches/40_elemstyles.dpatch 2009-07-15 19:11:02 UTC (rev 2362)
@@ -7,18 +7,18 @@
@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-01-11 12:00:48.000000000 +0100
-+++ trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java 2009-02-15 18:49:21.000000000 +0100
-@@ -51,7 +51,11 @@
- String[] a = null;
+--- 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
+@@ -55,8 +55,10 @@
+ {
+ LinkedList<String> f = new LinkedList<String>(iconDirs);
+ /* don't prefix icon path, as it should be generic */
+- f.add("resource://images/styles/standard/");
+- f.add("resource://images/styles/");
++ f.add("/usr/share/icons/openstreetmap/classic.small");
++ f.add("/usr/share/icons/openstreetmap/square.small");
++ f.add("/usr/share/icons/openstreetmap/classic.big");
++ f.add("/usr/share/icons/openstreetmap/square.big");
+ iconDirs = f;
+ }
- /* don't prefix icon path, as it should be generic */
-- String internalicon = "resource://images/styles/standard/;resource://images/styles/";
-+ //String internalicon = "resource://images/styles/standard/;resource://images/styles/";
-+ String internalicon = "/usr/share/icons/openstreetmap/classic.small;";
-+ internalicon += "/usr/share/icons/openstreetmap/square.small;";
-+ internalicon += "/usr/share/icons/openstreetmap/classic.big;";
-+ internalicon += "/usr/share/icons/openstreetmap/square.big";
- String internalfile = "resource://styles/standard/elemstyles.xml";
-
- iconDirs = Main.pref.get("mappaint.icon.sources");
More information about the Pkg-grass-devel
mailing list