The following commit has been merged in the master branch:
commit 3c674acc1caa3f2158cfbbb36a518e8020d2264a
Author: David Paleino <da...@debian.org>
Date:   Sat Mar 6 19:51:30 2010 +0100

    10-build.patch refreshed to cleanly apply

diff --git a/debian/patches/10-build.patch b/debian/patches/10-build.patch
index 7a18b35..d22eea6 100644
--- a/debian/patches/10-build.patch
+++ b/debian/patches/10-build.patch
@@ -4,125 +4,116 @@ Subject: adjustments to the ant build file, mainly to not 
include
 Forwarded: no
 
 ---
- build.xml      |   51 ++++++++++++++++++++-------------------------------
+ build.xml      |   39 ++++++++++++++-------------------------
  i18n/build.xml |   23 +++++++++++++++++++----
- 2 files changed, 39 insertions(+), 35 deletions(-)
+ 2 files changed, 33 insertions(+), 29 deletions(-)
 
 --- josm.orig/build.xml
 +++ josm/build.xml
-@@ -21,9 +21,10 @@
-     </condition>
- 
-       <!-- 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>
- 
+@@ -22,8 +22,9 @@
+ 
+       <!-- Java classpath addition (all jar files to compile tests with this) 
-->
+       <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>
+       </path>
+ 
 @@ -42,14 +43,7 @@
-         -->     
-       <target name="create-revision">
-               <property name="revision.dir" value="${build.dir}"/>
--              <exec append="false" output="REVISION.XML" executable="svn" 
failifexecutionfails="false">
--                              <env key="LANG" value="C"/>
--                              <arg value="info"/>
--                              <arg value="--xml"/>
--                              <arg value="."/>
--              </exec>
--              <xmlproperty file="REVISION.XML" prefix="version" 
keepRoot="false" collapseAttributes="true"/>
--              <delete file="REVISION.XML" />
-+              <xmlproperty file="REVISION" prefix="version" keepRoot="false" 
collapseAttributes="true"/>
-               <tstamp>
-                     <format property="build.tstamp" pattern="yyyy-MM-dd 
HH:mm:ss"/>
-               </tstamp>
-@@ -60,51 +54,44 @@
- # automatically generated by JOSM build.xml - do not edit                     
- Revision: ${version.entry.commit.revision}
- Is-Local-Build: true
--Build-Date: ${build.tstamp}           
-+Build-Date: ${build.tstamp}
-+Debian-Release: ${debian.version}
- </echo>                                               
-       </target>
-               
- 
-       <target name="dist" depends="compile,create-revision">
--
--              <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"/>
-           <echo>Revision ${version.entry.commit.revision}</echo>
-               <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"/>
- 
-         <!-- css-->
--              <copy 
file="src/org/openstreetmap/josm/gui/help/help-browser.css" 
todir="build/org/openstreetmap/josm/gui/help"/>
-+              <copy 
file="src/org/openstreetmap/josm/gui/help/help-browser.css" 
todir="build/org/openstreetmap/josm/gui/help"/>
-+
-+              <property environment="env"/>
- 
-               <!-- create josm-custom.jar -->
--              <delete file="dist/josm-custom.jar"/>
-               <jar destfile="dist/josm-custom.jar" basedir="build" 
level="${clevel}">
-         <!-- add attribute excludes="**/*BZip2*,**/*Bzip2*" to create a 
non-bzip2 supporting jar -->
-                       <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 dir="data" prefix="data" />
--                      <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>
- 
-@@ -127,7 +114,8 @@ Build-Date: ${build.tstamp}
-                               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">
-@@ -137,7 +125,8 @@ Build-Date: ${build.tstamp}
- 
-       <target name="clean">
-               <delete dir="build" />
--              <delete dir="dist" />
-+              <delete dir="dist" />
-+              <ant target="clean" dir="i18n"/>
-       </target>
- 
-       <path id="test.classpath">
+         -->     
+       <target name="create-revision">
+               <property name="revision.dir" value="${build.dir}"/>
+-              <exec append="false" output="REVISION.XML" executable="svn" 
failifexecutionfails="false">
+-                              <env key="LANG" value="C"/>
+-                              <arg value="info"/>
+-                              <arg value="--xml"/>
+-                              <arg value="."/>
+-              </exec>
+-              <xmlproperty file="REVISION.XML" prefix="version" 
keepRoot="false" collapseAttributes="true"/>
+-              <delete file="REVISION.XML" />
++              <xmlproperty file="REVISION" prefix="version" keepRoot="false" 
collapseAttributes="true"/>
+               <tstamp>
+                     <format property="build.tstamp" pattern="yyyy-MM-dd 
HH:mm:ss"/>
+               </tstamp>
+@@ -60,21 +54,14 @@
+ # automatically generated by JOSM build.xml - do not edit                     
+ Revision: ${version.entry.commit.revision}
+ Is-Local-Build: true
+-Build-Date: ${build.tstamp}           
++Build-Date: ${build.tstamp}
++Debian-Release: ${debian.version}
+ </echo>                                               
+       </target>
+               
+ 
+       <target name="dist" depends="compile,create-revision">
+-
+-              <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"/>
+           <echo>Revision ${version.entry.commit.revision}</echo>
+@@ -82,29 +69,29 @@ Build-Date: ${build.tstamp}
+               <copy file="README" todir="build"/>
+               <copy file="LICENSE" todir="build"/>
+ 
++              <ant target="dist" dir="i18n"/>
++
+         <!-- styles -->
+               <copy file="styles/standard/elemstyles.xml" 
todir="build/styles/standard"/>
+ 
+         <!-- css-->
+               <copy 
file="src/org/openstreetmap/josm/gui/help/help-browser.css" 
todir="build/org/openstreetmap/josm/gui/help"/>
+ 
++              <property environment="env"/>
++
+               <!-- create josm-custom.jar -->
+-              <delete file="dist/josm-custom.jar"/>
+               <jar destfile="dist/josm-custom.jar" basedir="build" 
level="${clevel}">
+         <!-- add attribute excludes="**/*BZip2*,**/*Bzip2*" to create a 
non-bzip2 supporting jar -->
+                       <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="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="data" prefix="data" />
+-                      <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>
+ 
+@@ -128,6 +115,7 @@ Build-Date: ${build.tstamp}
+                       <compilerarg value="-Xlint:deprecation"/>
+                       <compilerarg value="-Xlint:unchecked"/>
+               </javac>
++              <ant target="build" dir="i18n"/>
+       </target>
+ 
+       <target name="init">
+@@ -138,6 +126,7 @@ Build-Date: ${build.tstamp}
+       <target name="clean">
+               <delete dir="build" />
+               <delete dir="dist" />
++              <ant target="clean" dir="i18n"/>
+       </target>
+ 
+       <path id="test.classpath">
 --- josm.orig/i18n/build.xml
 +++ josm/i18n/build.xml
 @@ -58,10 +58,14 @@

-- 
Java OpenStreetMap editor

_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel

Reply via email to