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

[David Paleino]

The following commit has been merged in the master branch:
commit bd71b4bbdeeba43f1fb3a1be246d8ef99ed33560
Author: David Paleino <dapal at debian.org>
Date:   Sun Sep 23 09:29:25 2012 +0200

    Dropped 02-backport_64bit_ids_support.patch, no more needed

diff --git a/debian/changelog b/debian/changelog
index e6d76d3..36f2239 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 osm2pgsql (0.81.0+r28712-1) UNRELEASED; urgency=low
 
+  [ Andrew Harvey ]
   * New SVN snapshot
   * Patches refreshed to apply to new source
   * Update debian/rules get-orig-source to not bother trying to remove the
@@ -7,7 +8,10 @@ osm2pgsql (0.81.0+r28712-1) UNRELEASED; urgency=low
   * Update manpage
   * Add debian/watch documenting the situation of the upstream version number
 
- -- Andrew Harvey <andrew.harvey4 at gmail.com>  Sun, 23 Sep 2012 10:03:25 +1000
+  [ David Paleino ]
+  * Dropped 02-backport_64bit_ids_support.patch, no more needed
+
+ -- David Paleino <dapal at debian.org>  Sun, 23 Sep 2012 09:28:56 +0200
 
 osm2pgsql (0.80.0+r27899-3) unstable; urgency=low
 
diff --git a/debian/patches/02-backport_64bit_ids_support.patch b/debian/patches/02-backport_64bit_ids_support.patch
deleted file mode 100644
index e135d06..0000000
--- a/debian/patches/02-backport_64bit_ids_support.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From: David Paleino <dapal at debian.org>
-Subject: backport support for 64-bit IDs
-Forwarded: not-needed
-Origin: vendor
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=687965
-
----
- osmtypes.h         |    3 +--
- output-gazetteer.c |    4 ++--
- 2 files changed, 3 insertions(+), 4 deletions(-)
-
---- osm2pgsql.orig/osmtypes.h
-+++ osm2pgsql/osmtypes.h
-@@ -6,8 +6,7 @@
- #include <inttypes.h>
- #include <time.h>
- 
--// uncomment the following to build a version that supports 64bit IDs.
--// #define OSMID64
-+#define OSMID64
- 
- #ifdef OSMID64
- typedef int64_t osmid_t;
---- osm2pgsql.orig/output-gazetteer.c
-+++ osm2pgsql/output-gazetteer.c
-@@ -32,7 +32,7 @@
-    "CREATE TABLE place ("                       \
-    "  place_id BIGINT,"                         \
-    "  osm_type CHAR(1) NOT NULL,"               \
--   "  osm_id BIGINT NOT NULL,"                  \
-+   "  osm_id " POSTGRES_OSMID_TYPE " NOT NULL," \
-    "  class TEXT NOT NULL,"                     \
-    "  type TEXT NOT NULL,"                      \
-    "  name keyvalue[],"                         \
-@@ -51,7 +51,7 @@
- #define V2_CREATE_PLACE_TABLE                   \
-    "CREATE TABLE place ("                       \
-    "  osm_type CHAR(1) NOT NULL,"               \
--   "  osm_id BIGINT NOT NULL,"                  \
-+   "  osm_id " POSTGRES_OSMID_TYPE " NOT NULL," \
-    "  class TEXT NOT NULL,"                     \
-    "  type TEXT NOT NULL,"                      \
-    "  name HSTORE,"                             \
diff --git a/debian/patches/series b/debian/patches/series
index 0d15675..b75ec23 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 00-fix_build.patch
-02-backport_64bit_ids_support.patch

-- 
OpenStreetMap data to PostgreSQL converter