[josm] 11/28: Merge changes from stretch branch.
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Fri Oct 9 22:27:03 UTC 2015
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository josm.
commit cc23af1da19ea9d7cf66176df95b1244de758f1f
Merge: 5bff8f8 5d4e3ed
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Fri Oct 9 14:45:01 2015 +0200
Merge changes from stretch branch.
debian/changelog | 15 +++++++++++++++
debian/control | 2 +-
debian/patches/00-build.patch | 17 +++++++++--------
debian/patches/04-use_system_jmapviewer.patch | 2 +-
debian/patches/05-fix_version.patch | 2 +-
debian/patches/06-move_data_out_of_jar.patch | 2 +-
6 files changed, 28 insertions(+), 12 deletions(-)
diff --cc debian/changelog
index 7cb0942,e00a92d..6d40701
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,18 +1,30 @@@
+josm (0.0.svn8800+dfsg1-1) UNRELEASED; urgency=medium
+
+ * New tested snapshot.
+ (closes: #785416, #785417)
+ * Add dependencies for commons-logging.
+ * Update copyright file.
+ * Update patches, drop disabled patches, use groovy2 package.
+ * Bump minimum required jmapviewer version to 1.11.
+ * Drop xjc command for removed wms-cache.xsd.
+
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 09 Oct 2015 12:44:31 +0200
+
+ josm (0.0.svn8159+dfsg1-2) unstable; urgency=medium
+
+ * Patch REVISION file to add Build-Name property for identification of the
+ Debian build. (closes: #789161)
+ * Update Vcs-Browser URL to use HTTPS.
+
+ -- Bas Couwenberg <sebastic at debian.org> Mon, 31 Aug 2015 21:35:05 +0200
+
+ josm (0.0.svn8159+dfsg1-1) unstable; urgency=medium
+
+ * Update branch in gbp.conf and Vcs-Git URL.
+ * Move from experimental to unstable.
+
+ -- Bas Couwenberg <sebastic at debian.org> Mon, 01 Jun 2015 21:44:58 +0200
+
josm (0.0.svn8159+dfsg1-1~exp1) experimental; urgency=medium
* New tested snapshot.
diff --cc debian/control
index c02d650,a5b31d0..e758196
--- a/debian/control
+++ b/debian/control
@@@ -23,10 -21,10 +23,10 @@@ Build-Depends: debhelper (>= 9~)
liboauth-signpost-java (>= 1.2),
libsvgsalamander-java,
libterm-readkey-perl,
- jmapviewer (>= 1.07)
+ jmapviewer (>= 1.11)
Standards-Version: 3.9.6
- Vcs-Browser: http://anonscm.debian.org/cgit/pkg-grass/josm.git
+ Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/josm.git
-Vcs-Git: git://anonscm.debian.org/pkg-grass/josm.git -b stretch
+Vcs-Git: git://anonscm.debian.org/pkg-grass/josm.git
Homepage: http://josm.openstreetmap.de
Package: josm
diff --cc debian/patches/00-build.patch
index 550ad9b,c255eed..a6d2a82
--- a/debian/patches/00-build.patch
+++ b/debian/patches/00-build.patch
@@@ -57,7 -54,7 +57,7 @@@ JARs and not depend on Internet connect
<tstamp>
<format property="build.tstamp" pattern="yyyy-MM-dd HH:mm:ss"/>
</tstamp>
- @@ -91,6 +105,7 @@
-@@ -87,6 +100,8 @@
++@@ -91,6 +105,8 @@
Revision: ${version.entry.commit.revision}
Is-Local-Build: true
Build-Date: ${build.tstamp}
@@@ -65,7 -63,7 +66,7 @@@
</echo>
</target>
<!--
- @@ -110,7 +125,8 @@ Build-Date: ${build.tstamp}
-@@ -106,7 +121,8 @@ Build-Date: ${build.tstamp}
++@@ -110,7 +126,8 @@ Build-Date: ${build.tstamp}
<copy file="README" todir="build"/>
<copy file="LICENSE" todir="build"/>
<!-- create josm-custom.jar -->
@@@ -75,7 -73,7 +76,7 @@@
<jar destfile="dist/josm-custom.jar" basedir="build" level="${clevel}">
<!-- add attribute excludes="**/*BZip2*,**/*Bzip2*" to create a non-bzip2 supporting jar -->
<manifest>
- @@ -120,6 +136,8 @@ Build-Date: ${build.tstamp}
-@@ -116,6 +132,8 @@ Build-Date: ${build.tstamp}
++@@ -120,6 +137,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"/>
@@@ -84,7 -82,7 +85,7 @@@
</manifest>
<zipfileset dir="images" prefix="images"/>
<zipfileset dir="data" prefix="data"/>
- @@ -190,10 +208,7 @@ Build-Date: ${build.tstamp}
-@@ -186,10 +204,7 @@ Build-Date: ${build.tstamp}
++@@ -190,10 +209,7 @@ Build-Date: ${build.tstamp}
</target>
<target name="javacc" depends="init" unless="javacc.notRequired">
<mkdir dir="${mapcss.dir}/parsergen"/>
@@@ -96,52 -94,26 +97,52 @@@
<arg value="-DEBUG_PARSER=false"/>
<arg value="-DEBUG_TOKEN_MANAGER=false"/>
<arg value="-JDK_VERSION=1.7"/>
- @@ -204,31 +219,19 @@ Build-Date: ${build.tstamp}
-@@ -214,15 +229,10 @@ Build-Date: ${build.tstamp}
- </exec>
++@@ -204,31 +220,19 @@ Build-Date: ${build.tstamp}
</target>
- <target name="compile" depends="init,javacc,jaxb">
-- <!-- COTS -->
-- <javac srcdir="${src.dir}" includes="com/**,oauth/**,org/apache/commons/**,org/glassfish/**" nowarn="on"
-- excludes="org/apache/commons/compress/compressors/lzma/**,org/apache/commons/compress/compressors/xz/**,org/apache/commons/compress/compressors/CompressorStreamFactory.java,org/apache/commons/compress/compressors/deflate/**,org/apache/commons/compress/compressors/gzip/**,org/apache/commons/compress/compressors/lzw/**,org/apache/commons/compress/compressors/pack200/**,org/apache/commons/compress/compressors/snappy/**,org/apache/commons/compress/compressors/z/**"
-- destdir="build" target="1.7" source="1.7" debug="on" includeantruntime="false" createMissingPackageInfoClass="false" encoding="iso-8859-1">
-- <!-- get rid of "internal proprietary API" warning -->
-- <compilerarg value="-XDignore.symbol.file"/>
-- </javac>
+ <target name="compile" depends="init,javacc">
+ <!-- COTS -->
+- <javac srcdir="${src.dir}" includes="com/**,oauth/**,org/apache/commons/**,org/glassfish/**" nowarn="on" encoding="iso-8859-1"
++ <javac srcdir="${src.dir}" classpathref="classpath" includes="com/**,oauth/**,org/apache/commons/**,org/glassfish/**" nowarn="on" encoding="iso-8859-1"
+ destdir="build" target="1.7" source="1.7" debug="on" includeAntRuntime="false" createMissingPackageInfoClass="false">
+ <!-- get rid of "internal proprietary API" warning -->
+ <compilerarg value="-XDignore.symbol.file"/>
+- <exclude name="org/apache/commons/compress/compressors/lzma/**"/>
+- <exclude name="org/apache/commons/compress/compressors/xz/**"/>
+- <exclude name="org/apache/commons/compress/compressors/CompressorStreamFactory.java"/>
+- <exclude name="org/apache/commons/compress/compressors/deflate/**"/>
+- <exclude name="org/apache/commons/compress/compressors/gzip/**"/>
+- <exclude name="org/apache/commons/compress/compressors/lzw/**"/>
+- <exclude name="org/apache/commons/compress/compressors/pack200/**"/>
+- <exclude name="org/apache/commons/compress/compressors/snappy/**"/>
+- <exclude name="org/apache/commons/compress/compressors/z/**"/>
+ <exclude name="org/apache/commons/jcs/admin/**"/>
+ <exclude name="org/apache/commons/jcs/auxiliary/disk/jdbc/**"/>
+ <exclude name="org/apache/commons/jcs/auxiliary/remote/**"/>
+ <exclude name="org/apache/commons/jcs/utils/servlet/**"/>
+- <exclude name="org/apache/commons/logging/impl/AvalonLogger.java"/>
+- <exclude name="org/apache/commons/logging/impl/Jdk13LumberjackLogger.java"/>
+- <exclude name="org/apache/commons/logging/impl/Log4JLogger.java"/>
+- <exclude name="org/apache/commons/logging/impl/LogKitLogger.java"/>
+- <exclude name="org/apache/commons/logging/impl/ServletContextCleaner.java"/>
+ </javac>
+ <!-- I18N -->
+ <ant dir="i18n" />
- <!-- JMapViewer/JOSM -->
-- <javac srcdir="${src.dir}" excludes="com/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/Demo.java"
-+ <javac srcdir="${src.dir}" classpathref="classpath" excludes="com/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/Demo.java"
+ <!-- JMapViewer -->
+- <javac sourcepath="" srcdir="${src.dir}" excludes="com/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/Demo.java,org/openstreetmap/josm/**,JOSM.java,gnu/**"
++ <javac sourcepath="" srcdir="${src.dir}" classpathref="classpath" excludes="com/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/Demo.java,org/openstreetmap/josm/**,JOSM.java,gnu/**"
destdir="build" target="1.7" source="1.7" debug="on" includeantruntime="false" createMissingPackageInfoClass="false" encoding="UTF-8">
<compilerarg value="-Xlint:cast"/>
<compilerarg value="-Xlint:deprecation"/>
- @@ -245,7 +248,7 @@ Build-Date: ${build.tstamp}
-@@ -251,6 +261,7 @@ Build-Date: ${build.tstamp}
++@@ -245,7 +249,7 @@ Build-Date: ${build.tstamp}
+ <compilerarg value="-XDignore.symbol.file"/>
+ </javac>
+ <!-- JOSM -->
+- <javac sourcepath="" srcdir="${src.dir}" excludes="com/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/Demo.java"
++ <javac sourcepath="" srcdir="${src.dir}" classpathref="classpath" excludes="com/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/Demo.java"
+ destdir="build" target="1.7" source="1.7" debug="on" includeantruntime="false" createMissingPackageInfoClass="false" encoding="UTF-8">
+ <compilerarg value="-Xlint:cast"/>
+ <compilerarg value="-Xlint:deprecation"/>
- @@ -272,6 +275,7 @@ Build-Date: ${build.tstamp}
++@@ -272,6 +276,7 @@ Build-Date: ${build.tstamp}
</uptodate>
<mkdir dir="build"/>
<mkdir dir="dist"/>
@@@ -149,10 -121,10 +150,10 @@@
</target>
<target name="javadoc">
<javadoc destdir="javadoc"
- @@ -294,6 +298,7 @@ Build-Date: ${build.tstamp}
-@@ -272,6 +283,7 @@ Build-Date: ${build.tstamp}
- <delete dir="dist"/>
++@@ -294,6 +299,7 @@ Build-Date: ${build.tstamp}
<delete dir="${mapcss.dir}/parsergen"/>
- <delete dir="${imagerytypes.dir}"/>
+ <delete file="${src.dir}/org/w3/_2001/xmlschema/Adapter1.java"/>
+ <delete dir="${src.dir}/org/openstreetmap/josm/data/imagery/types"/>
+ <ant target="clean" dir="i18n"/>
</target>
<path id="test.classpath">
diff --cc debian/patches/04-use_system_jmapviewer.patch
index 1afd126,5880982..3d58ae2
--- a/debian/patches/04-use_system_jmapviewer.patch
+++ b/debian/patches/04-use_system_jmapviewer.patch
@@@ -10,7 -10,7 +10,7 @@@ Forwarded: n
--- a/build.xml
+++ b/build.xml
- @@ -142,7 +142,6 @@ Debian-Release: ${debian.version}
-@@ -138,7 +138,6 @@ Debian-Release: ${debian.version}
++@@ -143,7 +143,6 @@ Debian-Release: ${debian.version}
<zipfileset dir="images" prefix="images"/>
<zipfileset dir="data" prefix="data"/>
<zipfileset dir="styles" prefix="styles"/>
diff --cc debian/patches/05-fix_version.patch
index 8f1b425,94df90c..1f1a9d6
--- a/debian/patches/05-fix_version.patch
+++ b/debian/patches/05-fix_version.patch
@@@ -10,7 -10,7 +10,7 @@@ Forwarded: not-neede
--- a/build.xml
+++ b/build.xml
- @@ -131,7 +131,7 @@ Debian-Release: ${debian.version}
-@@ -127,7 +127,7 @@ Debian-Release: ${debian.version}
++@@ -132,7 +132,7 @@ Debian-Release: ${debian.version}
<!-- add attribute excludes="**/*BZip2*,**/*Bzip2*" to create a non-bzip2 supporting jar -->
<manifest>
<attribute name="Main-class" value="JOSM"/>
diff --cc debian/patches/06-move_data_out_of_jar.patch
index 620b36d,78f5b3c..dfa2c9f
--- a/debian/patches/06-move_data_out_of_jar.patch
+++ b/debian/patches/06-move_data_out_of_jar.patch
@@@ -61,7 -61,7 +61,7 @@@ Bug-Debian: http://bugs.debian.org/cgi-
}
--- a/build.xml
+++ b/build.xml
- @@ -139,9 +139,9 @@ Debian-Release: ${debian.version}
-@@ -135,9 +135,9 @@ Debian-Release: ${debian.version}
++@@ -140,9 +140,9 @@ Debian-Release: ${debian.version}
<attribute name="Debian-Release" value="${debian.version}"/>
<attribute name="Class-Path" value="${classpathprop}"/>
</manifest>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm.git
More information about the Pkg-grass-devel
mailing list