Author: gmascellani-guest
Date: 2008-12-23 12:22:44 +0000 (Tue, 23 Dec 2008)
New Revision: 1814
Modified:
packages/josm/trunk/debian/patches/10_build.dpatch
Log:
Adapt to upstream revision 1137 and add classpath to the jar
Modified: packages/josm/trunk/debian/patches/10_build.dpatch
===================================================================
--- packages/josm/trunk/debian/patches/10_build.dpatch 2008-12-23 12:21:15 UTC
(rev 1813)
+++ packages/josm/trunk/debian/patches/10_build.dpatch 2008-12-23 12:22:44 UTC
(rev 1814)
@@ -5,10 +5,10 @@
## DP: the dependencies into the target jar file.
@DPATCH@
-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 @@
+diff -urNad josm-0.0.svn1137~/build.xml josm-0.0.svn1137/build.xml
+--- josm-0.0.svn1137~/build.xml 2008-12-23 13:14:33.000000000 +0100
++++ josm-0.0.svn1137/build.xml 2008-12-23 13:15:06.000000000 +0100
+@@ -1,39 +1,25 @@
<project name="josm" default="dist" basedir=".">
- <!-- All jar files necessary to run only JOSM (no tests) -->
@@ -21,9 +21,9 @@
<path id="classpath">
- <fileset dir="lib">
- <include name="**/*.jar"/>
-+ <fileset dir="/usr/share/java">
-+ <include name="gettext-commons.jar"/>
-+ <include name="metadata-extractor.jar"/>
++ <fileset dir="/usr/share/java">
++ <include name="gettext-commons.jar"/>
++ <include name="metadata-extractor.jar"/>
</fileset>
</path>
@@ -32,14 +32,14 @@
- <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"/>
@@ -51,10 +51,12 @@
<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"/>
++ <property name="version.entry.commit.revision" value="UNKNOWN"/>
++ <property name="version.entry.commit.date" value="UNKNOWN"/>
-@@ -51,11 +35,12 @@
+ <!-- images -->
+ <copy todir="build/images">
+@@ -49,16 +35,18 @@
<copy file="README" todir="build"/>
<copy file="LICENSE" todir="build"/>
@@ -68,7 +70,13 @@
<jar destfile="dist/josm-custom.jar" basedir="build">
<manifest>
<attribute name="Main-class" value="JOSM" />
-@@ -80,6 +65,7 @@
+ <attribute name="Main-Version"
value="${version.entry.commit.revision} SVN"/>
+ <attribute name="Main-Date"
value="${version.entry.commit.date}"/>
++ <attribute name="Class-Path"
value="/usr/share/java/gettext-commons.jar
/usr/share/java/metadata-extractor.jar"/>
+ </manifest>
+ </jar>
+ </target>
+@@ -78,6 +66,7 @@
<target name="clean">
<delete dir="build" />
<delete dir="dist" />
@@ -76,9 +84,9 @@
</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
+diff -urNad josm-0.0.svn1137~/i18n/build.xml josm-0.0.svn1137/i18n/build.xml
+--- josm-0.0.svn1137~/i18n/build.xml 2008-12-23 13:14:33.000000000 +0100
++++ josm-0.0.svn1137/i18n/build.xml 2008-12-23 13:14:42.000000000 +0100
@@ -41,7 +41,7 @@
</exec>
</target>
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
