[SCM] osm2pgsql branch, master, updated. debian/0.80.0+r27899-3-15-g1d48e99
Andreas Tille
tille at debian.org
Tue Sep 17 21:54:05 UTC 2013
The following commit has been merged in the master branch:
commit 1d48e99850318003061394185f94c3c3eda7c409
Merge: dd7237490d14f830e28fd37fd33fe5f6b03a223c 49aee0f05fdd000cec6a587b3b695161b3232a46
Author: Andreas Tille <tille at debian.org>
Date: Tue Sep 17 23:48:50 2013 +0200
Merge tag 'upstream/0.82.0'
Upstream version 0.82.0
Conflicts:
debian/changelog
debian/compat
debian/control
debian/copyright
debian/dirs
debian/rules
debian/source/format
diff --combined debian/changelog
index 6f8a367,003c747..0000000
deleted file mode 100644,100644
--- a/debian/changelog
+++ /dev/null
@@@ -1,167 -1,88 +1,0 @@@
- osm2pgsql (0.82.0-1) UNRELEASED; urgency=low
-
- [ Andrew Harvey ]
- * New SVN snapshot
- * Patches refreshed to apply to new source
- * Update debian/rules get-orig-source to not bother trying to remove the
- gazetteer as it is no longer included upstream
- * Update manpage
- * Add debian/watch documenting the situation of the upstream version number
-
- [ David Paleino ]
- * Dropped 02-backport_64bit_ids_support.patch, no more needed
- * Standards-Version bump to 3.9.4, no changes needed
- * Removed Andreas Putzo and DMUA flag from debian/control
-
- [ Andreas Tille ]
- * Added watch file
- * debian/control:
- - Add myself as Uploader (and drop pkg-osm team)
-
- -- Andreas Tille <tille at debian.org> Tue, 17 Sep 2013 23:21:42 +0200
-
- osm2pgsql (0.80.0+r27899-3) unstable; urgency=low
-
- * Update Recommends of postgresql-8.4-postgis to -9.1
- * Backport support for 64-bit IDs (Closes: #687965)
-
- -- David Paleino <dapal at debian.org> Sun, 23 Sep 2012 09:14:15 +0200
-
- osm2pgsql (0.80.0+r27899-1) unstable; urgency=low
-
- * New SVN snapshot
- * Strip the debian/ directory from the SVN checkout
- * Standards-Version bump to 3.9.3, no changes needed
- * Updated debian/copyright
- * Patches refreshed to apply to new source
- * Switch build-dependency from libgeos-dev to libgeos++-dev
-
- -- David Paleino <dapal at debian.org> Sun, 26 Feb 2012 21:37:38 +0100
-
- osm2pgsql (0.70.5+r25090-2) unstable; urgency=low
-
- * Fix Maintainer e-mail address
-
- -- David Paleino <dapal at debian.org> Wed, 19 Jan 2011 16:15:54 +0100
-
- osm2pgsql (0.70.5+r25090-1) unstable; urgency=low
-
- * New SVN snapshot
- * debian/control:
- - fix Vcs-* fields to point to the git repository.
- - added pkg-osm to Uploaders
- * Bump Standards-Version to 3.9.1, no changes needed
- * Use "3.0 (quilt)" format
- * Removed useless dpatch machinery
- * Use dh7 for debian/rules
- * Improve get-orig-source target
- * Wrapped multi-value fields in debian/control
- * Bump debhelper compatibility to 8
- * debian/docs updated
- * Use new DebianGIS e-mail address
- * Add Build-Dependencies on zlib, protobuf-c and dh-autoreconf
- * Use DEP-5 for debian/copyright
- * Clean protoc-generated files during the clean target
- * Updated manpage
- * Fix FTBFS, due to missing linkage with zlib (00-fix_build.patch)
- * Remove 'gazetteer' from the packaged examples. It has become quite huge
- (90M unpacked), and I suppose not much people need it. It might become
- a separate binary package in future, though.
- Also remove it from the "orig" tarball. I'll reintroduce it as soon
- as someone actually asks for it.
- * Don't actually build gazetteer (01-disable_gazetteer.patch)
-
- -- David Paleino <dapal at debian.org> Tue, 18 Jan 2011 22:13:02 +0100
-
- osm2pgsql (0.69+r20104-2) unstable; urgency=low
-
- [ Francesco Paolo Lovergine ]
- * Changed debian/rules to autodetect latest svn revision and upstream version.
- * Now recommends both postgis and last available postgresql-postgis revision.
- (closes: #559604)
- * Fixed previous changelog for repeated logs.
-
- [ David Paleino ]
- * debian/control:
- - fix Vcs-* fields to point to trunk only.
- - added myself to Uploaders
-
- -- David Paleino <dapal at debian.org> Sun, 05 Sep 2010 08:38:52 +0200
-
- osm2pgsql (0.69+r20104-1) unstable; urgency=low
-
- * Added 900913.sql, containing EPSG:900913 for postgis, as example. (Andreas)
- * New upstream svn snapshot as taken from upstream svn. Now using svn release
- number instead of date to identify better the relevant snapshot.
- * Patch 01_style_location merged upstream.
- * Added Vcs-* fields to debian/control.
- * Policy bumped to 3.8.4 without changes.
- * Added a new set of examples (gazetteer and other scripts).
-
- -- Francesco Paolo Lovergine <frankie at debian.org> Mon, 22 Feb 2010 10:43:12 +0100
-
- osm2pgsql (0.66.20090526-1) unstable; urgency=low
-
- * 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 <andreas at putzo.net> 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 <frankie at debian.org> 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 <andreas at putzo.net> 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 <andreas at putzo.net> 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 <andreas at putzo.net> Tue, 11 Dec 2007 19:18:26 +0000
-
- osm2pgsql (0.08.20071007-1) unstable; urgency=low
-
- * Initial release (Closes: #444705)
-
- -- Andreas Putzo <andreas at putzo.net> Sun, 07 Oct 2007 13:41:33 +0000
-
-osm2pgsql (0.80.0-13~precise1) precise; urgency=low
-
- * Update from upstream to svn version 28638
- - Implement a file based node lookup in slim mode
- - fix segfault if out of memory
-
- -- Kai Krueger <kakrueger at gmail.com> Sun, 26 Aug 2012 10:00:00 +0000
-
-osm2pgsql (0.80.0-12~precise1) precise; urgency=low
-
- * Update from upstream to svn version 28406
-
- -- Kai Krueger <kakrueger at gmail.com> Thu, 24 May 2012 10:00:00 +0000
-
-osm2pgsql (0.80.0-11~precise1) precise; urgency=low
-
- * Be less agressive on tile expiry
- * Fix gazeteer
-
- -- Kai Krueger <kakrueger at gmail.com> Sat, 14 Jan 2012 10:00:00 +0000
-
-osm2pgsql (0.80.0-10~lucid1) lucid; urgency=low
-
- * Improve handling of multiple processes. Gracefully fallback if creating of helper processes fails
- * Improve speed when fsync is enabled
- * Fix expiry code when using multiple processes
- * Introduce a --drop option, if updating is not needed but using --slim for memory saving purposes
- * Create an additional index on planet_osm_polygon to improve rendering speed
-
- -- Kai Krueger <kakrueger at gmail.com> Sun, 18 Dec 2011 10:00:00 +0000
-
-osm2pgsql (0.80.0-9~lucid1) lucid; urgency=low
-
- * Bugfix: incorrectly round lat / lon to 2 s.f. in -l projection
- * Reduce virtual memory usage to reduce chance of out of memory errors
-
- -- Kai Krueger <kakrueger at gmail.com> Thu, 3 Nov 2011 10:00:00 +0000
-
-osm2pgsql (0.80.0-8~oneiric1) oneiric; urgency=low
-
- * Bugfix: Did not handle cache values larger than 2Gb correctly
-
- -- Kai Krueger <kakrueger at gmail.com> Sat, 22 Oct 2011 10:00:00 +0000
-
-osm2pgsql (0.80.0-7~natty2) natty; urgency=low
-
- * Memory optimize the node cache to handle larger extracts
- * parallelize parts of the import and diff processing
-
- -- Kai Krueger <kakrueger at gmail.com> Sun, 16 Oct 2011 10:00:00 +0000
-
-osm2pgsql (0.80.0-6~oneiric1) oneiric; urgency=low
-
- * Add a script to add permissions to a db afterwards
-
- * Handle postgresql 9.1
-
- -- Kai Krueger <kakrueger at gmail.com> Sun, 09 Oct 2011 10:00:00 +0000
-
-osm2pgsql (0.80.0-5~oneiric1) oneiric; urgency=low
-
- * Fix debian package scripts.
-
- -- Kai Krueger <kakrueger at gmail.com> Fri, 07 Oct 2011 10:00:00 +0000
-
-osm2pgsql (0.80.0) lucid; urgency=low
-
- * version 0.80 does not use intarray any longer.
-
- -- Frederik Ramm <frederik at remote.org> Wed, 03 Aug 2011 15:03:42 +0200
-
-osm2pgsql (0.70.5-karmic1) karmic; urgency=low
-
- * 0.70.5 build
-
- -- Frederik Ramm <frederik at remote.org> Sat, 29 Jan 2011 12:11:42 +0000
-
-osm2pgsql (0.69) jaunty; urgency=low
-
- * v0.69
-
- -- Frederik Ramm <frederik at remote.org> Wed, 04 Nov 2009 09:51:59 +0100
-
-osm2pgsql (0.65) unstable; urgency=low
-
- * Initial standalone debian package
-
- -- Frederik Ramm <frederik at remote.org> Fri, 13 Mar 2009 00:14:15 +0100
diff --combined debian/compat
index 45a4fb7,7f8f011..0000000
deleted file mode 100644,100644
--- a/debian/compat
+++ /dev/null
@@@ -1,1 -1,1 +1,0 @@@
- 8
-7
diff --combined debian/control
index bf1f7e1,f0d4ac7..0000000
deleted file mode 100644,100644
--- a/debian/control
+++ /dev/null
@@@ -1,40 -1,23 +1,0 @@@
--Source: osm2pgsql
--Section: utils
--Priority: optional
- Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
- Uploaders:
- Francesco Paolo Lovergine <frankie at debian.org>
- , David Paleino <dapal at debian.org>
- , Andreas Tille <tille at debian.org>
- Build-Depends:
- debhelper (>= 8~)
- , dh-autoreconf
- , libbz2-dev
- , zlib1g-dev
- , libgeos++-dev
- , libpq-dev
- , libxml2-dev
- , libproj-dev
- , libprotobuf-c0-dev (>= 0.14)
- , protobuf-c-compiler
- Standards-Version: 3.9.4
- Homepage: http://wiki.openstreetmap.org/wiki/Osm2pgsql
- Vcs-Browser: http://git.debian.org/?p=pkg-grass/osm2pgsql.git
- Vcs-Git: git://git.debian.org/pkg-grass/osm2pgsql.git
-
- Package: osm2pgsql
- Architecture: any
- Depends:
- ${shlibs:Depends}
- , ${misc:Depends}
- Recommends:
- postgis
- , postgresql-9.1-postgis
- Suggests:
- josm
- , gosmore
- Description: OpenStreetMap data to PostgreSQL converter
- 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.
-Maintainer: Frederik Ramm <frederik at remote.org>
-Build-Depends: debhelper (>= 7), libgeos-dev, libxml2-dev, libpq-dev, proj | libproj0, libbz2-dev, automake, autoconf, libtool, protobuf-c-compiler, libprotobuf-c0-dev
-Standards-Version: 3.9.3
-
-Package: osm2pgsql
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: postgresql, postgresql-8.4-postgis | postgresql-9.1-postgis, openstreetmap-postgis-db-setup
-Conflicts: openstreetmap-utils
-Description: Openstreetmap data to PostgreSQL converter
- osm2pgsql imports OpenStreetMap data into a PostGIS database.
-
-Package: openstreetmap-postgis-db-setup
-Architecture: all
-Depends: ${misc:Depends}, debconf, postgis, postgresql-8.4-postgis | postgresql-9.1-postgis, postgresql-contrib
-Recommends: osm2pgsql
-Suggests: libapache2-mod-tile, openstreetmap-mapnik-data
-Description: Provides setup scripts to create a postgis database for OpenStreetMap
- The database can be used with e.g. osm2pgsql to load data and mapnik for rendering
- It sets up a database named 'gis'
diff --combined debian/copyright
index 21ef622,02bbe06..0000000
deleted file mode 100644,100644
--- a/debian/copyright
+++ /dev/null
@@@ -1,77 -1,4 +1,0 @@@
- Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0
- Upstream-Source: http://svn.openstreetmap.org/applications/utils/export/osm2pgsql/
-
- Files: *
- Copyright: © 2007-2008, Artem Pavlenko <artem at mapnik.org>
- © 2006-2008, Jon Burgess <jburgess777 at googlemail.com>
- License: GPL-2+
-
- Files: debian/*
- Copyright: © 2007-2009, Andreas Putzo <andreas at putzo.net>
- © 2010-2012, David Paleino <dapal at debian.org>
- License: GPL-2+
-
- Files: geos-fallback/*
- Copyright: © 2006, Refractions Research Inc.
- License: LGPL-3+
-
- Files: rb.c
- Copyright: © 1998-2002, 2004, Free Software Foundation, Inc.
- License: GPL-2+
-
- Files: sprompt.c
- Copyright: © 1994, The Regents of the University of California
- © 1996-2006, PostgreSQL Global Development Group
- License: other
-
- License: GPL-2+
- 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 program. If not, see <http://www.gnu.org/licenses/>.
- .
- On Debian systems, the complete text of the GNU General Public License
- version 2 or later can be found in `/usr/share/common-licenses/GPL-2'.
-
- License: other
- 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.
-
- License: LGPL-3+
- This package is free software; you can redistribute it and/or modify
- it under the terms of the GNU Lesser General Public License as published by
- the Free Software Foundation; either version 3 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 Lesser General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
- .
- On Debian systems, the complete text of the GNU Lesser General Public License
- version 3 or later can be found in `/usr/share/common-licenses/LGPL-3'.
-Licensed under GPL v2 or later
-The full license text can be found at /usr/share/common-licenses/GPL-2
-Various authors, as per http://svn.openstreetmap.org/applications/utils/export/osm2pgsql/
-
diff --combined debian/dirs
index e772481,4c79d0d..0000000
deleted file mode 100644,100644
--- a/debian/dirs
+++ /dev/null
@@@ -1,1 -1,2 +1,0 @@@
--usr/bin
-usr/share/osm2pgsql
diff --combined debian/rules
index d6c934d,ef07506..0000000
deleted file mode 100755,100755
--- a/debian/rules
+++ /dev/null
@@@ -1,34 -1,93 +1,0 @@@
--#!/usr/bin/make -f
- # debian/rules for osm2pgsql
- #
- # Uncomment this to turn on verbose mode.
- #export DH_VERBOSE=1
-
- SVNREPO := http://svn.openstreetmap.org/applications/utils/export/osm2pgsql
- VERSION := $(shell dpkg-parsechangelog | grep Version | cut -d' ' -f2)
- UPVER := $(shell echo $(VERSION) | awk -F'+r' '{print $$1}')
- SVNREV := $(shell echo $(VERSION) | awk -F'+r' '{print $$2}' | cut -d- -f1)
- SUFFIX := +r$(SVNREV)
-
- %:
- dh $@ \
- --with autoreconf
-
- override_dh_compress:
- # clean up some naive file permissions
- dh_compress -X.php -X.sql -X.js -X.c -X.h
-
- get-orig-source:
- @echo Downloading osm2pgsql from ${SVNREPO}
- svn export -r ${SVNREV} ${SVNREPO} osm2pgsql-${UPVER}${SUFFIX}/
- @echo Removing debian/ directory
- rm -rf osm2pgsql-${UPVER}${SUFFIX}/debian/
- @echo Building snapshot tarball.
- tar czvf osm2pgsql_${UPVER}${SUFFIX}.orig.tar.gz osm2pgsql-${UPVER}${SUFFIX}
- @echo Cleaning up
- rm -rf osm2pgsql-${UPVER}${SUFFIX}
- @echo .
- @echo To update debian/changelog type
- @echo dch -v ${UPVER}${SUFFIX}-1
- @echo .
-
-# -*- 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.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-configure: configure-stamp
-configure-stamp:
- dh_testdir
-
- # Add here commands to configure the package.
-
- touch configure-stamp
-
-build: build-arch build-indep
-build-arch: build-stamp
-build-indep: build-stamp
-build-stamp: configure-stamp
- dh_testdir
-
- # Add here commands to compile the package.
- ./autogen.sh
- automake --add-missing
- aclocal
- autoreconf -f
- ./configure --prefix=/usr --datadir=/usr/share/osm2pgsql
- $(MAKE)
- #docbook-to-man debian/osm2pgsql.sgml > osm2pgsql.1
-
- touch $@
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp configure-stamp
-
- # Add here commands to clean up after the build process.
- $(MAKE) clean || /bin/true
-
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- 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_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
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
diff --combined debian/source/format
index 163aaf8,89ae9db..0000000
deleted file mode 100644,100644
--- a/debian/source/format
+++ /dev/null
@@@ -1,1 -1,1 +1,0 @@@
- 3.0 (quilt)
-3.0 (native)
--
OpenStreetMap data to PostgreSQL converter
More information about the Pkg-grass-devel
mailing list