[Pkg-osm-commits] [SCM] jmapviewer branch, master, updated. upstream/1.0+dfsg1-42-g41d21f0

[Felix Natter]

The following commit has been merged in the master branch:
commit 64ae0c60ed2818a71f28f63c0b16d07985634a53
Author: Felix Natter <fnatter at gmx.net>
Date:   Sat Oct 12 09:46:54 2013 +0200

    import 1.02, remove patches that have been applied upstream

diff --git a/debian/changelog b/debian/changelog
index 8137b5c..69e7e0f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-jmapviewer (1.0+dfsg1-1) UNRELEASED; urgency=low
+jmapviewer (1.02+dfsg1-1) UNRELEASED; urgency=low
 
   * Initial release. (Closes: #649226)
 
- -- Andrew Harvey <andrew.harvey4 at gmail.com>  Fri, 15 Mar 2013 19:17:49 +1100
+ -- Felix Natter <fnatter at gmx.net>  Sat, 12 Oct 2013 09:37:49 +0200
diff --git a/debian/control b/debian/control
index fdd6b07..25681a7 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: utils
 Priority: extra
 Maintainer: Debian OpenStreetMap Team <pkg-osm-maint at lists.alioth.debian.org>
 Uploaders:
- Andrew Harvey <andrew.harvey4 at gmail.com>
+ Felix Natter <fnatter at gmx.net>
 Build-Depends:
  ant,
  debhelper (>= 9~),
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
deleted file mode 100644
index dd5a518..0000000
--- a/debian/patches/02-remove-svn-prop-from-create_run_jar.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-fix error in upstream build.xml: _${svnReleaseVersion} in Class-Path value
---- 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/04-javac-encoding.patch b/debian/patches/04-javac-encoding.patch
deleted file mode 100644
index 57fc46c..0000000
--- a/debian/patches/04-javac-encoding.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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 f5ebedd..32e8c24 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
 01-build_less.patch
-02-remove-svn-prop-from-create_run_jar.patch
 03-use-installed-library-in-demo.patch
-04-javac-encoding.patch
diff --git a/debian/rules b/debian/rules
index 0e2e4d5..aa6747a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,7 @@
 # DESTDIR := ../tarballs/jmapviewer-${VER}
 # DESTTGZ := ../tarballs/jmapviewer_${VER}.orig.tar.gz
 
-VER=1.0
+VER=1.02
 
 %:
 	dh $@

-- 
Java OpenStreetMap Tile Viewer