On Sun, 5 Sep 2010 18:44:09 +0200, David Paleino wrote: > Please unblock package osm2pgsql. > > unblock osm2pgsql/0.69+r20104-2 Sorry, forgot to attach the debdiff. Please find it attached. Kindly, David -- . ''`. Debian developer | http://wiki.debian.org/DavidPaleino : :' : Linuxer #334216 --|-- http://www.hanskalabs.net/ `. `'` GPG: 1392B174 ----|---- http://deb.li/dapal `- 2BAB C625 4E66 E7B8 450A C3E1 E6AA 9017 1392 B174
diff -u osm2pgsql-0.69+r20104/debian/changelog osm2pgsql-0.69+r20104/debian/changelog
--- osm2pgsql-0.69+r20104/debian/changelog
+++ osm2pgsql-0.69+r20104/debian/changelog
@@ -1,3 +1,18 @@
+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@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)
@@ -7,10 +22,6 @@
* Added Vcs-* fields to debian/control.
* Policy bumped to 3.8.4 without changes.
* Added a new set of examples (gazetteer and other scripts).
- * New upstream svn snapshot as taken from upstream svn. Now using svn release
- number instead of date to identify better the relevant snapshot.
- * Added Svn-* fields to debian/control.
- * Policy bumped to 3.8.4 without changes.
-- Francesco Paolo Lovergine <frankie@debian.org> Mon, 22 Feb 2010 10:43:12 +0100
diff -u osm2pgsql-0.69+r20104/debian/control osm2pgsql-0.69+r20104/debian/control
--- osm2pgsql-0.69+r20104/debian/control
+++ osm2pgsql-0.69+r20104/debian/control
@@ -3,17 +3,18 @@
Priority: optional
Maintainer: Debian GIS Project <pkg-grass-devel@lists.alioth.debian.org>
Uploaders: Andreas Putzo <andreas@putzo.net>, Francesco Paolo Lovergine <frankie@debian.org>
+ , David Paleino <dapal@debian.org>
DM-Upload-Allowed: yes
Build-Depends: debhelper (>= 7), dpatch, libbz2-dev, libgeos-dev, libpq-dev, libxml2-dev, libproj-dev
Standards-Version: 3.8.4
Homepage: http://wiki.openstreetmap.org/wiki/Osm2pgsql
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-grass/packages/osm2pgsql/
-Vcs-Svn: svn://svn.debian.org/pkg-grass/packages/osm2pgsql/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-grass/packages/osm2pgsql/trunk/
+Vcs-Svn: svn://svn.debian.org/pkg-grass/packages/osm2pgsql/trunk/
Package: osm2pgsql
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: postgresql-8.3-postgis
+Recommends: postgis, postgresql-8.4-postgis
Suggests: josm, gosmore
Description: Openstreetmap data to PostgreSQL converter
Convert OSM planet snapshot data to SQL suitable for loading
diff -u osm2pgsql-0.69+r20104/debian/rules osm2pgsql-0.69+r20104/debian/rules
--- osm2pgsql-0.69+r20104/debian/rules
+++ osm2pgsql-0.69+r20104/debian/rules
@@ -7,9 +7,9 @@
include /usr/share/dpatch/dpatch.make
SVNREPO := http://svn.openstreetmap.org/applications/utils/export/osm2pgsql
-SVNREV := 20104
-SUFFIX := +r20104
-VERSION := 0.69
+SVNREV := $(shell svn info $(SVNREPO)|grep Revision:|cut -d' ' -f2)
+SUFFIX := +r$(SVNREV)
+VERSION := $(shell dpkg-parsechangelog|grep Version|cut -d' ' -f2|cut -d+ -f1)
CFLAGS = -Wall -g
Attachment:
signature.asc
Description: PGP signature