[Pkg-osm-commits] [SCM] josm branch, master, updated. debian/0.0.svn4666+dfsg1-1-1-gdb4288e

[David Paleino]

The following commit has been merged in the master branch:
commit db4288ec67e282044a2102d925f3ab30fe479ed0
Author: David Paleino <dapal at debian.org>
Date:   Fri Dec 23 19:42:14 2011 +0100

    Fix jar generation: don't include .po files

diff --git a/debian/changelog b/debian/changelog
index 9ec745f..34deac4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+josm (0.0.svn4666+dfsg1-2) UNRELEASED; urgency=low
+
+  * Fix jar generation: don't include .po files
+
+ -- David Paleino <dapal at debian.org>  Fri, 23 Dec 2011 19:41:52 +0100
+
 josm (0.0.svn4666+dfsg1-1) unstable; urgency=low
 
   * New upstream snapshot (Closes: #652645)
diff --git a/debian/patches/10-build.patch b/debian/patches/10-build.patch
index f55f2af..c68d1fb 100644
--- a/debian/patches/10-build.patch
+++ b/debian/patches/10-build.patch
@@ -7,9 +7,9 @@ Adjustements to the ant build.xml files, mainly to use system-provided
 JARs and not depend on Internet connection.
 
 ---
- build.xml      |   48 ++++++++++++++++++++++++------------------------
+ build.xml      |   46 ++++++++++++++++++++++------------------------
  i18n/build.xml |   33 ++++++++++++++++-----------------
- 2 files changed, 40 insertions(+), 41 deletions(-)
+ 2 files changed, 38 insertions(+), 41 deletions(-)
 
 --- josm.orig/build.xml
 +++ josm/build.xml
@@ -57,7 +57,7 @@ JARs and not depend on Internet connection.
          <tstamp>
              <format property="build.tstamp" pattern="yyyy-MM-dd HH:mm:ss"/>
          </tstamp>
-@@ -59,31 +60,31 @@
+@@ -59,31 +60,29 @@
  Revision: ${version.entry.commit.revision}
  Is-Local-Build: true
  Build-Date: ${build.tstamp}
@@ -80,8 +80,6 @@ JARs and not depend on Internet connection.
          <copy file="README" todir="build"/>
          <copy file="LICENSE" todir="build"/>
 +
-+		<ant target="dist" dir="i18n"/>
-+
          <!-- create josm-custom.jar -->
 -        <delete file="dist/josm-custom.jar"/>
 +        <propertyregex property="classpathprop" input="${classpathprop-colon}" global="true"
@@ -97,7 +95,7 @@ JARs and not depend on Internet connection.
              </manifest>
              <zipfileset dir="images" prefix="images"/>
              <zipfileset dir="data" prefix="data"/>
-@@ -109,30 +110,29 @@ Build-Date: ${build.tstamp}
+@@ -109,30 +108,29 @@ Build-Date: ${build.tstamp}
      </target>
      <target name="javacc">
          <mkdir dir="${mapcss.dir}/parsergen"/>
diff --git a/debian/patches/90-fix_version.patch b/debian/patches/90-fix_version.patch
index 91b5ad9..eb96c42 100644
--- a/debian/patches/90-fix_version.patch
+++ b/debian/patches/90-fix_version.patch
@@ -10,7 +10,7 @@ Forwarded: not-needed
 
 --- josm.orig/build.xml
 +++ josm/build.xml
-@@ -81,7 +81,7 @@ Debian-Release: ${debian.version}
+@@ -79,7 +79,7 @@ Debian-Release: ${debian.version}
              <!-- add attribute excludes="**/*BZip2*,**/*Bzip2*" to create a non-bzip2 supporting jar -->
              <manifest>
                  <attribute name="Main-class" value="JOSM"/>

-- 
Editor for OpenStreetMap