[DebianGIS-dev] r2733 - packages/osm2pgsql/trunk/debian

[frankie at alioth.debian.org]

Author: frankie
Date: 2010-02-22 16:17:30 +0000 (Mon, 22 Feb 2010)
New Revision: 2733

Modified:
   packages/osm2pgsql/trunk/debian/changelog
   packages/osm2pgsql/trunk/debian/control
   packages/osm2pgsql/trunk/debian/rules
Log:
Minor changes.


Modified: packages/osm2pgsql/trunk/debian/changelog
===================================================================
--- packages/osm2pgsql/trunk/debian/changelog	2010-02-22 13:08:15 UTC (rev 2732)
+++ packages/osm2pgsql/trunk/debian/changelog	2010-02-22 16:17:30 UTC (rev 2733)
@@ -1,3 +1,11 @@
+osm2pgsql (0.69+r20104-3) UNRELEASED; urgency=low
+
+  * Changed debian/rules to autodetect latest svn revision and upstream version. 
+  * Now recommends both postgis and last available postgresql-postgis revision.
+    (closes: #559604)
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Mon, 22 Feb 2010 14:33:30 +0100
+
 osm2pgsql (0.69+r20104-1) unstable; urgency=low
 
   * Added 900913.sql, containing EPSG:900913 for postgis, as example. (Andreas)

Modified: packages/osm2pgsql/trunk/debian/control
===================================================================
--- packages/osm2pgsql/trunk/debian/control	2010-02-22 13:08:15 UTC (rev 2732)
+++ packages/osm2pgsql/trunk/debian/control	2010-02-22 16:17:30 UTC (rev 2733)
@@ -13,7 +13,7 @@
 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

Modified: packages/osm2pgsql/trunk/debian/rules
===================================================================
--- packages/osm2pgsql/trunk/debian/rules	2010-02-22 13:08:15 UTC (rev 2732)
+++ packages/osm2pgsql/trunk/debian/rules	2010-02-22 16:17:30 UTC (rev 2733)
@@ -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