[proj] 06/18: Drop patches, applied upstream.

[Bas Couwenberg]

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

sebastic pushed a commit to branch experimental
in repository proj.

commit a372a1f0d38f611ea90eed69a3865e0dad7526e4
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Feb 2 18:09:11 2018 +0100

    Drop patches, applied upstream.
---
 debian/changelog                        |  1 +
 debian/patches/PJ_sch-description.patch | 17 -----------------
 debian/patches/international-typo.patch | 16 ----------------
 debian/patches/series                   |  2 --
 4 files changed, 1 insertion(+), 35 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f4d128c..61ed0a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ proj (5.0.0~rc1-1) UNRELEASED; urgency=medium
   * Strip trailing whitespace from changelog, control & rules files.
   * Update copyright-format URL to use HTTPS.
   * Update copyright years for copyright holders.
+  * Drop patches, applied upstream.
 
  -- Bas Couwenberg <sebastic at debian.org>  Fri, 02 Feb 2018 18:07:07 +0100
 
diff --git a/debian/patches/PJ_sch-description.patch b/debian/patches/PJ_sch-description.patch
deleted file mode 100644
index fc9acc8..0000000
--- a/debian/patches/PJ_sch-description.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Use more consistent description for sch projection.
- The spaces around equals signs caused issues with the parser in PDL.
- See: https://sourceforge.net/p/pdl/bugs/429/
-Forwarded: https://github.com/OSGeo/proj.4/pull/427
-Applied-Upstream: https://github.com/OSGeo/proj.4/commit/0301a2863c66c1d0fb1d6e4d88e0df92fbc76d97
-
---- a/src/PJ_sch.c
-+++ b/src/PJ_sch.c
-@@ -48,7 +48,7 @@ struct pj_opaque {
-     GeocentricInfo elp_0;
- };
- 
--PROJ_HEAD(sch, "Spherical Cross-track Height") "\n\tMisc\n\tplat_0 = ,plon_0 = , phdg_0 = ,[h_0 = ]";
-+PROJ_HEAD(sch, "Spherical Cross-track Height") "\n\tMisc\n\tplat_0= plon_0= phdg_0= [h_0=]";
- 
- static LPZ inverse3d(XYZ xyz, PJ *P) {
-     LPZ lpz = {0.0, 0.0, 0.0};
diff --git a/debian/patches/international-typo.patch b/debian/patches/international-typo.patch
deleted file mode 100644
index cff3d72..0000000
--- a/debian/patches/international-typo.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Fix 'Internation' typo, replace with 'International' (to match PJ_imw_p.c).
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://github.com/OSGeo/proj.4/pull/439
-Applied-Upstream: https://github.com/OSGeo/proj.4/commit/9133b3d855f90d4a5d0a53842fe151efe7235988
-
---- a/src/pj_list.h
-+++ b/src/pj_list.h
-@@ -52,7 +52,7 @@ PROJ_HEAD(hatano, "Hatano Asymmetrical E
- PROJ_HEAD(healpix, "HEALPix")
- PROJ_HEAD(rhealpix, "rHEALPix")
- PROJ_HEAD(igh,  "Interrupted Goode Homolosine")
--PROJ_HEAD(imw_p, "Internation Map of the World Polyconic")
-+PROJ_HEAD(imw_p, "International Map of the World Polyconic")
- PROJ_HEAD(isea, "Icosahedral Snyder Equal Area")
- PROJ_HEAD(kav5, "Kavraisky V")
- PROJ_HEAD(kav7, "Kavraisky VII")
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 37c60a8..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-PJ_sch-description.patch
-international-typo.patch

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