[SCM] osm2pgsql branch, master, updated. debian/0.80.0+r27899-3-16-g3919776

Andreas Tille tille at debian.org
Tue Sep 17 21:59:38 UTC 2013


The following commit has been merged in the master branch:
commit 39197763b305c2d6d8420ae7c5684352ece3c027
Author: Andreas Tille <tille at debian.org>
Date:   Tue Sep 17 23:53:58 2013 +0200

    Restore original debian/ packaging dir after readding the real files and removing unneeded files from upstream source

diff --git a/debian/README b/debian/README
deleted file mode 100644
index 6d53162..0000000
--- a/debian/README
+++ /dev/null
@@ -1,9 +0,0 @@
-The Debian Package osm2pgsql
-----------------------------
-
-Debian packaging stuff created to allow building a stand-alone osm2pgsql package.
-
-Unrelated to Joerg Ostertag's "openstreetmap-utils" package which also contains
-osm2pgsql!
-
- -- Frederik Ramm <frederik at remote.org>  Fri, 13 Mar 2009 00:14:15 +0100
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..6f8a367
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,167 @@
+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
+
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..45a4fb7
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+8
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..bf1f7e1
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,40 @@
+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.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..21ef622
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,77 @@
+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'.
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/openstreetmap-postgis-db-setup.config b/debian/openstreetmap-postgis-db-setup.config
deleted file mode 100755
index 7e37410..0000000
--- a/debian/openstreetmap-postgis-db-setup.config
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-set -e
-
-. /usr/share/debconf/confmodule
-
-db_input high openstreetmap-postgis-db-setup/initdb || true
-db_input high openstreetmap-postgis-db-setup/dbname || true
-db_input high openstreetmap-postgis-db-setup/grant_user || true
-db_go || true
-
-db_get openstreetmap-postgis-db-setup/initdb || true
-INIT_DB=$RET
-db_get openstreetmap-postgis-db-setup/grant_user || true
-GRANT_USER=$RET
-
-cat <<EOF > /etc/default/openstreetmap-postgis-db-setup
-# Default settings for openstreetmap-mapnik-data
-INIT_DB="$INIT_DB"
-GRANT_USER="$GRANT_USER"
-EOF
-
diff --git a/debian/openstreetmap-postgis-db-setup.install b/debian/openstreetmap-postgis-db-setup.install
deleted file mode 100644
index 44e8216..0000000
--- a/debian/openstreetmap-postgis-db-setup.install
+++ /dev/null
@@ -1,2 +0,0 @@
-install-postgis-osm-db.sh /usr/bin/
-install-postgis-osm-user.sh /usr/bin/
\ No newline at end of file
diff --git a/debian/openstreetmap-postgis-db-setup.postinst b/debian/openstreetmap-postgis-db-setup.postinst
deleted file mode 100755
index 4b96fbe..0000000
--- a/debian/openstreetmap-postgis-db-setup.postinst
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/sh 
-# postinst script for openstreetmap-mapnik-data
-#
-# see: dh_installdeb(1)
-
-set -e
-
-case "$1" in
-    configure)
-
-        . /usr/share/debconf/confmodule
-
-	db_get openstreetmap-postgis-db-setup/initdb || true
-	INIT_DB=$RET
-	
-	db_get openstreetmap-postgis-db-setup/dbname || true
-	DBNAME=$RET
-	
-	db_get openstreetmap-postgis-db-setup/grant_user || true
-	GRANT_USER=$RET
-
-	#echo "# Default settings for openstreetmap-mapnik-data" > /etc/default/openstreetmap-mapnik-data
-	#echo "GRANT_USER='$GRANT_USER' " >> /etc/default/openstreetmap-mapnik-data
-	#echo "INIT_DB='$INIT_DB' " >> /etc/default/openstreetmap-mapnik-data
-
-    # only call the install postgis script on the first configuration
-    # we don't want to delete and recreate the db on upgrades of osm2pgsql
-    if [ -z "$2" ] ; then
-	    if [ "x$INIT_DB" = "xtrue" ] ; then
-            export DBNAME GRANT_USER
-	        /usr/bin/install-postgis-osm-db.sh || true
-	    fi
-    fi
-	true
-	;;
-    
-    abort-upgrade|abort-remove|abort-deconfigure)
-    ;;
-
-    *)
-        echo "postinst called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/openstreetmap-postgis-db-setup.templates b/debian/openstreetmap-postgis-db-setup.templates
deleted file mode 100644
index bb29a2a..0000000
--- a/debian/openstreetmap-postgis-db-setup.templates
+++ /dev/null
@@ -1,23 +0,0 @@
-Template: openstreetmap-postgis-db-setup/initdb
-Type: boolean
-Default: true
-Description: Do you want to create a postgis db?
- Do you want these scripts to create and setup a new postgis 
- database ready to be used with e.g. Osm2pgsql.
- WARNING: This will delete an existing db
-
-Template: openstreetmap-postgis-db-setup/dbname
-Type: string
-Default: gis
-Description: Name of the database to create:
- If you don't use the default name, you might need to adapt programs
- and scripts to use the new name
-
-Template: openstreetmap-postgis-db-setup/grant_user
-Type: string
-Default: www-data
-Description: Other users that should have access to the db:
- Please specify which users should have access to the newly created db.
- You will want the user www-data for rendering and your own user name
- to import data into the db. The list of users is blank separated: 
- E.g. "www-data peter"
diff --git a/debian/osm2pgsql.install b/debian/osm2pgsql.install
deleted file mode 100644
index 99696ef..0000000
--- a/debian/osm2pgsql.install
+++ /dev/null
@@ -1,2 +0,0 @@
-default.style /usr/share/osm2pgsql
-osm2pgsql /usr/bin/
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..d6c934d
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,34 @@
+#!/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 .
+
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)

-- 
OpenStreetMap data to PostgreSQL converter



More information about the Pkg-grass-devel mailing list