[DebianGIS-dev] [SCM] osm2pgsql branch, master, updated. upstream/0.70.5+r25090-34-g508dc08

[David Paleino]

The following commit has been merged in the master branch:
commit dc7c51322a6e92e3ac3b58aef6286e3e27e5f109
Author: David Paleino <dapal at debian.org>
Date:   Tue Jan 18 22:10:56 2011 +0100

    Fix minor issues

diff --git a/debian/control b/debian/control
index 0ad3a72..b156792 100644
--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,7 @@ Build-Depends:
 Standards-Version: 3.9.1
 Homepage: http://wiki.openstreetmap.org/wiki/Osm2pgsql
 Vcs-Browser: http://git.debian.org/?p=pkg-grass/osm2pgsql.git
-Vcs-Svn: git://git.debian.org/pkg-grass/osm2pgsql.git
+Vcs-Git: git://git.debian.org/pkg-grass/osm2pgsql.git
 
 Package: osm2pgsql
 Architecture: any
diff --git a/debian/osm2pgsql.1 b/debian/osm2pgsql.1
index 15bb87a..637408f 100644
--- a/debian/osm2pgsql.1
+++ b/debian/osm2pgsql.1
@@ -142,11 +142,11 @@ Use \fB\-E\fR to access any espg projections (usually in /usr/share/proj/epsg)
 Verbose output.
 .PP
 .SH SUPPORTED PROJECTIONS
-Latlong             (-l) SRS:  4326 (none)
+Latlong             (\-l) SRS:  4326 (none)
 .br       
-WGS84 Mercator      (-M) SRS:  3395 +proj=merc +datum=WGS84  +k=1.0 +units=m +over +no_defs
+WGS84 Mercator      (\-M) SRS:  3395 +proj=merc +datum=WGS84  +k=1.0 +units=m +over +no_defs
 .br
-Spherical Mercator  (-m) SRS:900913 +proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +no_defs +over
+Spherical Mercator  (\-m) SRS:900913 +proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +no_defs +over
 .PP
 .SH SEE ALSO
 .BR proj (1),
diff --git a/debian/rules b/debian/rules
index fab25cc..53f3920 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,7 +16,7 @@ SUFFIX  := +r$(SVNREV)
 
 override_dh_compress:
 	# clean up some naive file permissions
-	-find $(CURDIR)/gazetteer/website -type f -exec chmod a-x {} \;
+	#-find $(CURDIR)/gazetteer/website -type f -exec chmod a-x {} \;
 	dh_compress -X.php -X.sql -X.js -X.c -X.h
 
 get-orig-source:

-- 
OpenStreetMap data to PostgreSQL converter