debian/0000755000000000000000000000000011776752555007212 5ustar debian/lintian-overrides0000644000000000000000000000022711677147564012572 0ustar osmosis: duplicate-files usr/share/doc/osmosis/examples/pgsimple_schema_0.6_action.sql usr/share/doc/osmosis/examples/pgsnapshot_schema_0.6_action.sql debian/ivysettings.xml0000644000000000000000000000274211776752441012323 0ustar debian/rules0000755000000000000000000000363311776752441010271 0ustar #!/usr/bin/make -f export JAVA_HOME := /usr/lib/jvm/default-java/ DEB_JARS := /usr/share/java/mysql-connector-java.jar DEB_JARS += /usr/share/java/postgis.jar DEB_JARS += /usr/share/java/postgresql.jar DEB_JARS += /usr/share/java/junit4.jar DEB_JARS += /usr/share/java/ant-junit.jar DEB_JARS += /usr/share/java/spring3-core.jar DEB_JARS += /usr/share/java/spring3-jdbc.jar DEB_JARS += /usr/share/java/spring3-beans.jar DEB_JARS += /usr/share/java/spring3-transaction.jar DEB_JARS += /usr/share/java/commons-dbcp.jar DEB_JARS += /usr/share/java/jpf.jar DEB_JARS += /usr/share/java/commons-compress.jar DEB_JARS += /usr/share/java/commons-codec.jar DEB_JARS += /usr/share/java/batik-ext.jar # Plugins for ant DEB_JARS += /usr/share/java/ant-nodeps.jar export CLASSPATH=$(shell echo $(DEB_JARS) | sed -e 's/ /:/g') DB2MAN := /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl XP := xsltproc -''-nonet -''-param man.charmap.use.subset "0" CURVER := $(shell dpkg-parsechangelog | grep ^Version | cut -d\ -f2 | cut -d- -f1 | cut -d+ -f1) DESTTGZ := osmosis_${CURVER}+ds1.orig.tar.gz debian/osmosis.1: debian/osmosis.xml $(XP) -o $@ $(DB2MAN) $< %: dh $@ override_dh_auto_build: echo $(CLASSPATH) dh_auto_build -- -Dproject.version=$(CURVER) override_dh_clean: dh_clean rm -rf build/ package/build/ package/lib/ debian/ivy-cache/ override_dh_installchangelogs: dh_installchangelogs -- package/changes.txt get-orig-source: dh_testdir test -d ../tarballs/. || mkdir -p ../tarballs uscan --verbose \ --download-version $(CURVER) \ --destdir . \ --force-download \ --rename tar xf osmosis_$(CURVER).orig.tar.gz @echo Removing build-support/repo and debian directory rm -rf openstreetmap-osmosis-*/build-support/repo openstreetmap-osmosis-*/debian @echo Building snapshot tarball tar czf ${DESTTGZ} openstreetmap-osmosis-*/ @echo Cleaning up rm -rf openstreetmap-osmosis-*/ osmosis_$(CURVER).orig.tar.gz debian/install0000644000000000000000000000020711677147564010600 0ustar build/*.jar usr/share/osmosis package/bin/osmosis usr/bin package/config/plexus.conf etc/osmosis debian/log4j.properties etc/osmosis debian/examples0000644000000000000000000000002111677147564010742 0ustar package/script/* debian/osmosis.xml0000644000000000000000000000721611677147564011434 0ustar ]> &dhtitle; &dhpackage; &dhfirstname; &dhsurname; Wrote this manpage for the Debian system.
&dhemail;
2009 &dhusername; This manual page was written for the Debian system (and may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 3 or (at your option) any later version published by the Free Software Foundation. On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL. &dhucpackage; &dhsection; &dhpackage; command line OpenStreetMap data processor &dhpackage; ... DESCRIPTION This manual page documents briefly the &dhpackage; command. This manual page was written for the Debian distribution because the original program does not have a manual page. &dhpackage; is a command-line Java program that processes OpenStreetMap data. It consistes of a series of component which can be chained together in order to perform operations on OpenStreetMap databases or XML files. Such options include: Generate and load dumps from and to a database. Produce changesets comparing databases and files and applying them to other databases and files. Sort data contained in a file. Extract data contained in a bounding box or in a polygon. OPTIONS The commands and arguments accepted by &dhpackage; are described in details and shown in examples in the page and its subpages. BUGS The upstreams BTS can be found at . Bugs are also discussed on upstream mailing list, at . debian/watch0000644000000000000000000000017111677147564010240 0ustar version=3 opts=dversionmangle=s/\+ds\d+$// \ http://githubredir.debian.net/github/openstreetmap/osmosis/(\d+.*)\.tar\.gz debian/manpages0000644000000000000000000000002111677147564010717 0ustar debian/osmosis.1 debian/dependencies.txt0000644000000000000000000000177511677147564012411 0ustar dependency.version.checkstyle=5.0 # Debian: 4.4 (5.3 in experimental) dependency.version.classworlds=2.2.2 # Debian: 1.1 dependency.version.commons-codec=1.4 # Debian: 1.4 dependency.version.commons-compress=1.0 # Debian: 1.0 dependency.version.commons-dbcp=1.4 # Debian: 1.4 dependency.version.osmbin=1.0-6d760534 dependency.version.osmosis-hstore=0.2 dependency.version.ivy=2.1.0 # Debian: 2.1.0 dependency.version.jpf=1.5 # Debian: 1.5.1 (no POM) dependency.version.junit=4.8.1 # Debian: 4.8.2 dependency.version.mysql=5.1.10 # Debian: 5.1.10 (no POM) dependency.version.postgis=1.3.3 # Debian: 1.5.1 (no POM) dependency.version.postgresql=8.4-701.jdbc4 # Debian: 8.4-701 (no POM) dependency.version.protobuf=2.3.0 # Debian: 2.3.0 (no POM) dependency.version.spring=3.0.3.RELEASE # Debian: 3.0.5.RELEASE dependency.version.woodstox-core=4.0.3 # Debian: 3.9.2 (no POM) dependency.version.woodstox-stax2=3.0.2 # Debian: 1.2.0 dependency.version.xerces=2.9.1 # Debian: 2.9.1 debian/compat0000644000000000000000000000000211677147564010406 0ustar 8 debian/log4j.properties0000644000000000000000000000015311677147564012344 0ustar # Only show WARN or higher messages for org.java.plugin package log4j.logger.org.java.plugin=WARN debian/control0000644000000000000000000000367511776752517010626 0ustar Source: osmosis Section: utils Priority: optional Maintainer: Debian OpenStreetMap Team Uploaders: Giovanni Mascellani , David Paleino Build-Depends: ant , ant-optional , debhelper (>= 8~) , libcommons-codec-java , libcommons-compress-java (>= 1.2) , libcommons-dbcp-java , libjpf-java , libmysql-java , libpostgis-java , libpostgresql-jdbc-java , libspring-beans-java , libspring-context-java , libspring-jdbc-java , libspring-transaction-java , libstax2-api-java , libbatik-java , libprotobuf-java , libosmpbf-java , libplexus-classworlds-java , libxerces2-java , libxz-java , checkstyle (>= 5.4) , ivy , junit4 (>= 4.10) , default-jdk Standards-Version: 3.9.3 Vcs-Git: git://git.debian.org/pkg-osm/osmosis.git Vcs-Browser: http://git.debian.org/?p=pkg-osm/osmosis.git Homepage: http://wiki.openstreetmap.org/wiki/Osmosis Package: osmosis Architecture: all Depends: ant , default-jre-headless | java6-runtime-headless , libcommons-codec-java , libcommons-compress-java (>= 1.2) , libcommons-dbcp-java , libjpf-java , libmysql-java , libpostgis-java , libpostgresql-jdbc-java , libspring-beans-java , libspring-context-java , libspring-core-java , libspring-jdbc-java , libspring-transaction-java , libplexus-classworlds-java , libprotobuf-java , libosmpbf-java , libbatik-java , libcommons-pool-java , libxerces2-java , libxz-java , ${misc:Depends} Description: Command line OpenStreetMap data processor Osmosis consists of a series of components that can be chained together in order to perform operations on an OpenStreetMap database or OpenStreetMap XML or PBF files. Such operations include: * Generate and load dumps from and to a database. * Produce changesets comparing databases and files and applying them to other databases and files. * Sort data contained in a file. * Extract data contained in a bounding box or in a polygon. debian/copyright0000644000000000000000000000327111742327660011134 0ustar Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0 Upstream-Name: osmosis Source: http://www.bretth.com/osmosis/ Files: debian/* Copyright: © 2008-2009, Giovanni Mascellani © 2009-2012, David Paleino 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 as published by the Free Software Foundation, either version 3 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. . You should have received a copy of the GNU General Public License along with this program. If not, see . X-Comment: on Debian systems, the complete text of the GNU General Public License version 3 can be found in /usr/share/common-licenses/GPL-3. Files: * Copyright: © 2007-2008, Bretth Henderson and other contributors License: PD Osmosis is placed into the public domain and where this is not legally possible everybody is granted a perpetual, irrevocable license to use this work for any purpose whatsoever. . DISCLAIMERS By making Osmosis publicly available, it is hoped that users will find the software useful. However: * Osmosis comes without any warranty, to the extent permitted by applicable law. * Unless required by applicable law, no liability will be accepted by the authors and distributors of this software for any damages caused as a result of its use. debian/changelog0000644000000000000000000001350011776752555011063 0ustar osmosis (0.40.1+ds1-7) unstable; urgency=low * Added missing dependency on libxz-java (Closes: #680820) -- David Paleino Tue, 10 Jul 2012 09:10:35 +0200 osmosis (0.40.1+ds1-6) unstable; urgency=low * Use a dedicate ivy cache, to don't interfere with user cache. * Fix some mistakes in dependency resolution, that led to FTBFS (closes: #674314). -- Giovanni Mascellani Fri, 15 Jun 2012 12:24:22 +0200 osmosis (0.40.1+ds1-5) unstable; urgency=low * Bump dependency on libcommons-compress-java (Closes: #664597) * Bump dependency on checkstyle (Closes: #664602) * Updated debian/copyright -- David Paleino Sat, 14 Apr 2012 19:19:28 +0200 osmosis (0.40.1+ds1-4) unstable; urgency=low * Switch dependency from libpg-java to libpostgresql-jdbc-java (Closes: #659399) * Drop junit4 workaround: now Debian has 4.10 * Bump Standards-Version to 3.9.3, no changes needed * Updated debian/copyright -- David Paleino Thu, 08 Mar 2012 08:23:40 +0100 osmosis (0.40.1+ds1-3) unstable; urgency=low * Add missing Osmosis JARs to Plexus config (Closes: #656432) -- David Paleino Fri, 20 Jan 2012 12:24:34 +0100 osmosis (0.40.1+ds1-2) unstable; urgency=low * Removing references to libwoodstox-java, which is not necessary to build osmosis. -- Giovanni Mascellani Wed, 11 Jan 2012 16:53:25 +0100 osmosis (0.40.1+ds1-1) unstable; urgency=low * New upstream version * Fix debian/watch and debian/rules' get-orig-source to point to github * Refresh patches to apply to the new source - added 04-fix_dependencies_versions.patch and 05-workaround_missing_junit4.10.patch * Fix links to protobuf's jar (Closes: #650617, #652754) * Add dependencies to libxerces2-java -- David Paleino Fri, 30 Dec 2011 00:29:51 +0100 osmosis (0.39+ds1-6) unstable; urgency=low * Fix plexus config file to correctly point to jars (Closes: #647452) -- David Paleino Wed, 02 Nov 2011 21:54:01 +0100 osmosis (0.39+ds1-5) unstable; urgency=low * Add dependency to libcommons-pool-java (Closes: #644712) * Provide a log4j config file, thanks to Alberto Fernández (Closes: #579206) * Osmosis configuration file is now set to /etc/osmosis/osmosis.conf (Closes: #644841) -- David Paleino Sun, 09 Oct 2011 20:12:58 +0200 osmosis (0.39+ds1-4) unstable; urgency=low * 00-fix_build_system.patch updated: don't hardcode version number in jar filenames. * 01-fix_launcher.patch fixed: osmosis.jar doesn't exist anymore. * 02-fix_plexus.patch: use ${app.home} instead of hardcoding osmosis path. -- David Paleino Sat, 01 Oct 2011 22:21:58 +0200 osmosis (0.39+ds1-3) unstable; urgency=low * Fix plexus config file not to load duplicate jars, by hardcoding osmosis' version number in it. -- David Paleino Thu, 29 Sep 2011 11:44:16 +0200 osmosis (0.39+ds1-2) unstable; urgency=low * Complete switch from Spring Framework 2.5 to 3.0 (Closes: #638539) * Add unversioned .jar symlinks to /usr/share/osmosis/ -- David Paleino Wed, 28 Sep 2011 20:33:50 +0200 osmosis (0.39+ds1-1) unstable; urgency=low [ David Paleino ] * New upstream release (closes: #605698) * Fix get-orig-source target in debian/rules * Use debhelper compatibility 8 * Bump Standards-Version to 3.9.2, no changes needed * Fix debian/rules to support multi-archified java * Package moved from pkg-grass to pkg-osm * Package switched from cdbs to dh7 [ Giovanni Mascellani ] * debian/watch: updated * debian/patches: - 00-fix_build.patch: removed, build system has completely changed; - 01-fix_launcher.patch, 02-fix_plexus.patch: files moved, conflicts resolved. * Depend on headless runtime environment and use default-jdk at building time (closes: #613135). -- David Paleino Wed, 28 Sep 2011 19:03:10 +0200 osmosis (0.34+ds1-1) unstable; urgency=low [ David Paleino ] * New upstream version * debian/control: - updated my e-mail address - DMUA removed - added missing Build-Dependencies: libcommons-compress-java, libcommons-codec-java - added pkg-osm to Uploaders - Standards-Version bumped to 3.8.4, no changes needed - rewrapped for easier diff'ing - add alternative openjdk-6-jre dependency to java6-runtime - add dependency on libplexus-classworlds-java, libcommons-codec-java and libcommons-compress-java * debian/rules: - updated get-orig-source target to strip unwanted *.jar files * debian/copyright updated * debian/source/format added, using 3.0 (quilt) * debian/patches/: - 00-fix_build.patch added, fixes FTBFS because of missing file in upstream tarball - 01-fix_launcher.patch added, correctly point to the right paths - 02-fix_plexus.patch added, fix Plexus configuration with the right paths * debian/osmosis.1 statically generated, so to remove unneeded Build-Dependencies * debian/watch: use dversionmangle * debian/install: install plexus.conf in /etc/osmosis/ [ Giovanni Mascellani ] * debian/*: updated my email address * debian/watch: updated to new upstream distribution location -- David Paleino Thu, 01 Apr 2010 01:13:13 +0200 osmosis (0.31.2-2) unstable; urgency=low [ Giovanni Mascellani ] * Fixed some path mistakes and missing files in output JAR (closes: #550151, #550149) * Vcs-* fields updated -- David Paleino Fri, 09 Oct 2009 00:53:42 +0200 osmosis (0.31.2-1) unstable; urgency=low [ Giovanni Mascellani ] * Initial release (Closes: #497457). [ Francesco Paolo Lovergine ] * Added docbook-xml among build-dep. -- Francesco Paolo Lovergine Mon, 05 Oct 2009 22:25:18 +0200 debian/source/0000755000000000000000000000000011677147564010510 5ustar debian/source/format0000644000000000000000000000001411677147564011716 0ustar 3.0 (quilt) debian/clean0000644000000000000000000000041111677147605010205 0ustar core/src/org/openstreetmap/osmosis/core/OsmosisConstants.java core/src/org/openstreetmap/osmosis/core/plugin/plugin.xml core/src/main/resources/org/openstreetmap/osmosis/core/plugin/plugin.xml core/src/main/java/org/openstreetmap/osmosis/core/OsmosisConstants.java debian/patches/0000755000000000000000000000000011776752441010633 5ustar debian/patches/series0000644000000000000000000000022511726056340012035 0ustar 00-fix_build_system.patch 01-fix_launcher.patch 02-fix_plexus.patch 03-create_manifest.patch 04-fix_dependencies_versions.patch 06-no-woodstox.patch debian/patches/04-fix_dependencies_versions.patch0000644000000000000000000000315311776752441017323 0ustar From: David Paleino Subject: fix needed versions of packages, so that they match the ones available in Debian Origin: vendor Forwarded: not-needed --- build-support/config/ant-build-common.properties | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) Index: osmosis/build-support/config/ant-build-common.properties =================================================================== --- osmosis.orig/build-support/config/ant-build-common.properties 2012-06-15 12:13:49.000000000 +0200 +++ osmosis/build-support/config/ant-build-common.properties 2012-06-15 12:15:52.000000000 +0200 @@ -2,19 +2,18 @@ # 3rd Party Library Versions dependency.version.checkstyle=5.4 -dependency.version.classworlds=2.4 -dependency.version.commons-codec=1.5 -dependency.version.commons-compress=1.2 +dependency.version.classworlds=debian +dependency.version.commons-codec=debian +dependency.version.commons-compress=debian dependency.version.commons-dbcp=1.4 -dependency.version.osmpbf=1.1.1-754a33af +dependency.version.osmpbf= dependency.version.ivy=2.2.0 dependency.version.jpf=1.5 -dependency.version.junit=4.10 -dependency.version.mysql=5.1.18 -dependency.version.postgis=1.3.3 -dependency.version.postgresql=9.0-801.jdbc4 -dependency.version.protobuf=2.4.1 +dependency.version.junit=4.x +dependency.version.mysql=debian +dependency.version.postgis= +dependency.version.postgresql= +dependency.version.protobuf=debian dependency.version.spring=3.0.6.RELEASE -dependency.version.woodstox-core=4.1.2 dependency.version.woodstox-stax2=3.1.1 -dependency.version.xerces=2.9.1 +dependency.version.xerces=debian debian/patches/03-create_manifest.patch0000644000000000000000000001537611703362632015226 0ustar From: David Paleino Subject: write Class-Path into per-jar MANIFEST.MF Origin: vendor Forwarded: not-needed --- apidb/jar.properties | 1 + areafilter/jar.properties | 1 + build-support/script/build-java.xml | 5 ++++- core/jar.properties | 1 + dataset/jar.properties | 1 + extract/jar.properties | 1 + hstore-jdbc/jar.properties | 1 + pbf/jar.properties | 1 + pgsimple/jar.properties | 1 + pgsnapshot/jar.properties | 1 + replication/jar.properties | 1 + set/jar.properties | 1 + tagfilter/jar.properties | 1 + xml/jar.properties | 1 + 14 files changed, 17 insertions(+), 1 deletion(-) Index: osmosis/build-support/script/build-java.xml =================================================================== --- osmosis.orig/build-support/script/build-java.xml 2012-01-11 16:46:53.000000000 +0100 +++ osmosis/build-support/script/build-java.xml 2012-01-11 16:46:53.000000000 +0100 @@ -62,11 +62,14 @@ - + + + + Index: osmosis/apidb/jar.properties =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ osmosis/apidb/jar.properties 2012-01-11 16:46:53.000000000 +0100 @@ -0,0 +1 @@ +jar.classpath=/usr/share/osmosis/osmosis-core.jar /usr/share/osmosis/osmosis-replication.jar /usr/share/osmosis/osmosis-xml.jar /usr/share/java/spring3-jdbc.jar /usr/share/java/commons-dbcp.jar /usr/share/java/postgresql.jar /usr/share/java/mysql-connector-java.jar Index: osmosis/areafilter/jar.properties =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ osmosis/areafilter/jar.properties 2012-01-11 16:46:53.000000000 +0100 @@ -0,0 +1 @@ +jar.classpath=/usr/share/osmosis/osmosis-core.jar /usr/share/osmosis/osmosis-xml.jar /usr/share/java/postgresql.jar /usr/share/java/mysql-connector-java.jar Index: osmosis/core/jar.properties =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ osmosis/core/jar.properties 2012-01-11 16:46:53.000000000 +0100 @@ -0,0 +1 @@ +jar.classpath=/usr/share/java/jpf.jar /usr/share/java/stax2-api.jar /usr/share/java/commons-compress.jar /usr/share/java/xercesImpl.jar Index: osmosis/dataset/jar.properties =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ osmosis/dataset/jar.properties 2012-01-11 16:46:53.000000000 +0100 @@ -0,0 +1 @@ +jar.classpath=/usr/share/osmosis/osmosis-core.jar /usr/share/osmosis/osmosis-xml.jar Index: osmosis/extract/jar.properties =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ osmosis/extract/jar.properties 2012-01-11 16:46:53.000000000 +0100 @@ -0,0 +1 @@ +jar.classpath=/usr/share/osmosis/osmosis-core.jar /usr/share/osmosis/osmosis-apidb.jar /usr/share/osmosis/osmosis-replication.jar /usr/share/osmosis/osmosis-xml.jar Index: osmosis/hstore-jdbc/jar.properties =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ osmosis/hstore-jdbc/jar.properties 2012-01-11 16:46:53.000000000 +0100 @@ -0,0 +1 @@ +jar.classpath=/usr/share/java/postgresql.jar Index: osmosis/pbf/jar.properties =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ osmosis/pbf/jar.properties 2012-01-11 16:46:53.000000000 +0100 @@ -0,0 +1 @@ +jar.classpath=/usr/share/osmosis/osmosis-core.jar /usr/share/java/protobuf-java.jar /usr/share/java/osmpbf.jar Index: osmosis/pgsimple/jar.properties =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ osmosis/pgsimple/jar.properties 2012-01-11 16:46:53.000000000 +0100 @@ -0,0 +1 @@ +jar.classpath=/usr/share/osmosis-core.jar /usr/share/osmosis-dataset.jar /usr/share/osmosis-xml.jar /usr/share/java/spring3-jdbc.jar /usr/share/java/commons-dbcp.jar /usr/share/java/postgresql.jar /usr/share/java/postgis.jar Index: osmosis/pgsnapshot/jar.properties =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ osmosis/pgsnapshot/jar.properties 2012-01-11 16:46:53.000000000 +0100 @@ -0,0 +1 @@ +jar.classpath=/usr/share/osmosis/osmosis-core.jar /usr/share/osmosis/osmosis-hstore.jar /usr/share/osmosis/osmosis-dataset.jar /usr/share/osmosis/osmosis-xml.jar /usr/share/java/spring3-jdbc.jar /usr/share/java/commons-dbcp.jar /usr/share/java/postgresql.jar /usr/share/java/postgis.jar Index: osmosis/replication/jar.properties =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ osmosis/replication/jar.properties 2012-01-11 16:46:53.000000000 +0100 @@ -0,0 +1 @@ +jar.classpath=/usr/share/osmosis/osmosis-core.jar /usr/share/osmosis/osmosis-set.jar /usr/share/osmosis/osmosis-xml.jar Index: osmosis/set/jar.properties =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ osmosis/set/jar.properties 2012-01-11 16:46:53.000000000 +0100 @@ -0,0 +1 @@ +jar.classpath=/usr/share/osmosis/osmosis-core.jar /usr/share/osmosis/osmosis-xml.jar Index: osmosis/tagfilter/jar.properties =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ osmosis/tagfilter/jar.properties 2012-01-11 16:46:53.000000000 +0100 @@ -0,0 +1 @@ +jar.classpath=/usr/share/osmosis/osmosis-core.jar /usr/share/osmosis/osmosis-xml.jar Index: osmosis/xml/jar.properties =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ osmosis/xml/jar.properties 2012-01-11 16:46:53.000000000 +0100 @@ -0,0 +1 @@ +jar.classpath=/usr/share/osmosis/osmosis-core.jar /usr/share/java/commons-codec.jar /usr/share/java/commons-compress.jar debian/patches/00-fix_build_system.patch0000644000000000000000000002433511703362632015436 0ustar From: David Paleino Subject: fix build system not to FTBFS Origin: vendor Forwarded: not-needed --- apidb/build.xml | 2 ++ build-support/script/build-ivy-base.xml | 9 ++++----- build-support/script/build-java.xml | 20 ++++++++++++-------- build.xml | 1 + core/ivy.xml | 2 +- extract/build.xml | 2 ++ pgsimple/ivy.xml | 2 +- pgsnapshot/build.xml | 2 ++ pgsnapshot/ivy.xml | 2 +- xml/ivy.xml | 1 + 10 files changed, 27 insertions(+), 16 deletions(-) Index: osmosis/apidb/build.xml =================================================================== --- osmosis.orig/apidb/build.xml 2012-01-11 16:33:26.000000000 +0100 +++ osmosis/apidb/build.xml 2012-01-11 16:46:53.000000000 +0100 @@ -1,6 +1,8 @@ + + Index: osmosis/build-support/script/build-ivy-base.xml =================================================================== --- osmosis.orig/build-support/script/build-ivy-base.xml 2012-01-11 16:33:29.000000000 +0100 +++ osmosis/build-support/script/build-ivy-base.xml 2012-01-11 16:46:53.000000000 +0100 @@ -9,6 +9,7 @@ + @@ -34,7 +35,7 @@ dest="${ivy.jar.file}" usetimestamp="true"/> - + - + - - - + Index: osmosis/build-support/script/build-java.xml =================================================================== --- osmosis.orig/build-support/script/build-java.xml 2012-01-11 16:33:29.000000000 +0100 +++ osmosis/build-support/script/build-java.xml 2012-01-11 16:47:58.000000000 +0100 @@ -23,6 +23,11 @@ + + + + + @@ -36,7 +41,7 @@ - + @@ -74,10 +79,9 @@ manifest="build/binary/jar.txt"/> - + tofile="${debian.dir}/../build/${project.name}.jar"/> @@ -99,7 +103,7 @@ - + @@ -114,8 +118,8 @@ - - + @@ -125,7 +129,7 @@ - + @@ -140,7 +144,7 @@ - + Index: osmosis/extract/build.xml =================================================================== --- osmosis.orig/extract/build.xml 2012-01-11 16:33:26.000000000 +0100 +++ osmosis/extract/build.xml 2012-01-11 16:46:53.000000000 +0100 @@ -1,6 +1,8 @@ + + Index: osmosis/pgsnapshot/build.xml =================================================================== --- osmosis.orig/pgsnapshot/build.xml 2012-01-11 16:33:26.000000000 +0100 +++ osmosis/pgsnapshot/build.xml 2012-01-11 16:46:53.000000000 +0100 @@ -1,5 +1,7 @@ + + Index: osmosis/build.xml =================================================================== --- osmosis.orig/build.xml 2012-01-11 16:33:26.000000000 +0100 +++ osmosis/build.xml 2012-01-11 16:46:53.000000000 +0100 @@ -10,6 +10,7 @@ + Index: osmosis/pgsimple/ivy.xml =================================================================== --- osmosis.orig/pgsimple/ivy.xml 2012-01-11 16:33:29.000000000 +0100 +++ osmosis/pgsimple/ivy.xml 2012-01-11 16:46:53.000000000 +0100 @@ -32,7 +32,7 @@ - + Index: osmosis/pgsnapshot/ivy.xml =================================================================== --- osmosis.orig/pgsnapshot/ivy.xml 2012-01-11 16:33:29.000000000 +0100 +++ osmosis/pgsnapshot/ivy.xml 2012-01-11 16:46:53.000000000 +0100 @@ -33,7 +33,7 @@ - + Index: osmosis/xml/ivy.xml =================================================================== --- osmosis.orig/xml/ivy.xml 2012-01-11 16:33:29.000000000 +0100 +++ osmosis/xml/ivy.xml 2012-01-11 16:46:53.000000000 +0100 @@ -31,5 +31,6 @@ + debian/patches/01-fix_launcher.patch0000644000000000000000000000343011703362632014526 0ustar From: David Paleino Subject: fix launcher to correctly point to installed files Forwarded: not-needed --- package/bin/osmosis | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) Index: osmosis/package/bin/osmosis =================================================================== --- osmosis.orig/package/bin/osmosis 2012-01-11 16:33:29.000000000 +0100 +++ osmosis/package/bin/osmosis 2012-01-11 16:46:53.000000000 +0100 @@ -5,8 +5,8 @@ # JAVACMD_OPTIONS - The options to append to the java command, typically used to modify jvm settings such as max memory. # OSMOSIS_OPTIONS - The options to apply to all osmosis invocations, typically used to add plugins or make quiet operation the default. -if [ -f /etc/osmosis ] ; then - . /etc/osmosis +if [ -f /etc/osmosis/osmosis.conf ] ; then + . /etc/osmosis/osmosis.conf fi if [ -f "$HOME/.osmosis" ] ; then @@ -80,15 +80,17 @@ fi # make it fully qualified -saveddir=`pwd` -MYAPP_HOME=`dirname "$PRG"`/.. -MYAPP_HOME=`cd "$MYAPP_HOME" && pwd` -cd "$saveddir" +MYAPP_HOME="/usr/share/osmosis" +LIBRARIES_HOME="/usr/share/java" # Build up the classpath of required jar files via classworlds launcher. -MYAPP_CLASSPATH=$MYAPP_HOME/lib/default/plexus-classworlds-*.jar +MYAPP_CLASSPATH=$LIBRARIES_HOME/plexus-classworlds.jar MAINCLASS=org.codehaus.classworlds.Launcher -EXEC="$JAVACMD $JAVACMD_OPTIONS -cp $MYAPP_CLASSPATH -Dapp.home=$MYAPP_HOME -Dclassworlds.conf=$MYAPP_HOME/config/plexus.conf $MAINCLASS $OSMOSIS_OPTIONS" +EXEC="$JAVACMD $JAVACMD_OPTIONS -cp $MYAPP_CLASSPATH" +EXEC="$EXEC -Dapp.home=$MYAPP_HOME" +EXEC="$EXEC -Dclassworlds.conf=/etc/osmosis/plexus.conf" +EXEC="$EXEC -Dlog4j.configuration=file:/etc/osmosis/log4j.properties" +EXEC="$EXEC $MAINCLASS $OSMOSIS_OPTIONS" exec $EXEC "$@" debian/patches/02-fix_plexus.patch0000644000000000000000000000235511776752441014266 0ustar From: David Paleino Subject: fix Plexus configuration with the right paths Forwarded: not-needed --- package/config/plexus.conf | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) Index: osmosis/package/config/plexus.conf =================================================================== --- osmosis.orig/package/config/plexus.conf 2012-06-15 12:18:41.000000000 +0200 +++ osmosis/package/config/plexus.conf 2012-06-15 12:42:47.000000000 +0200 @@ -1,5 +1,19 @@ main is org.openstreetmap.osmosis.core.Osmosis from osmosis.core [osmosis.core] -load ${app.home}/lib/default/*.jar -load ${app.home}/config +load /usr/share/java/jpf.jar +load /usr/share/java/commons-compress.jar +load /usr/share/java/commons-codec.jar +load /usr/share/java/commons-dbcp.jar +load /usr/share/java/mysql-connector-java.jar +load /usr/share/java/postgis.jar +load /usr/share/java/postgresql.jar +load /usr/share/java/spring3-beans.jar +load /usr/share/java/spring3-core.jar +load /usr/share/java/spring3-jdbc.jar +load /usr/share/java/spring3-transaction.jar +load /usr/share/java/batik-ext.jar +load /usr/share/java/protobuf.jar +load /usr/share/java/osmpbf.jar +load /usr/share/java/commons-pool.jar +load /usr/share/osmosis/*.jar debian/patches/06-no-woodstox.patch0000644000000000000000000000216711776752441014405 0ustar From: David Paleino Subject: fix missing woodstox dependency Forwarded: no --- core/ivy.xml | 4 ---- 1 file changed, 4 deletions(-) Index: osmosis/core/ivy.xml =================================================================== --- osmosis.orig/core/ivy.xml 2012-06-15 12:01:32.000000000 +0200 +++ osmosis/core/ivy.xml 2012-06-15 12:08:29.000000000 +0200 @@ -25,10 +25,6 @@ - - - - debian/docs0000644000000000000000000000001511677147564010057 0ustar doc/* README debian/README.source0000644000000000000000000000044611677147564011373 0ustar osmosis for Debian ------------------ This tarball is obtained from the upstream distributed one after having: * deleted osmosis.jar * deleted the doc/api/ directory * deleted all the jars in lib/ No other changes are made on it. -- Giovanni Mascellani debian/osmosis.10000644000000000000000000000671311677147564010775 0ustar '\" t .\" Title: OSMOSIS .\" Author: Giovanni Mascellani .\" Generator: DocBook XSL Stylesheets v1.75.2 .\" Date: 04/01/2010 .\" Manual: Osmosis User Manual .\" Source: osmosis .\" Language: English .\" .TH "OSMOSIS" "1" "04/01/2010" "osmosis" "Osmosis User Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ .\" http://bugs.debian.org/507673 .\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ .ie \n(.g .ds Aq \(aq .el .ds Aq ' .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) .ad l .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- .SH "NAME" osmosis \- command line OpenStreetMap data processor .SH "SYNOPSIS" .HP \w'\fBosmosis\fR\ 'u \fBosmosis\fR [\fB\-\-command\ \fR\fBcommand\ parameters\ \&.\&.\&.\fR] \&.\&.\&. .SH "DESCRIPTION" .PP This manual page documents briefly the \fBosmosis\fR command\&. .PP This manual page was written for the Debian distribution because the original program does not have a manual page\&. .PP \fBosmosis\fR is a command\-line Java program that processes OpenStreetMap data\&. It consistes of a series of component which can be chained together in order to perform operations on OpenStreetMap databases or XML files\&. .PP Such options include: .sp .RS 4 .ie n \{\ \h'-04'\(bu\h'+03'\c .\} .el \{\ .sp -1 .IP \(bu 2.3 .\} Generate and load dumps from and to a database\&. .RE .sp .RS 4 .ie n \{\ \h'-04'\(bu\h'+03'\c .\} .el \{\ .sp -1 .IP \(bu 2.3 .\} Produce changesets comparing databases and files and applying them to other databases and files\&. .RE .sp .RS 4 .ie n \{\ \h'-04'\(bu\h'+03'\c .\} .el \{\ .sp -1 .IP \(bu 2.3 .\} Sort data contained in a file\&. .RE .sp .RS 4 .ie n \{\ \h'-04'\(bu\h'+03'\c .\} .el \{\ .sp -1 .IP \(bu 2.3 .\} Extract data contained in a bounding box or in a polygon\&. .RE .SH "OPTIONS" .PP The commands and arguments accepted by \fBosmosis\fR are described in details and shown in examples in the page \m[blue]\fB\%http://wiki.openstreetmap.org/wiki/Osmosis\fR\m[] and its subpages\&. .SH "BUGS" .PP The upstreams BTS can be found at \m[blue]\fB\%http://trac.openstreetmap.org/\fR\m[]\&. Bugs are also discussed on upstream mailing list, at \m[blue]\fB\%http://lists.openstreetmap.org/listinfo/dev\fR\m[]\&. .SH "AUTHOR" .PP \fBGiovanni Mascellani\fR <\&mascellani@poisson\&.phc\&.unipi\&.it\&> .RS 4 Wrote this manpage for the Debian system\&. .RE .SH "COPYRIGHT" .br Copyright \(co 2009 Giovanni Mascellani .br .PP This manual page was written for the Debian system (and may be used by others)\&. .PP Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 3 or (at your option) any later version published by the Free Software Foundation\&. .PP On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL\&. .sp