[proj] 05/06: Drop patches, fixed upstream.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository proj.

commit 0ca8dc5e62ba548bc8db52212301395db531ed85
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Sep 8 19:27:32 2015 +0200

    Drop patches, fixed upstream.
---
 debian/changelog                                   |  1 +
 ...removed-proj_def.dat-from-distro-in-r2540.patch | 22 --------------------
 debian/patches/proj_def.patch                      | 24 ----------------------
 debian/patches/series                              |  2 --
 4 files changed, 1 insertion(+), 48 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1f12d48..80d5a15 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ proj (4.9.2~rc1-1) UNRELEASED; urgency=medium
 
   * New upstream release candidate.
   * Update copyright for new & changed files.
+  * Drop patches, fixed upstream.
 
  -- Bas Couwenberg <sebastic at debian.org>  Tue, 08 Sep 2015 19:17:22 +0200
 
diff --git a/debian/patches/Fix-botched-patch-that-removed-proj_def.dat-from-distro-in-r2540.patch b/debian/patches/Fix-botched-patch-that-removed-proj_def.dat-from-distro-in-r2540.patch
deleted file mode 100644
index 8e4a218..0000000
--- a/debian/patches/Fix-botched-patch-that-removed-proj_def.dat-from-distro-in-r2540.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From ef4c4922e6dcb45cf9d57eabb7e1d66172b26081 Mon Sep 17 00:00:00 2001
-From: Howard Butler <howard at hobu.co>
-Date: Wed, 20 May 2015 21:03:14 +0000
-Subject: [PATCH] Fix botched patch that removed proj_def.dat from distro in r2540 #274
-Origin: https://github.com/OSGeo/proj.4/commit/ef4c4922e6dcb45cf9d57eabb7e1d66172b26081
-
-git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@2654 4e78687f-474d-0410-85f9-8d5e500ac6b2
----
- nad/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/nad/Makefile.am
-+++ b/nad/Makefile.am
-@@ -12,7 +12,7 @@ TESTVARIOUS = $(NADPATH)/testvarious
- TESTDATUMFILE = $(NADPATH)/testdatumfile
- TESTIGN = $(NADPATH)/testIGNF
- 
--pkgdata_DATA = GL27 nad.lst nad27 nad83 world epsg esri \
-+pkgdata_DATA = GL27 nad.lst proj_def.dat nad27 nad83 world epsg esri \
- 		esri.extra other.extra \
- 		CH IGNF
- 
diff --git a/debian/patches/proj_def.patch b/debian/patches/proj_def.patch
deleted file mode 100644
index d9b5e58..0000000
--- a/debian/patches/proj_def.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Description: Add proj_def.dat, erroniously not included in PROJ 4.9.1.
-Origin: https://raw.githubusercontent.com/OSGeo/proj.4/master/nad/proj_def.dat
-Bug: https://github.com/OSGeo/proj.4/issues/274
-
---- /dev/null
-+++ b/nad/proj_def.dat
-@@ -0,0 +1,17 @@
-+# Projection library defaults file
-+# SCCSID--- @(#)proj_def.dat	4.3	94/02/23	GIE	REL"
-+# very preliminary version
-+<general>
-+ellps=WGS84 
-+<>
-+<aea> # Conterminous U.S. map
-+lat_1=29.5
-+lat_2=45.5
-+<>
-+<lcc> # Conterminous U.S. map
-+lat_1=33
-+lat_2=45
-+<>
-+<lagrng>
-+W=2
-+<>
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 40cfc39..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-proj_def.patch
-Fix-botched-patch-that-removed-proj_def.dat-from-distro-in-r2540.patch

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