[Pkg-osm-commits] [SCM] jmapviewer branch, master, updated. upstream/0.0+svn29245+dfsg-27-gc4a178a

[Felix Natter]

The following commit has been merged in the master branch:
commit 1863e0d72d30dec5ec2a4728b2c950fc8e404bba
Author: Felix Natter <fnatter at gmx.net>
Date:   Thu Oct 3 12:11:05 2013 +0200

    fix patches for 1.0, fix javac encoding to fix build with LANG=C

diff --git a/debian/patches/01-build_less.patch b/debian/patches/01-build_less.patch
index c09776f..946860b 100644
--- a/debian/patches/01-build_less.patch
+++ b/debian/patches/01-build_less.patch
@@ -11,8 +11,8 @@ this Debian package.
  <?xml version="1.0" encoding="UTF-8" standalone="no"?>
  <project default="all" name="Compile and build java classes plus jar archives">
  
--	<target name="all" depends="clean,build,pack,create_run_jar,create_release_zip" />
-+	<target name="all" depends="clean,build,pack,create_run_jar" />
+-	<target name="all" depends="clean,build,svn_info,pack,create_run_jar,create_release_zip,create_source_release_zip" />
++	<target name="all" depends="clean,build,svn_info,pack,create_run_jar" />
  
  	<target name="clean">
- 		<delete>
+ 		<mkdir dir="bin" />
diff --git a/debian/patches/02-build_ensure_dir_exists.patch b/debian/patches/02-build_ensure_dir_exists.patch
deleted file mode 100644
index 2b1ab3f..0000000
--- a/debian/patches/02-build_ensure_dir_exists.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-From: Andrew Harvey <andrew.harvey4 at gmail.com>
-Subject: Adjustments to the ant build file
-Forwarded: not-needed
-Last-Update: 2011-11-19
-
-Adjustment to the ant build.xml file. Ensure bin directory is present.
---- a/build.xml
-+++ b/build.xml
-@@ -4,6 +4,7 @@
- 	<target name="all" depends="clean,build,pack,create_run_jar" />
- 
- 	<target name="clean">
-+		<mkdir dir="bin"/>
- 		<delete>
- 			<fileset dir="bin">
- 				<include name="**" />
diff --git a/debian/patches/02-remove-svn-prop-from-create_run_jar.patch b/debian/patches/02-remove-svn-prop-from-create_run_jar.patch
new file mode 100644
index 0000000..aa9fa51
--- /dev/null
+++ b/debian/patches/02-remove-svn-prop-from-create_run_jar.patch
@@ -0,0 +1,11 @@
+--- a/build.xml
++++ b/build.xml
+@@ -50,7 +50,7 @@
+ 		<jar destfile="JMapViewer_Demo.jar" filesetmanifest="mergewithoutmain">
+ 			<manifest>
+ 				<attribute name="Main-Class" value="org.openstreetmap.gui.jmapviewer.Demo" />
+-				<attribute name="Class-Path" value="JMapViewer_${svnReleaseVersion}.jar" />
++				<attribute name="Class-Path" value="JMapViewer.jar" />
+ 			</manifest>
+ 		</jar>
+ 	</target>
diff --git a/debian/patches/03-use-installed-library-in-demo.patch b/debian/patches/03-use-installed-library-in-demo.patch
index 4f13686..62c24a9 100644
--- a/debian/patches/03-use-installed-library-in-demo.patch
+++ b/debian/patches/03-use-installed-library-in-demo.patch
@@ -5,9 +5,9 @@ Last-Update: 2013-03-15
 
 Adjustment to the ant build.xml file. Using the system wide jmapviewer.jar
 library for the JMapViewer_Demo application.
---- jmapviewer.orig/build.xml
-+++ jmapviewer/build.xml
-@@ -42,7 +42,7 @@
+--- a/build.xml
++++ b/build.xml
+@@ -50,7 +50,7 @@
  		<jar destfile="JMapViewer_Demo.jar" filesetmanifest="mergewithoutmain">
  			<manifest>
  				<attribute name="Main-Class" value="org.openstreetmap.gui.jmapviewer.Demo" />
diff --git a/debian/patches/04-javac-encoding.patch b/debian/patches/04-javac-encoding.patch
new file mode 100644
index 0000000..57fc46c
--- /dev/null
+++ b/debian/patches/04-javac-encoding.patch
@@ -0,0 +1,12 @@
+set the encoding for the source files in order to allow building with LANG=C
+--- a/build.xml
++++ b/build.xml
+@@ -14,7 +14,7 @@
+ 	</target>
+ 
+ 	<target name="build">
+-		<javac srcdir="src" destdir="bin" source="1.6" target="1.6" debug="true" includeantruntime="false">
++		<javac srcdir="src" destdir="bin" source="1.6" target="1.6" debug="true" includeantruntime="false" encoding="UTF-8">
+ 			<include name="org/openstreetmap/gui/jmapviewer/**" />
+ 		</javac>
+ 
diff --git a/debian/patches/series b/debian/patches/series
index e7f8f3e..f5ebedd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 01-build_less.patch
-02-build_ensure_dir_exists.patch
+02-remove-svn-prop-from-create_run_jar.patch
 03-use-installed-library-in-demo.patch
+04-javac-encoding.patch

-- 
Java OpenStreetMap Tile Viewer