[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 6ef0db077c969a9ced89d31a8e6d655b799da04d
Author: David Paleino <dapal at debian.org>
Date:   Tue Jan 18 21:58:36 2011 +0100

    Don't actually build gazetteer (01-disable_gazetteer.patch)

diff --git a/debian/changelog b/debian/changelog
index e60e6c6..8aa82df 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,8 +23,9 @@ osm2pgsql (0.70.5+r25090-1) UNRELEASED; urgency=low
     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 21:46:08 +0100
+ -- David Paleino <dapal at debian.org>  Tue, 18 Jan 2011 21:58:13 +0100
 
 osm2pgsql (0.69+r20104-2) unstable; urgency=low
 
diff --git a/debian/patches/01-disable_gazetteer.patch b/debian/patches/01-disable_gazetteer.patch
new file mode 100644
index 0000000..a17b1b9
--- /dev/null
+++ b/debian/patches/01-disable_gazetteer.patch
@@ -0,0 +1,29 @@
+From: David Paleino <dapal at debian.org>
+Subject: disable Gazetteer build
+Forwarded: not-needed
+
+---
+ Makefile.am  |    3 +--
+ configure.ac |    2 +-
+ 2 files changed, 2 insertions(+), 3 deletions(-)
+
+--- osm2pgsql.orig/Makefile.am
++++ osm2pgsql/Makefile.am
+@@ -1,7 +1,6 @@
+ ACLOCAL_AMFLAGS = -I m4
+ 
+-DIST_SUBDIRS = legacy gazetteer
+-SUBDIRS = $(GAZETTEER_SUBDIR)
++DIST_SUBDIRS = legacy
+ 
+ bin_PROGRAMS = osm2pgsql
+ 
+--- osm2pgsql.orig/configure.ac
++++ osm2pgsql/configure.ac
+@@ -91,5 +91,5 @@ AX_PTHREAD(,[AC_MSG_ERROR([no])])
+ 
+ 
+ dnl Generate Makefile
+-AC_OUTPUT(Makefile legacy/Makefile gazetteer/Makefile)
++AC_OUTPUT(Makefile legacy/Makefile)
+ 
diff --git a/debian/patches/series b/debian/patches/series
index b75ec23..dde124e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 00-fix_build.patch
+01-disable_gazetteer.patch

-- 
OpenStreetMap data to PostgreSQL converter