This is an automated email from the git hooks/post-receive script. tille pushed a commit to branch master in repository mkgmap.
commit 11e13c293f053a97ebcb29589ccde53505034edb Author: Andreas Tille <ti...@debian.org> Date: Fri Jan 24 15:51:05 2014 +0100 Do not attempt a proper SVN migration - simply inject the latest status of SVN since the SVN commits are old enough that they might become not very informative these days --- debian/ant.properties | 2 ++ debian/changelog | 42 +++++++++++++++++++++++++++++++++++++++++ debian/compat | 1 + debian/control | 26 +++++++++++++++++++++++++ debian/copyright | 43 ++++++++++++++++++++++++++++++++++++++++++ debian/dirs | 1 + debian/docs | 8 ++++++++ debian/install | 2 ++ debian/manpages | 1 + debian/patches/build_xml.patch | 41 ++++++++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + debian/rules | 13 +++++++++++++ debian/scripts/mkgmap | 23 ++++++++++++++++++++++ debian/source/format | 1 + debian/watch | 3 +++ 15 files changed, 208 insertions(+) diff --git a/debian/ant.properties b/debian/ant.properties new file mode 100644 index 0000000..7385c7f --- /dev/null +++ b/debian/ant.properties @@ -0,0 +1,2 @@ +ant.build.javac.source=1.5 +ant.build.javac.target=1.5 diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..8cb8abc --- /dev/null +++ b/debian/changelog @@ -0,0 +1,42 @@ +mkgmap (0.0.0+svn2640-1) UNRELEASED; urgency=low + + * NOT FINISHED! https://github.com/osmandapp/OsmAnd-tools/blob/master/OsmAndMapCreator/src/crosby/binary/Osmformat.java needs to be packaged first + * Team upload. + * New upstream version + Closes: #580170 + * debian/source/format: 3.0 (quilt) + * debian/control: + - Standards-Version: 3.9.4 + - Removed DM-Upload-Allowed + - Update (Build-)Depends to recent Java standard + - debhelper 9 + - Add time to Build-Depends which is obviously needed + - Add Build-Depends libfastutil-java as needed by new upstream version + * debian/rules: dh $@ --with javahelper + + -- Andreas Tille <ti...@debian.org> Wed, 05 Jun 2013 11:24:59 +0200 + +mkgmap (0.0.0+svn1067-1) unstable; urgency=low + + [ Andreas Putzo ] + * New upstream snapshot. + * Added ${misc:Depends} among dependencies to fix a lintian warning. + * Bumped debhelper compatibility level to 7. + * Updated long description. + * Updated Homepage in debian/control, debian/copyright, debian/watch. + * Added numerous files from /doc to debian/docs. + * Mentioned Bernhard Heibler in debian/copyright and updated copyright + year of software and packaging. + * Bumped policy to 3.8.2, without changes. + * Added DM-Upload-Allowed to debian/control. + + [ Francesco Paolo Lovergine ] + * Added me as Uploader to avoid possible inappropriate NMU notices. + + -- Francesco Paolo Lovergine <fran...@debian.org> Thu, 16 Jul 2009 11:10:16 +0200 + +mkgmap (0.0.0+svn630-1) unstable; urgency=low + + * Initial release (Closes: #475773) + + -- Andreas Putzo <andr...@putzo.net> Mon, 14 Jul 2008 13:38:36 +0000 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..ec63514 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..9592303 --- /dev/null +++ b/debian/control @@ -0,0 +1,26 @@ +Source: mkgmap +Section: utils +Priority: extra +Maintainer: Debian GIS Project <pkg-grass-devel@lists.alioth.debian.org> +Uploaders: Andreas Putzo <andr...@putzo.net>, + Francesco Paolo Lovergine <fran...@debian.org> +Build-Depends: debhelper (>= 9), + javahelper (>=0.25), + ant, + default-jdk, + time, + libfastutil-java +Standards-Version: 3.9.4 +Homepage: http://www.mkgmap.org.uk +Vcs-Browser: http://svn.debian.org/viewsvn/pkg-grass/packages/mkgmap/trunk +Vcs-Svn: svn://svn.debian.org/svn/pkg-grass/packages/mkgmap/trunk + +Package: mkgmap +Architecture: all +Depends: ${misc:Depends}, + ${java:Depends}, + default-jre | java6-runtime +Suggests: josm, qlandkarte +Description: Generate Garmin maps from OpenStreetMap data + This program converts OpenStreetMap data into a map that + can be loaded onto compatible Garmin GPS units. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..e48f54b --- /dev/null +++ b/debian/copyright @@ -0,0 +1,43 @@ +This package was debianized by Andreas Putzo <andr...@putzo.net> on +Sun, 13 Apr 2008 19:29:58 +0000. + +It was downloaded from http://www.mkgmap.org.uk/snapshots/ + +Upstream Author: + + Steve Ratcliffe <s...@parabola.me.uk> + +Copyright: + + Copyright (C) 2007-2009 Steve Ratcliffe <s...@parabola.me.uk> + +License: + + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License version 2 as + published by the Free Software Foundation. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL-2'. + + +The files: + src/uk/me/parabola/mkgmap/general/MapPointMultimap.java, + src/uk/me/parabola/mkgmap/general/MapPointFastFindMap.java, + src/uk/me/parabola/mkgmap/build/LocatorConfig.java, + src/uk/me/parabola/mkgmap/build/Locator.java, +are Copyright (C) 2009 Bernhard Heibler and +are licensed under the GPL version 2, see above. + + +The Debian packaging is (C) 2008,2009, Andreas Putzo <andr...@putzo.net> and +is licensed under the GPL version 2, see above. diff --git a/debian/dirs b/debian/dirs new file mode 100644 index 0000000..e772481 --- /dev/null +++ b/debian/dirs @@ -0,0 +1 @@ +usr/bin diff --git a/debian/docs b/debian/docs new file mode 100644 index 0000000..65e68cd --- /dev/null +++ b/debian/docs @@ -0,0 +1,8 @@ +README +doc/Credits +doc/Zoom +doc/map-features.txt +doc/style-rules.txt +doc/style-examples.txt +doc/style.txt +resources/garmin_feature_list.csv diff --git a/debian/install b/debian/install new file mode 100644 index 0000000..75de0b1 --- /dev/null +++ b/debian/install @@ -0,0 +1,2 @@ +dist/mkgmap.jar usr/share/mkgmap/ +debian/scripts/mkgmap usr/bin/ diff --git a/debian/manpages b/debian/manpages new file mode 100644 index 0000000..788b3d6 --- /dev/null +++ b/debian/manpages @@ -0,0 +1 @@ +doc/mkgmap.1 diff --git a/debian/patches/build_xml.patch b/debian/patches/build_xml.patch new file mode 100644 index 0000000..85d7e92 --- /dev/null +++ b/debian/patches/build_xml.patch @@ -0,0 +1,41 @@ +Author: Andreas Tille <ti...@debian.org> +LastChanged: Wed, 05 Jun 2013 11:24:59 +0200 +Description: Leave out IVY dependency checker + Attention: This patch is most probably not yet finished. + I went until the point when I noticed that mkgmap needs a + not yet packaged dependency + http://fastutil.di.unimi.it/ + The packaging of this predependency is finished and was ITPed (#711212) + When installing libfastutil-java the build as way less error messages. + It seems the remaining precondition would be at + https://github.com/osmandapp/OsmAnd-tools/blob/master/OsmAndMapCreator/src/crosby/binary/Osmformat.java + I need to check this out + +--- a/build.xml ++++ b/build.xml +@@ -19,6 +19,7 @@ + xmlns:ivy="antlib:org.apache.ivy.ant"> + + <!-- Set default javac target value --> ++ <property name="deblib" location="/usr/share/java"/> + <property name="ant.build.javac.target" value="1.6"/> + <property name="ant.build.javac.source" value="1.6"/> + +@@ -71,7 +72,7 @@ + + <!-- For class paths --> + <path id="compile.classpath"> +- <fileset dir="${ivy.lib.dir}/compile" /> ++ <fileset dir="${deblib}/" /> <!-- fastutil.jar --> + </path> + <path id="test.classpath"> + <fileset dir="${ivy.lib.dir}/test" /> +@@ -231,7 +232,7 @@ + </target> + + <!-- Compile the product itself (no tests). --> +- <target name="compile" depends="prepare, resolve-compile" ++ <target name="compile" depends="prepare" + description="main compilation"> + + <javac srcdir="${src}" destdir="${build.classes}" encoding="utf-8" debug="true" includeantruntime="false"> diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..46a7f4e --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +build_xml.patch diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..05b703b --- /dev/null +++ b/debian/rules @@ -0,0 +1,13 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# debian/rules file for mkgmap +# Andreas Tille <ti...@debian.org> +# GPL + +JAVA_HOME=/usr/lib/jvm/default-java + +%: + dh $@ --with javahelper + +override_dh_auto_build: + ant diff --git a/debian/scripts/mkgmap b/debian/scripts/mkgmap new file mode 100644 index 0000000..00f0870 --- /dev/null +++ b/debian/scripts/mkgmap @@ -0,0 +1,23 @@ +#! /bin/sh +# Simple wrapper script to execute mkgmap in Debian +set -e + +# First, the users preference as defined by $JAVA_HOME. Next, the +# other JVMs known to work with mkgmap, with the one working best +# fist, and the less functional onces after that. Last, use /usr/bin/java. +# Override to a specific one using JAVACMD +JAVA_CMDS="$JAVA_HOME/bin/java /usr/lib/jvm/java-6-openjdk/bin/java /usr/lib/jvm/java-6-sun/jre/bin/java /usr/lib/jvm/java-1.5.0-sun/jre/bin/java /usr/bin/java" + +for jcmd in $JAVA_CMDS; do + if [ -x "$jcmd" -a -z "${JAVACMD}" ]; then + JAVACMD="$jcmd" + fi +done + +if [ "$JAVACMD" ]; then + echo "Using $JAVACMD to execute mkgmap." + exec $JAVACMD -jar /usr/share/mkgmap/mkgmap.jar "$@" +else + echo "No valid JVM found to run mkgmap." + exit 1 +fi diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..7fe5e51 --- /dev/null +++ b/debian/watch @@ -0,0 +1,3 @@ +version=3 +opts="dversionmangle=s/0.0.0.svn//,uversionmangle=s/^r//" \ +http://www.mkgmap.org.uk/snapshots/mkgmap-(.*)-src\.tar\.gz -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mkgmap.git _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel