--- osm2pgsql-0.66.20090526.orig/debian/dirs +++ osm2pgsql-0.66.20090526/debian/dirs @@ -1,2 +1 @@ usr/bin -usr/share/osm2pgsql --- osm2pgsql-0.66.20090526.orig/debian/docs +++ osm2pgsql-0.66.20090526/debian/docs @@ -0,0 +1 @@ +README.txt --- osm2pgsql-0.66.20090526.orig/debian/control +++ osm2pgsql-0.66.20090526/debian/control @@ -1,13 +1,20 @@ Source: osm2pgsql Section: utils Priority: optional -Maintainer: Frederik Ramm -Build-Depends: debhelper (>= 7), libgeos-dev, libxml2-dev, libpq-dev, dpatch, proj, libbz2-dev -Standards-Version: 3.8.0 +Maintainer: Debian GIS Project +Uploaders: Andreas Putzo , Francesco Paolo Lovergine +DM-Upload-Allowed: yes +Build-Depends: debhelper (>= 7), dpatch, libbz2-dev, libgeos-dev, libpq-dev, libxml2-dev, libproj-dev +Standards-Version: 3.8.1 +Homepage: http://wiki.openstreetmap.org/wiki/Osm2pgsql Package: osm2pgsql Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, libgeos-3.0.0, libxml2, libpq5 -Conflicts: openstreetmap-utils +Depends: ${shlibs:Depends}, ${misc:Depends} +Recommends: postgresql-8.3-postgis +Suggests: josm, gosmore Description: Openstreetmap data to PostgreSQL converter - osm2pgsql imports OpenStreetMap data into a PostGIS database. + Convert OSM planet snapshot data to SQL suitable for loading + into a PostgreSQL database with PostGIS geospatial extensions. This + database may then be used to render maps with Mapnik or for other + geospatial analysis. --- osm2pgsql-0.66.20090526.orig/debian/rules +++ osm2pgsql-0.66.20090526/debian/rules @@ -1,91 +1,79 @@ #!/usr/bin/make -f -# -*- makefile -*- -# Sample debian/rules that uses debhelper. -# This file was originally written by Joey Hess and Craig Small. -# As a special exception, when this file is copied by dh-make into a -# dh-make output file, you may use that output file without restriction. -# This special exception was added by Craig Small in version 0.37 of dh-make. - +# debian/rules for osm2pgsql +# # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -configure: configure-stamp -configure-stamp: patch +include /usr/share/dpatch/dpatch.make + +SVNREPO := http://svn.openstreetmap.org/applications/utils/export/osm2pgsql +SVNREV := 15176 +VERSION := 0.66 +DATE := $(shell date +%Y%m%d) + +CFLAGS = -Wall -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif + +get-orig-source: dh_testdir - - # Add here commands to configure the package. + test -d ../tarballs/. || mkdir -p ../tarballs + @echo Downloading osm2pgsql from ${SVNREPO} + svn export -r ${SVNREV} ${SVNREPO} ../tarballs/osm2pgsql-${VERSION}.${DATE}/ + @echo Removing debian dir + rm -rf ../tarballs/osm2pgsql-${VERSION}-${DATE}/debian/ + @echo Building snapshot tarball. + tar czvf ../tarballs/osm2pgsql_${VERSION}.${DATE}.orig.tar.gz -C ../tarballs osm2pgsql-${VERSION}.${DATE} + @echo Cleaning up + rm -rf ../tarballs/osm2pgsql-${VERSION}.${DATE} + @echo . + @echo To update debian/changelog type + @echo dch -v ${VERSION}.${DATE}-1 + @echo . +configure: configure-stamp +configure-stamp: + dh_testdir touch configure-stamp -build: build-stamp +build: patch build-stamp -build-stamp: configure-stamp +build-stamp: configure-stamp dh_testdir - - # Add here commands to compile the package. $(MAKE) - #docbook-to-man debian/osm2pgsql.sgml > osm2pgsql.1 - touch $@ -clean: unpatch +clean: clean-patched unpatch +clean-patched: dh_testdir dh_testroot rm -f build-stamp configure-stamp - - # Add here commands to clean up after the build process. - $(MAKE) clean - - dh_clean - -patch: patch-stamp -patch-stamp: - dpatch apply-all - dpatch cat-all >patch-stamp - -unpatch: - dpatch deapply-all - rm -rf patch-stamp debian/patched + [ ! -f Makefile ] || $(MAKE) clean + dh_clean install: build dh_testdir dh_testroot - dh_clean -k + dh_prep dh_installdirs - # Add here commands to install the package into debian/osm2pgsql. - $(MAKE) DESTDIR=$(CURDIR)/debian/osm2pgsql install - - -# Build architecture-independent files here. binary-indep: build install -# We have nothing to do by default. -# Build architecture-dependent files here. binary-arch: build install dh_testdir dh_testroot - dh_installchangelogs + dh_installchangelogs dh_installdocs - dh_installexamples dh_install -# dh_installmenu -# dh_installdebconf -# dh_installlogrotate -# dh_installemacsen -# dh_installpam -# dh_installmime -# dh_python -# dh_installinit -# dh_installcron -# dh_installinfo dh_installman dh_link dh_strip dh_compress dh_fixperms -# dh_perl -# dh_makeshlibs dh_installdeb dh_shlibdeps dh_gencontrol @@ -93,4 +81,4 @@ dh_builddeb binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install configure +.PHONY: build clean binary-indep binary-arch binary install configure get-orig-source --- osm2pgsql-0.66.20090526.orig/debian/changelog +++ osm2pgsql-0.66.20090526/debian/changelog @@ -1,5 +1,65 @@ -osm2pgsql (0.65) unstable; urgency=low +osm2pgsql (0.66.20090526-1) unstable; urgency=low - * Initial standalone debian package + * New upstream svn snapshot. (Closes: #532145) + * Removed 10-missing-includes patch, fixed upstream. + * Updated long description, mostly taken from osm2pgsql.spec.in. + * Updated copyright year of debian packaging. + * Added DM-Upload-Allowed to debian/control. + * Added 01_style_location patch from Frederik Ramm to reflect + path of style files on debian systems. + * Use dh_prep instead of dh_clean -k to fix a lintian warning. + * Updated manpage. + + -- Andreas Putzo Mon, 08 Jun 2009 21:44:57 +0000 + +osm2pgsql (0.52.20080408-3) unstable; urgency=high + + * Updated build-dep: proj -> libproj-dev. + * Added Homepage field. + * Added me as uploader. + * Policy bumped to 3.8.1. + * Debhelper compatibility moved to 7. + * Now recommends postgis 8.3 extension. + * Added me as uploader. + + -- Francesco Paolo Lovergine Tue, 26 May 2009 15:43:48 +0200 + +osm2pgsql (0.52.20080408-2) unstable; urgency=low + + * Added 10-missing-includes.dpatch to actually build with + gcc-4.3. Thanks Chris Lamb for the patch. (Closes: #475692) + * Added dpatch to Build-Depends in debian/control. + Added patch targets to debian/rules. + * Added a get-orig-source target to debian/rules to fetch upstream + source from svn repository. + * Bumped debhelper compatibility level to 5. + + * Upload sponsored by Petter Reinholdtsen. + + -- Andreas Putzo Sat, 12 Apr 2008 23:27:12 +0000 + +osm2pgsql (0.52.20080408-1) unstable; urgency=low + + * New upstream snapshot. (Closes: #474846) + * Adopt rename of readme.txt in debian/docs. + * Update manual page from usage output. (Closes: #468767) + * Add license and copyright of added file sprompt.c to debian/copyright. + + * Upload sponsored by Petter Reinholdtsen. + + -- Andreas Putzo Fri, 11 Apr 2008 22:43:08 +0000 + +osm2pgsql (0.50.20071211-1) unstable; urgency=low + + * New upstream snapshot + - Missing includes added (FTBS with gcc-4.3) (Closes: #454849) + * Bumped Standards-Version to 3.7.3 + + -- Andreas Putzo Tue, 11 Dec 2007 19:18:26 +0000 + +osm2pgsql (0.08.20071007-1) unstable; urgency=low + + * Initial release (Closes: #444705) + + -- Andreas Putzo Sun, 07 Oct 2007 13:41:33 +0000 - -- Frederik Ramm Fri, 13 Mar 2009 00:14:15 +0100 --- osm2pgsql-0.66.20090526.orig/debian/osm2pgsql.1 +++ osm2pgsql-0.66.20090526/debian/osm2pgsql.1 @@ -1,4 +1,4 @@ -.TH OSM2PGSQL 1 "March 13, 2009" +.TH OSM2PGSQL 1 "May 26, 2009" .\" Please adjust this date whenever revising the manpage. .SH NAME osm2pgsql \- Openstreetmap data to PostgreSQL converter. @@ -21,14 +21,7 @@ imports data from OSM file(s) into a PostgreSQL database suitable for use by the Mapnik renderer. .br -OSM planet snapshots can be downloaded from http://planet.openstreetmap.org/. -Partial planet files ("extracts") for various countries are available, see -http://wiki.openstreetmap.org/wiki/Planet.osm. -.PP -When operating in "slim" mode (and on a database created in "slim" mode!), -.B osm2pgsql -can also process OSM change files (osc files), thereby bringing an existing -database up to date. +OSM planet snapshots can be downloaded from http://planet.openstreetmap.org .PP .SH OPTIONS These programs follow the usual GNU command line syntax, with long @@ -56,10 +49,10 @@ Store data in degrees of latitude & longitude. .TP \fB\-m\fR|\-\-merc -Store data in proper spherical mercator (the default) +Store data in proper spherical mercator (default) .TP \fB\-M\fR|\-\-oldmerc -Store data in the legacy OSM mercator format +Store data in the legay OSM mercator format .TP \fB\-E\fR|\-\-proj num Use projection EPSG:num @@ -72,13 +65,13 @@ Prefix for table names (default planet_osm) .TP \fB\-s\fR|\-\-slim -Store temporary data in the database. This greatly reduces the RAM usage but is much slower. +Store temorary data in the database. This greatly reduces the RAM usage but is much slower. .TP \fB\-S\fR|\-\-style -Location of the style file. Defaults to /usr/share/osm2pgsql/default.style. +Location of the style file. Default to /usr/share/osm2pgsql/default.style .TP \fB\-C\fR|\-\-cache -Only for slim mode: Use upto this many MB for caching nodes. Defaults to 800. +Only for slim mode: Use up to this this many MB for caching nodes. Default is 800MB. .TP \fB\-U\fR|\-\-username Postgresql user name. @@ -92,16 +85,23 @@ \fB\-P\fR|\-\-port Database server port. .TP -\fB\-e\fR|\-\-expire-tiles [min_zoom-]max-zoom +\fB\-e\fR|\-\-expire-tiles [min_zoom-]max_zoom Create a tile expiry list. .TP -\fB\-o\fR|\-\-expire-output +\fB\-o\fR|\-\-expire-output filename Output filename for expired tiles list. .TP +\fB\-O\fR|\-\-output +Output backend. +pgsql - Output to a PostGIS database. (default) +null - No output. Useful for testing. +.TP \fB\-h\fR|\-\-help Help information. .br -Add \fB\-v\fR to display supported projections. +Add \fB\-vh\fR to display supported projections. +.br +Use \fB\-E\fR to access any espg projections (usually in /usr/share/proj/epsg) .TP \fB\-v\fR|\-\-verbose Verbose output. @@ -109,7 +109,7 @@ .SH SUPPORTED PROJECTIONS Latlong (-l) SRS: 4326 (none) .br -WGS84 Mercator ( ) SRS: 3395 +proj=merc +datum=WGS84 +k=1.0 +units=m +over +no_defs +WGS84 Mercator (-M) SRS: 3395 +proj=merc +datum=WGS84 +k=1.0 +units=m +over +no_defs .br Spherical Mercator (-m) SRS:900913 +proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +no_defs +over .PP @@ -118,8 +118,7 @@ .BR postgres (1). .br .SH AUTHOR -osm2pgsql was written by Jon Burgess, Artem Pavlenko, and other -OpenStreetMap project members. +osm2pgsql was written by Jon Burgess and Artem Pavlenko. .PP -This manual page was written by Andreas Putzo -for the Debian project, and amended by OpenStreetMap authors. +This manual page was written by Andreas Putzo , +for the Debian project (but may be used by others). --- osm2pgsql-0.66.20090526.orig/debian/copyright +++ osm2pgsql-0.66.20090526/debian/copyright @@ -1,3 +1,66 @@ -Licensed under GPL v2 or later -Various authors, as per http://svn.openstreetmap.org/applications/utils/export/osm2pgsql/ +This package was debianized by Andreas Putzo on +Sun, 30 Sep 2007 10:57:29 +0000. +It was downloaded using svn from +http://svn.openstreetmap.org/applications/utils/export/osm2pgsql/. + +Upstream Authors: + + Jon Burgess + Artem Pavlenko + +Copyright: + + Copyright (C) 2006,2007,2008 Jon Burgess + Copyright (C) 2007,2007 Artem Pavlenko + +License: + + This package 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 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'. + + +rb.c: Copyright (C) 1998-2002, 2004 Free Software Foundation, Inc. + Upstream Author: Ben Pfaff + License: GPL, see above. + + +sprompt.c: Copyright (c) 1994, The Regents of the University of California + Copyright (c) 1996-2006, PostgreSQL Global Development Group + +License: + + Permission to use, copy, modify, and distribute this software and its + documentation for any purpose, without fee, and without a written agreement + is hereby granted, provided that the above copyright notice and this + paragraph and the following two paragraphs appear in all copies. + + IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR + DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING + LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS + DOCUMENTATION, EVEN IF THE UNIVERSITY OF CALIFORNIA HAS BEEN ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. + + THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES, + INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY + AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS + ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATIONS TO + PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + + +The Debian packaging is (C) 2007-2009 Andreas Putzo and +is licensed under the GPL, see above. --- osm2pgsql-0.66.20090526.orig/debian/install +++ osm2pgsql-0.66.20090526/debian/install @@ -0,0 +1,2 @@ +osm2pgsql /usr/bin/ +default.style /usr/share/osm2pgsql --- osm2pgsql-0.66.20090526.orig/debian/patches/01_style_location +++ osm2pgsql-0.66.20090526/debian/patches/01_style_location @@ -1,7 +1,6 @@ #! /bin/sh /usr/share/dpatch/dpatch-run ## 01_style_location.dpatch by ## -## All lines beginning with `## DP:' are a description of the patch. ## DP: Change default location of style file @DPATCH@