[SCM] osm2pgsql branch, master, updated. debian/0.80.0+r27899-1-6-gb26f08b

[Andrew Harvey]

The following commit has been merged in the master branch:
commit b5067c6d7ea79d82977527553f69aced8126fdaa
Author: Andrew Harvey <andrew.harvey4 at gmail.com>
Date:   Sun Sep 23 10:19:13 2012 +1000

    Patches refreshed to apply to new source

diff --git a/debian/changelog b/debian/changelog
index d36f83c..8d5ee11 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 osm2pgsql (0.81.0+r28712-1) UNRELEASED; urgency=low
 
   * New SVN snapshot
+  * Patches refreshed to apply to new source
 
  -- Andrew Harvey <andrew.harvey4 at gmail.com>  Sun, 23 Sep 2012 10:03:25 +1000
 
diff --git a/debian/patches/00-fix_build.patch b/debian/patches/00-fix_build.patch
index 9dc5ea8..ea1506c 100644
--- a/debian/patches/00-fix_build.patch
+++ b/debian/patches/00-fix_build.patch
@@ -8,7 +8,7 @@ Forwarded: no
 
 --- osm2pgsql.orig/Makefile.am
 +++ osm2pgsql/Makefile.am
-@@ -37,8 +37,8 @@ endif
+@@ -38,8 +38,8 @@
  
  osm2pgsqldir = $(datadir)/osm2pgsql
  
diff --git a/debian/patches/01-disable_gazetteer.patch b/debian/patches/01-disable_gazetteer.patch
deleted file mode 100644
index 919754c..0000000
--- a/debian/patches/01-disable_gazetteer.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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
-@@ -93,5 +93,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 dde124e..b75ec23 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 00-fix_build.patch
-01-disable_gazetteer.patch

-- 
OpenStreetMap data to PostgreSQL converter