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

[frankie at alioth.debian.org]

Author: frankie
Date: 2010-02-22 12:30:37 +0000 (Mon, 22 Feb 2010)
New Revision: 2721

Modified:
   packages/osm2pgsql/trunk/debian/changelog
   packages/osm2pgsql/trunk/debian/control
   packages/osm2pgsql/trunk/debian/examples
   packages/osm2pgsql/trunk/debian/rules
Log:
Update to a new snapshot.


Modified: packages/osm2pgsql/trunk/debian/changelog
===================================================================
--- packages/osm2pgsql/trunk/debian/changelog	2010-02-18 10:22:15 UTC (rev 2720)
+++ packages/osm2pgsql/trunk/debian/changelog	2010-02-22 12:30:37 UTC (rev 2721)
@@ -1,9 +1,13 @@
-osm2pgsql (0.66.20090526-2) UNRELEASED; urgency=low
+osm2pgsql (0.69+r20104-1) unstable; urgency=low
 
-  * NOT RELEASED YET
-  * Added 900913.sql, containing EPSG:900913 for postgis, as example.
+  * UNRELEASED.
+  * 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.
+  * Added Vcs-* fields to debian/control.
+  * Policy bumped to 3.8.4 without changes.
 
- -- Andreas Putzo <andreas at putzo.net>  Wed, 01 Jul 2009 19:33:44 +0000
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Mon, 22 Feb 2010 10:43:12 +0100
 
 osm2pgsql (0.66.20090526-1) unstable; urgency=low
 

Modified: packages/osm2pgsql/trunk/debian/control
===================================================================
--- packages/osm2pgsql/trunk/debian/control	2010-02-18 10:22:15 UTC (rev 2720)
+++ packages/osm2pgsql/trunk/debian/control	2010-02-22 12:30:37 UTC (rev 2721)
@@ -5,8 +5,10 @@
 Uploaders: Andreas Putzo <andreas at putzo.net>, Francesco Paolo Lovergine <frankie at 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.1
+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/
 
 Package: osm2pgsql
 Architecture: any

Modified: packages/osm2pgsql/trunk/debian/examples
===================================================================
--- packages/osm2pgsql/trunk/debian/examples	2010-02-18 10:22:15 UTC (rev 2720)
+++ packages/osm2pgsql/trunk/debian/examples	2010-02-22 12:30:37 UTC (rev 2721)
@@ -1 +1,3 @@
 900913.sql
+*.sh
+gazetteer

Modified: packages/osm2pgsql/trunk/debian/rules
===================================================================
--- packages/osm2pgsql/trunk/debian/rules	2010-02-18 10:22:15 UTC (rev 2720)
+++ packages/osm2pgsql/trunk/debian/rules	2010-02-22 12:30:37 UTC (rev 2721)
@@ -7,9 +7,9 @@
 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)
+SVNREV  := 20104
+SUFFIX  := +r20104
+VERSION := 0.69
 
 CFLAGS = -Wall -g
 
@@ -23,16 +23,16 @@
 	dh_testdir
 	test -d ../tarballs/. || mkdir -p ../tarballs
 	@echo Downloading osm2pgsql from ${SVNREPO}
-	svn export -r ${SVNREV} ${SVNREPO} ../tarballs/osm2pgsql-${VERSION}.${DATE}/
+	svn export -r ${SVNREV} ${SVNREPO} ../tarballs/osm2pgsql-${VERSION}${SUFFIX}/
 	@echo Removing debian dir
-	rm -rf ../tarballs/osm2pgsql-${VERSION}-${DATE}/debian/
+	rm -rf ../tarballs/osm2pgsql-${VERSION}${SUFFIX}/debian/
 	@echo Building snapshot tarball.
-	tar czvf ../tarballs/osm2pgsql_${VERSION}.${DATE}.orig.tar.gz -C ../tarballs osm2pgsql-${VERSION}.${DATE}
+	tar czvf ../tarballs/osm2pgsql_${VERSION}${SUFFIX}.orig.tar.gz -C ../tarballs osm2pgsql-${VERSION}${SUFFIX}
 	@echo Cleaning up
-	rm -rf ../tarballs/osm2pgsql-${VERSION}.${DATE}
+	rm -rf ../tarballs/osm2pgsql-${VERSION}${SUFFIX}
 	@echo .
 	@echo To update debian/changelog type
-	@echo dch -v ${VERSION}.${DATE}-1
+	@echo dch -v ${VERSION}${SUFFIX}-1
 	@echo .
 
 configure: configure-stamp
@@ -73,7 +73,7 @@
 	dh_installman
 	dh_link
 	dh_strip
-	dh_compress
+	dh_compress -X.php -X.sql -X.js -X.c -X.h
 	dh_fixperms
 	dh_installdeb
 	dh_shlibdeps