The following commit has been merged in the master branch:
commit 8934bd580343c4880f60cae5283b281c22b6bb83
Author: David Paleino <da...@debian.org>
Date: Wed Mar 5 20:43:54 2014 +0100
Finalize embedded-code removal
diff --git a/debian/changelog b/debian/changelog
index 87ba4c9..a371e80 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,9 +2,12 @@ josm (0.0.svn6502+dfsg2-1) UNRELEASED; urgency=medium
* New DFSG tarball
- removed embedded code copy of jmapviewer (Closes: #731029)
+ * Added 04-use_system_jmapviewer.patch to avoid embedding parts of
+ jmapviewer in the final JOSM JAR
+ * Removed references to embedded jmapviewer in debian/copyright
* De-fuzzed 00-build.patch
- -- David Paleino <da...@debian.org> Wed, 05 Mar 2014 20:42:35 +0100
+ -- David Paleino <da...@debian.org> Wed, 05 Mar 2014 20:43:19 +0100
josm (0.0.svn6502+dfsg1-1) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index d647a64..f447768 100644
--- a/debian/control
+++ b/debian/control
@@ -20,6 +20,7 @@ Build-Depends:
, liboauth-signpost-java (>= 1.2)
, libsvgsalamander-java
, libterm-readkey-perl
+ , jmapviewer
Standards-Version: 3.9.4
Homepage: http://josm.openstreetmap.de
Vcs-Git: git://anonscm.debian.org/pkg-osm/josm.git
@@ -36,6 +37,7 @@ Depends:
, libsvgsalamander-java
, openstreetmap-map-icons-classic
, ant
+ , jmapviewer
, ${misc:Depends}
Recommends: josm-plugins
, josm-l10n
diff --git a/debian/copyright b/debian/copyright
index 3b38562..6c11879 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -27,11 +27,6 @@ Copyright: © 1987-1997, Free Software Foundation, Inc.
© 1998, Aaron M. Renn <ar...@urbanophile.com>
License: LGPL-2.1+
-Files: src/org/openstreetmap/gui/jmapviewer/Coordinate.java
- src/org/openstreetmap/gui/jmapviewer/interfaces/MapRectangle.java
-Copyright: © 2009, Stefan Zeller
-License: GPL-3+
-
Files: src/org/openstreetmap/josm/io/MultiPartFormOutputStream.java
Copyright: © 1994-2007, Sun Microsystems, Inc.
License: other
@@ -137,8 +132,7 @@ License: PD
up with any other open source license - just use it. You can rename
the files, move the Java packages, whatever you want.
-Files: src/org/openstreetmap/gui/jmapviewer/OsmMercator.java
- src/org/openstreetmap/josm/gui/download/OsmMapControl.java
+Files: src/org/openstreetmap/josm/gui/download/OsmMapControl.java
src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java
src/org/openstreetmap/josm/gui/download/SizeButton.java
Copyright: © 2007, Tim Haussmann
diff --git a/debian/patches/00-build.patch b/debian/patches/00-build.patch
index 57d1bb4..b497089 100644
--- a/debian/patches/00-build.patch
+++ b/debian/patches/00-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 | 44 ++++++++++++++++++++------------------------
+ build.xml | 45 +++++++++++++++++++++------------------------
i18n/build.xml | 33 ++++++++++++++++-----------------
- 2 files changed, 36 insertions(+), 41 deletions(-)
+ 2 files changed, 37 insertions(+), 41 deletions(-)
--- josm.orig/build.xml
+++ josm/build.xml
@@ -21,7 +21,7 @@ JARs and not depend on Internet connection.
<!-- build parameter: compression level (ant -Dclevel=N)
N ranges from 0 (no compression) to 9 (maximum compression)
default: 9 -->
-@@ -22,10 +23,16 @@
+@@ -22,10 +23,17 @@
</condition>
<!-- Java classpath addition (all jar files to compile tests with this)
-->
<path id="classpath">
@@ -34,13 +34,14 @@ JARs and not depend on Internet connection.
+ <include name="signpost-core.jar"/>
+ <include name="ant.jar"/>
+ <include name="commons-codec.jar"/>
++ <include name="jmapviewer.jar"/>
</fileset>
</path>
+ <property name="classpathprop-colon" refid="classpath"/>
<!--
** Used by Eclipse ant builder for updating
-@@ -40,14 +47,7 @@
+@@ -40,14 +48,7 @@
-->
<target name="create-revision">
<property name="revision.dir" value="${build.dir}"/>
@@ -56,7 +57,7 @@ JARs and not depend on Internet connection.
<tstamp>
<format property="build.tstamp" pattern="yyyy-MM-dd HH:mm:ss"/>
</tstamp>
-@@ -59,6 +59,7 @@
+@@ -59,6 +60,7 @@
Revision: ${version.entry.commit.revision}
Is-Local-Build: true
Build-Date: ${build.tstamp}
@@ -64,7 +65,7 @@ JARs and not depend on Internet connection.
</echo>
</target>
<target name="check-schemas">
-@@ -70,14 +71,7 @@ Build-Date: ${build.tstamp}
+@@ -70,14 +72,7 @@ Build-Date: ${build.tstamp}
</schemavalidate>
</target>
<target name="dist" depends="compile,create-revision,check-schemas">
@@ -79,7 +80,7 @@ JARs and not depend on Internet connection.
<property name="version.entry.commit.revision" value="UNKNOWN"/>
<property name="version.entry.commit.date" value="UNKNOWN"/>
<echo>Revision ${version.entry.commit.revision}</echo>
-@@ -85,7 +79,8 @@ Build-Date: ${build.tstamp}
+@@ -85,7 +80,8 @@ Build-Date: ${build.tstamp}
<copy file="README" todir="build"/>
<copy file="LICENSE" todir="build"/>
<!-- create josm-custom.jar -->
@@ -89,7 +90,7 @@ JARs and not depend on Internet connection.
<jar destfile="dist/josm-custom.jar" basedir="build"
level="${clevel}">
<!-- add attribute excludes="**/*BZip2*,**/*Bzip2*" to create a
non-bzip2 supporting jar -->
<manifest>
-@@ -95,6 +90,8 @@ Build-Date: ${build.tstamp}
+@@ -95,6 +91,8 @@ Build-Date: ${build.tstamp}
<attribute name="Permissions" value="all-permissions"/>
<attribute name="Codebase" value="josm.openstreetmap.de"/>
<attribute name="Application-Name" value="JOSM - Java
OpenStreetMap Editor"/>
@@ -98,7 +99,7 @@ JARs and not depend on Internet connection.
</manifest>
<zipfileset dir="images" prefix="images"/>
<zipfileset dir="data" prefix="data"/>
-@@ -168,10 +165,7 @@ Build-Date: ${build.tstamp}
+@@ -168,10 +166,7 @@ Build-Date: ${build.tstamp}
</target>
<target name="javacc" depends="init" unless="javacc.notRequired">
<mkdir dir="${mapcss.dir}/parsergen"/>
@@ -110,7 +111,7 @@ JARs and not depend on Internet connection.
<arg value="-JDK_VERSION=1.6"/>
<arg value="-GRAMMAR_ENCODING=UTF-8"/>
<arg value="-UNICODE_INPUT"/>
-@@ -180,11 +174,11 @@ Build-Date: ${build.tstamp}
+@@ -180,11 +175,11 @@ Build-Date: ${build.tstamp}
</exec>
</target>
<target name="compile" depends="init,javacc">
@@ -124,7 +125,7 @@ JARs and not depend on Internet connection.
</target>
<target name="init">
<uptodate property="javacc.notRequired"
targetfile="${mapcss.dir}/parsergen/MapCSSParser.java" >
-@@ -192,6 +186,7 @@ Build-Date: ${build.tstamp}
+@@ -192,6 +187,7 @@ Build-Date: ${build.tstamp}
</uptodate>
<mkdir dir="build"/>
<mkdir dir="dist"/>
@@ -132,7 +133,7 @@ JARs and not depend on Internet connection.
</target>
<target name="javadoc">
<javadoc destdir="javadoc"
-@@ -211,6 +206,7 @@ Build-Date: ${build.tstamp}
+@@ -211,6 +207,7 @@ Build-Date: ${build.tstamp}
<delete dir="build"/>
<delete dir="dist"/>
<delete dir="${mapcss.dir}/parsergen"/>
diff --git a/debian/patches/04-use_system_jmapviewer.patch
b/debian/patches/04-use_system_jmapviewer.patch
new file mode 100644
index 0000000..bfa0935
--- /dev/null
+++ b/debian/patches/04-use_system_jmapviewer.patch
@@ -0,0 +1,20 @@
+From: David Paleino <da...@debian.org>
+Subject: don't embed parts of jmapviewer in final josm JAR
+Origin: vendor
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=731029
+Forwarded: no
+
+---
+ build.xml | 1 -
+ 1 file changed, 1 deletion(-)
+
+--- josm.orig/build.xml
++++ josm/build.xml
+@@ -97,7 +97,6 @@ Debian-Release: ${debian.version}
+ <zipfileset dir="images" prefix="images"/>
+ <zipfileset dir="data" prefix="data"/>
+ <zipfileset dir="styles" prefix="styles"/>
+- <zipfileset dir="src/org/openstreetmap/gui/jmapviewer/images"
prefix="org/openstreetmap/gui/jmapviewer/images"/>
+ <!-- All jar files necessary to run only JOSM (no tests) -->
+ <!-- <zipfileset src="lib/metadata-extractor-2.3.1-nosun.jar"/>
-->
+ <!-- <zipfileset src="lib/signpost-core-1.2.1.1.jar"/> -->
diff --git a/debian/patches/06-move_data_out_of_jar.patch
b/debian/patches/06-move_data_out_of_jar.patch
index 5d2dfbf..dc6cc12 100644
--- a/debian/patches/06-move_data_out_of_jar.patch
+++ b/debian/patches/06-move_data_out_of_jar.patch
@@ -23,9 +23,9 @@ Bug-Debian:
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=698608
+ <!-- <zipfileset dir="images" prefix="images"/> -->
+ <!-- <zipfileset dir="data" prefix="data"/> -->
+ <!-- <zipfileset dir="styles" prefix="styles"/> -->
- <zipfileset dir="src/org/openstreetmap/gui/jmapviewer/images"
prefix="org/openstreetmap/gui/jmapviewer/images"/>
<!-- All jar files necessary to run only JOSM (no tests) -->
<!-- <zipfileset src="lib/metadata-extractor-2.3.1-nosun.jar"/>
-->
+ <!-- <zipfileset src="lib/signpost-core-1.2.1.1.jar"/> -->
--- josm.orig/src/org/openstreetmap/josm/tools/I18n.java
+++ josm/src/org/openstreetmap/josm/tools/I18n.java
@@ -7,6 +7,7 @@ import java.io.FileInputStream;
diff --git a/debian/patches/series b/debian/patches/series
index 061cbaa..59364ac 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,6 +2,7 @@
01-bts.patch
02-elemstyles.patch
03-default_look_and_feel.patch
+04-use_system_jmapviewer.patch
05-fix_version.patch
#100-fix_SlippyMapBBoxChooser.patch
06-move_data_out_of_jar.patch
diff --git a/debian/rules b/debian/rules
index 9c25b3b..01a7e04 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
#!/usr/bin/make -f
export JAVA_HOME=/usr/lib/jvm/default-java
-export
CLASSPATH=/usr/share/java/gettext-commons.jar:/usr/share/java/metadata-extractor.jar:/usr/share/java/signpost-core.jar
+export
CLASSPATH=/usr/share/java/gettext-commons.jar:/usr/share/java/metadata-extractor.jar:/usr/share/java/signpost-core.jar:/usr/share/java/jmapviewer.jar
SVNREPO := http://josm.openstreetmap.de/svn/trunk
SVNI18NREPO := http://svn.openstreetmap.org/applications/editors/josm/i18n/
@@ -13,7 +13,7 @@ else
VERSION := 0.0.0.${DATE}
endif
DESTDIR := ../tarballs/josm-${VERSION}
-DESTTGZ := ../tarballs/josm_${VERSION}+dfsg1.orig.tar.gz
+DESTTGZ := ../tarballs/josm_${VERSION}+dfsg2.orig.tar.gz
DEB_VERSION := $(shell dpkg-parsechangelog | grep ^Version | cut -d\ -f2)
DEB_UPSTREAM_VERSION := $(shell echo $(DEB_VERSION) | cut -d- -f1)
@@ -79,6 +79,8 @@ get-orig-source:
@echo Removing non-free or autogenerated data
rm -fr ${DESTDIR}/data/*.lang
rm -fr ${DESTDIR}/src/org/openstreetmap/josm/data/imagery/types/*
+ @echo Removing embedded code copy of jmapviewer
+ rm -fr ${DESTDIR}/src/org/openstreetmap/gui/jmapviewer/
@echo Building snapshot tarball
tar czf ${DESTTGZ} -C `dirname ${DESTDIR}` `basename ${DESTDIR}`
@echo Cleaning up
--
Editor for OpenStreetMap
_______________________________________________
Pkg-osm-commits mailing list
Pkg-osm-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-osm-commits
