[osm2pgsql] 04/06: Drop patches, included upstream.

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository osm2pgsql.

commit fa6b7769cb3372b4227b9d6ebd2a15d2e9956656
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Jul 17 13:38:10 2016 +0200

    Drop patches, included upstream.
---
 debian/changelog                                   |  1 +
 ...ix-projection-info-for-generic-projection.patch | 37 ----------------------
 ...null-pointers-when-printing-error-message.patch | 25 ---------------
 debian/patches/series                              |  2 --
 4 files changed, 1 insertion(+), 64 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7952092..32956fd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 osm2pgsql (0.90.1+ds-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Drop patches, included upstream.
 
  -- Bas Couwenberg <sebastic at debian.org>  Sun, 17 Jul 2016 13:34:46 +0200
 
diff --git a/debian/patches/fix-projection-info-for-generic-projection.patch b/debian/patches/fix-projection-info-for-generic-projection.patch
deleted file mode 100644
index a019178..0000000
--- a/debian/patches/fix-projection-info-for-generic-projection.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 84335a08cfbb404b8eeaaa6167ef316f652e7b40 Mon Sep 17 00:00:00 2001
-From: Sarah Hoffmann <lonvia at denofr.de>
-Origin: https://github.com/openstreetmap/osm2pgsql/commit/84335a08cfbb404b8eeaaa6167ef316f652e7b40
-Bug: https://github.com/openstreetmap/osm2pgsql/issues/571
-Date: Wed, 20 Apr 2016 23:50:04 +0200
-Subject: fix projection info for generic projection
-
-fixes #571
-
-(cherry picked from commit ce2de4935c103f698721352ac423ad3a14c6bd75)
-
---- a/reprojection.cpp
-+++ b/reprojection.cpp
-@@ -75,7 +75,8 @@ class generic_reprojection_t : public re
- {
- public:
-     generic_reprojection_t(int srs)
--    : pj_target(srs), pj_source(PROJ_LATLONG), pj_tile("+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 +wktext  +no_defs")
-+    : m_target_srs(srs), pj_target(srs), pj_source(PROJ_LATLONG),
-+      pj_tile("+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 +wktext  +no_defs")
-     {}
- 
-     osmium::geom::Coordinates reproject(osmium::Location loc) const override
-@@ -94,10 +95,11 @@ public:
-         *lat = c.y;
-     }
- 
--    int target_srs() const override { return PROJ_SPHERE_MERC; }
--    const char *target_desc() const override { return "Spherical Mercator"; }
-+    int target_srs() const override { return m_target_srs; }
-+    const char *target_desc() const override { return pj_get_def(pj_target.get(), 0); }
- 
- private:
-+    int m_target_srs;
-     osmium::geom::CRS pj_target;
-     /** The projection of the source data. Always lat/lon (EPSG:4326). */
-     osmium::geom::CRS pj_source;
diff --git a/debian/patches/pgsql_execPrepared-check-for-null-pointers-when-printing-error-message.patch b/debian/patches/pgsql_execPrepared-check-for-null-pointers-when-printing-error-message.patch
deleted file mode 100644
index 6f43e8f..0000000
--- a/debian/patches/pgsql_execPrepared-check-for-null-pointers-when-printing-error-message.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Origin: https://github.com/openstreetmap/osm2pgsql/commit/c3298d8dba702e1156beaaaa2aed037dba0c1f75
-Bug-Debian: https://bugs.debian.org/819713
-Bug: https://github.com/openstreetmap/osm2pgsql/issues/564
-From 4c579b53c267bba4a5d0ba716ac5320141a739f9 Mon Sep 17 00:00:00 2001
-From: Sarah Hoffmann <lonvia at denofr.de>
-Date: Fri, 1 Apr 2016 22:37:29 +0200
-Subject: pgsql_execPrepared: check for null pointers when printing
- error message
-
-fixes #564
----
- pgsql.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/pgsql.cpp
-+++ b/pgsql.cpp
-@@ -127,7 +127,7 @@ PGresult *pgsql_execPrepared( PGconn *sq
-              message += "Arguments were: ";
-             for(int i = 0; i < nParams; i++)
-             {
--                message += paramValues[i];
-+                message += paramValues[i]?paramValues[i]:"<NULL>";
-                 message += ", ";
-             }
-         }
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index b12a5b6..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-pgsql_execPrepared-check-for-null-pointers-when-printing-error-message.patch
-fix-projection-info-for-generic-projection.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osm2pgsql.git