This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch master in repository mkgmap-splitter.
commit 7dfe42703180366ad88c43748366805b0514cbe7 Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Thu Jan 8 22:17:47 2015 +0100 Initial Debian packaging. --- debian/changelog | 5 ++ debian/classpath | 1 + debian/compat | 1 + debian/control | 37 +++++++++++ debian/copyright | 107 ++++++++++++++++++++++++++++++++ debian/dirs | 1 + debian/docs | 2 + debian/gbp.conf | 16 +++++ debian/install | 1 + debian/mkgmap-splitter.sh | 33 ++++++++++ debian/patches/local-dependencies.patch | 89 ++++++++++++++++++++++++++ debian/patches/series | 1 + debian/rules | 12 ++++ debian/source/format | 1 + debian/watch | 6 ++ 15 files changed, 313 insertions(+) diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..dfec1e0 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,5 @@ +mkgmap-splitter (0.0.0+svn416-1) UNRELEASED; urgency=low + + * Initial release (Closes: #664130) + + -- Bas Couwenberg <sebas...@xs4all.nl> Mon, 05 Jan 2015 21:08:26 +0100 diff --git a/debian/classpath b/debian/classpath new file mode 100644 index 0000000..f3d9fb8 --- /dev/null +++ b/debian/classpath @@ -0,0 +1 @@ +usr/share/mkgmap-splitter/splitter.jar /usr/share/java/fastutil.jar /usr/share/java/protobuf.jar /usr/share/java/osmpbf.jar /usr/share/java/xpp3.jar 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..35eb26a --- /dev/null +++ b/debian/control @@ -0,0 +1,37 @@ +Source: mkgmap-splitter +Maintainer: Debian GIS Project <pkg-grass-devel@lists.alioth.debian.org> +Uploaders: Bas Couwenberg <sebas...@xs4all.nl> +Section: utils +Priority: optional +Build-Depends: debhelper (>= 9), + javahelper, + ant, + default-jdk, + libbsh-java, + libfastutil-java, + libjcommander-java, + libprotobuf-java, + libosmpbf-java, + libxpp3-java, + testng (>= 6.8.13), + libjs-jquery, + libjs-jquery-ui +Standards-Version: 3.9.6 +Vcs-Browser: http://anonscm.debian.org/cgit/pkg-grass/mkgmap-splitter.git +Vcs-Git: git://anonscm.debian.org/pkg-grass/mkgmap-splitter.git +Homepage: http://www.mkgmap.org.uk + +Package: mkgmap-splitter +Architecture: all +Depends: ${misc:Depends}, + ${java:Depends}, + default-jre | java7-runtime +Recommends: mkgmap +Description: Split OpenStreetMap data into smaller tiles for use with mkgmap + This program splits OpenStreetMap data into smaller tiles to fit within the + Garmin map format limits as created by mkmap. + . + Main features: + - Variable sized tiles so that you don't get a large number of tiny files. + - Tiles join exactly with no overlap or gaps. + diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..bb14562 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,107 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Contact: Steve Ratcliffe <s...@parabola.me.uk> +Upstream-Name: splitter +Source: http://www.mkgmap.org.uk/download/splitter.html + +Files: * +Copyright: 2009-2012, 2014, Steve Ratcliffe <s...@parabola.me.uk> + 2011, the splitter contributors +License: GPL-3 + +Files: src/uk/me/parabola/splitter/DataStorer.java + src/uk/me/parabola/splitter/EnhancedDensityMap.java + src/uk/me/parabola/splitter/Long2IntClosedMap.java + src/uk/me/parabola/splitter/Long2IntClosedMapFunction.java + src/uk/me/parabola/splitter/MultiTileProcessor.java + src/uk/me/parabola/splitter/O5mMapParser.java + src/uk/me/parabola/splitter/O5mMapWriter.java + src/uk/me/parabola/splitter/OSMId2ObjectMap.java + src/uk/me/parabola/splitter/PrecompSeaReader.java + src/uk/me/parabola/splitter/PseudoOSMWriter.java + src/uk/me/parabola/splitter/Solution.java + src/uk/me/parabola/splitter/SparseBitSet.java + src/uk/me/parabola/splitter/SparseLong2ShortMap.java + src/uk/me/parabola/splitter/SparseLong2ShortMapFunction.java + src/uk/me/parabola/splitter/SplitFailedException.java + src/uk/me/parabola/splitter/StopNoErrorException.java + src/uk/me/parabola/splitter/TileMetaInfo.java + src/uk/me/parabola/splitter/WriterDictionaryInt.java + test/uk/me/parabola/splitter/TestSparseBitSet.java +Copyright: 2007, 2010-2012, 2014, Steve Ratcliffe <s...@parabola.me.uk> +License: GPL-2 + +Files: src/org/openstreetmap/osmosis/core/* +Copyright: disclaimed +License: public-domain + This software is released into the Public Domain. + +Files: src/org/apache/tools/bzip2/* +Copyright: Apache Software Foundation +License: Apache-2.0 + +Files: debian/* +Copyright: 2015, Bas Couwenberg <sebas...@xs4all.nl> +License: GPL-2+ + +License: GPL-2 + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License version 3 or + version 2 as published by the Free Software Foundation. + . + This program 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. + . + On Debian systems, the full text of the GNU General Public License + version 2 can be found in the file + `/usr/share/common-licenses/GPL-2'. + +License: GPL-2+ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + . + This program 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. + . + On Debian systems, the full text of the GNU General Public License + version 2 can be found in the file + `/usr/share/common-licenses/GPL-2'. + +License: GPL-3 + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License version 3 as + published by the Free Software Foundation. + . + This program 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. + . + On Debian systems, the full text of the GNU General Public License + version 3 can be found in the file + `/usr/share/common-licenses/GPL-3'. + +License: Apache-2.0 + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + . + http://www.apache.org/licenses/LICENSE-2.0 + . + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + . + On Debian systems, the complete text of the Apache License can be found + in `/usr/share/common-licenses/Apache-2.0'. + 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..c664adb --- /dev/null +++ b/debian/docs @@ -0,0 +1,2 @@ +doc/intro.txt +doc/splitter.txt diff --git a/debian/gbp.conf b/debian/gbp.conf new file mode 100644 index 0000000..21d0417 --- /dev/null +++ b/debian/gbp.conf @@ -0,0 +1,16 @@ +[DEFAULT] + +# The default name for the upstream branch is "upstream". +# Change it if the name is different (for instance, "master"). +upstream-branch = upstream + +# The default name for the Debian branch is "master". +# Change it if the name is different (for instance, "debian/unstable"). +debian-branch = master + +# git-import-orig uses the following names for the upstream tags. +# Change the value if you are not using git-import-orig +upstream-tag = upstream/%(version)s + +# Always use pristine-tar. +pristine-tar = True diff --git a/debian/install b/debian/install new file mode 100644 index 0000000..a134544 --- /dev/null +++ b/debian/install @@ -0,0 +1 @@ +dist/splitter.jar usr/share/mkgmap-splitter/ diff --git a/debian/mkgmap-splitter.sh b/debian/mkgmap-splitter.sh new file mode 100644 index 0000000..dda75fe --- /dev/null +++ b/debian/mkgmap-splitter.sh @@ -0,0 +1,33 @@ +#!/bin/sh +# Simple wrapper script used to start mkgmap-splitter in Debian +set -e + +# Override to a specific one using $JAVACMD +ALTERNATIVE_JDK="`readlink -n -f /etc/alternatives/java`" + +# Let's get the current architecture -- needed for multiarchified Java +ARCH="`dpkg --print-architecture`" + +JAVA_CMDS="$JAVA_HOME/bin/java /usr/lib/jvm/java-7-openjdk-$ARCH/bin/java /usr/bin/java" + +JAVA_OPTS="$JAVA_OPTS -Xmx2000m" + +for jcmd in $JAVA_CMDS; do + if [ "z$ALTERNATIVE_JDK" = "z`readlink -n -f $jcmd`" ] && [ -z "${JAVACMD}" ]; then + JAVACMD="$jcmd" + fi +done + +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-splitter." + exec $JAVACMD $JAVA_OPTS -jar /usr/share/mkgmap-splitter/splitter.jar +else + echo "No valid JVM found to run mkgmap-splitter." + exit 1 +fi diff --git a/debian/patches/local-dependencies.patch b/debian/patches/local-dependencies.patch new file mode 100644 index 0000000..3855947 --- /dev/null +++ b/debian/patches/local-dependencies.patch @@ -0,0 +1,89 @@ +Description: Use packaged dependencies instead of ivy downloading them. +Author: Bas Couwenberg <sebas...@xs4all.nl> + +--- a/build.xml ++++ b/build.xml +@@ -28,6 +28,8 @@ + + <property name="project.name" value="${ant.project.name}"/> + ++ <property name="deblib" value="/usr/share/java"/> ++ + <!-- + This file is not checked into svn, so you can create it and put any + property definitions that you want to override those below. +@@ -50,7 +52,7 @@ + <property name="project.jar" value="${dist}/${project.name}.jar"/> + + <!-- Third party libraries --> +- <property name="xpp.jar" location="${lib}/compile/xpp3-1.1.4c.jar"/> ++ <property name="xpp.jar" location="${deblib}/xpp3.jar"/> + + <!-- the project's build timestamp --> + <tstamp> +@@ -67,13 +69,22 @@ + <!-- Classpaths --> + <path id="classpath"> + <pathelement location="${build.classes}"/> +- <fileset dir="${ivy.lib.dir}/compile" /> ++ <fileset dir="${deblib}/"> ++ <include name="fastutil.jar"/> ++ <include name="protobuf.jar"/> ++ <include name="osmpbf.jar"/> ++ <include name="xpp3.jar"/> ++ </fileset> + </path> + + <path id="test.classpath"> + <path refid="classpath"/> + <pathelement location="${build.test-classes}"/> +- <fileset dir="${ivy.lib.dir}/test" includes="*.jar"/> ++ <fileset dir="${deblib}/"> ++ <include name="testng.jar"/> ++ <include name="bsh.jar"/> ++ <include name="jcommander.jar"/> ++ </fileset> + </path> + + <!-- targets for downloading and registering ivy --> +@@ -208,14 +219,14 @@ + </propertyfile> + </target> + +- <target name="compile" depends="prepare, resolve-compile" description="main compilation"> ++ <target name="compile" depends="prepare" description="main compilation"> + <javac srcdir="${src}" destdir="${build.classes}" debug="yes" includeantruntime="false"> + <include name="**/*.java"/> + <classpath refid="classpath"/> + </javac> + </target> + +- <target name="compile.tests" depends="prepare, resolve-test" description="test compilation"> ++ <target name="compile.tests" depends="prepare" description="test compilation"> + <javac srcdir="${test}" destdir="${build.test-classes}" debug="yes" includeantruntime="false"> + <include name="**/*.java"/> + <classpath refid="test.classpath"/> +@@ -250,10 +261,6 @@ + <fileset dir="doc" includes="*.txt"/> + </copy> + +- <copy todir="${dist}/lib"> +- <fileset dir="${lib}/compile"/> +- </copy> +- + <!-- misc --> + <copy todir="${dist}"> + <fileset dir="${basedir}"> +@@ -262,6 +269,12 @@ + </fileset> + </copy> + ++ <mkdir dir="${dist}/lib"/> ++ ++ <copy todir="${dist}/lib" flatten="true"> ++ <path refid="classpath" /> ++ </copy> ++ + <manifestclasspath property="manifest_cp" jarfile="${project.jar}"> + <classpath> + <fileset dir="${dist}/lib"> diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..37c468a --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +local-dependencies.patch diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..fdb5809 --- /dev/null +++ b/debian/rules @@ -0,0 +1,12 @@ +#!/usr/bin/make -f + +JAVA_HOME=/usr/lib/jvm/default-java + +%: + dh $@ --with javahelper + +override_dh_auto_install: + dh_auto_install + + install -m 755 debian/mkgmap-splitter.sh debian/mkgmap-splitter/usr/bin/mkgmap-splitter + 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..ae97788 --- /dev/null +++ b/debian/watch @@ -0,0 +1,6 @@ +version=3 +opts="uversionmangle=s/(\d+)/0.0.0+svn$1/,\ +downloadurlmangle=s/\.zip/-src.tar.gz/,\ +filenamemangle=s/\/download\/splitter-r([\d]+)\.zip/splitter-r$1-src.tar.gz/" \ +http://www.mkgmap.org.uk/download/splitter.html \ +(?:.*)/download/splitter-r([\d]+).zip -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mkgmap-splitter.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