[proj] 07/15: Drop patches, applied upstream.
Bas Couwenberg
sebastic at debian.org
Tue Aug 16 10:04:24 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository proj.
commit ca090e698f03586c3d66c60f52f428bcbef7094b
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Tue Aug 16 10:58:35 2016 +0200
Drop patches, applied upstream.
---
debian/changelog | 1 +
...e-shift-values-whose-abs-value-is-gt-1000.patch | 29 ---------
debian/patches/manpage-improvements.patch | 70 ----------------------
debian/patches/manpage-typos.patch | 28 ---------
debian/patches/nad2bin-reproducible-header.patch | 18 ------
debian/patches/series | 4 --
6 files changed, 1 insertion(+), 149 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index caa27b3..89a4601 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ proj (4.9.3~rc1+ds-1) UNRELEASED; urgency=medium
- Add license & copyright for src/PJ_sch.c
- Change MIT license shortname to Expat
- Add license & copyright for src/PJ_patterson.c
+ * Drop patches, applied upstream.
-- Bas Couwenberg <sebastic at debian.org> Tue, 16 Aug 2016 10:35:42 +0200
diff --git a/debian/patches/GTX-grids-ignore-shift-values-whose-abs-value-is-gt-1000.patch b/debian/patches/GTX-grids-ignore-shift-values-whose-abs-value-is-gt-1000.patch
deleted file mode 100644
index 38fe8c1..0000000
--- a/debian/patches/GTX-grids-ignore-shift-values-whose-abs-value-is-gt-1000.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Origin: https://github.com/OSGeo/proj.4/commit/a12bfb7c207449c9768fa7591684a0240d2e6898
-Bug-Debian: https://bugs.debian.org/813066
-From f3f9f0ca569e6cd14e4d468dfa783881bdd35343 Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault at spatialys.com>
-Date: Tue, 2 Feb 2016 14:06:31 +0100
-Subject: [PATCH] GTX grids: ignore shift values whose abs value is > 1000
-
-This partially reverts https://github.com/OSGeo/proj.4/commit/338ea581
-(#271) to solve issue with naptrans2008.gtx grid mentioned in
-http://lists.maptools.org/pipermail/proj/2016-February/007327.html
----
- src/pj_apply_vgridshift.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
---- a/src/pj_apply_vgridshift.c
-+++ b/src/pj_apply_vgridshift.c
-@@ -151,7 +151,11 @@ int pj_apply_vgridshift( PJ *defn, const
- + cvs[grid_ix + 1 + (grid_iy+1) * ct->lim.lam]
- * (grid_x) * (grid_y);
-
-- if( value == -88.88880f ) /* nodata? */
-+ /* nodata? */
-+ /* GTX official nodata value if -88.88880f, but some grids also */
-+ /* use other big values for nodata (e.g naptrans2008.gtx has */
-+ /* nodata values like -2147479936), so test them too */
-+ if( value > 1000 || value < -1000 || value == -88.88880f )
- value = HUGE_VAL;
- else
- {
diff --git a/debian/patches/manpage-improvements.patch b/debian/patches/manpage-improvements.patch
deleted file mode 100644
index a2460a6..0000000
--- a/debian/patches/manpage-improvements.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-Description: Add BUGS section to manpages & update old URLs.
-Author: Bas Couwenberg <sebastic at debian.org>
-Bug-Debian: https://bugs.debian.org/809690
-Forwarded: https://github.com/OSGeo/proj.4/pull/382
-Applied-Upstream: https://github.com/OSGeo/proj.4/commit/933eaf7d86fea02b2cb9c0c5728ac3c82c6657a0
-
---- a/man/man1/cs2cs.1
-+++ b/man/man1/cs2cs.1
-@@ -198,5 +198,8 @@ USGS Bulletin 1532).
- .br
- .I "An Album of Map Projections"
- (Snyder & Voxland, 1989, USGS Prof. Paper 1453).
-+.SH BUGS
-+A list of known bugs can found at https://github.com/OSGeo/proj.4/issues
-+where new bug reports can be submitted too.
- .SH HOME PAGE
--http://www.remotesensing.org/proj
-+https://github.com/OSGeo/proj.4/wiki
---- a/man/man1/geod.1
-+++ b/man/man1/geod.1
-@@ -224,5 +224,8 @@ http://geographiclib.sf.net/geod-addenda
- The \fIonline geodesic bibliography\fR,
- .br
- http://geographiclib.sf.net/geodesic-papers/biblio.html
-+.SH BUGS
-+A list of known bugs can found at https://github.com/OSGeo/proj.4/issues
-+where new bug reports can be submitted too.
- .SH HOME PAGE
- https://github.com/OSGeo/proj.4/wiki
---- a/man/man1/proj.1
-+++ b/man/man1/proj.1
-@@ -296,5 +296,8 @@ USGS Bulletin 1532).
- .br
- .I "An Album of Map Projections"
- (Snyder & Voxland, 1989, USGS Prof. Paper 1453).
-+.SH BUGS
-+A list of known bugs can found at https://github.com/OSGeo/proj.4/issues
-+where new bug reports can be submitted too.
- .SH HOME PAGE
--http://www.remotesensing.org/proj
-+https://github.com/OSGeo/proj.4/wiki
---- a/man/man3/geodesic.3
-+++ b/man/man3/geodesic.3
-@@ -93,5 +93,8 @@ http://geographiclib.sf.net/geod-addenda
- The \fIonline geodesic bibliography\fR,
- .br
- http://geographiclib.sf.net/geodesic-papers/biblio.html
-+.SH BUGS
-+A list of known bugs can found at https://github.com/OSGeo/proj.4/issues
-+where new bug reports can be submitted too.
- .SH HOME PAGE
- https://github.com/OSGeo/proj.4/wiki
---- a/man/man3/pj_init.3
-+++ b/man/man3/pj_init.3
-@@ -103,10 +103,12 @@ main(int argc, char **argv) {
- .SH LIBRARY
- libproj.a \- library of projections and support procedures
- .SH SEE ALSO
--.B http://proj.osgeo.org/ProjAPI, proj(1),
-+.B https://github.com/OSGeo/proj.4/wiki/ProjAPI, proj(1),
- .br
- .I "Cartographic Projection Procedures for the UNIX Environment\(emA User's Manual,"
- (Evenden, 1990, Open-file report 90\-284).
-+.SH BUGS
-+A list of known bugs can found at https://github.com/OSGeo/proj.4/issues
-+where new bug reports can be submitted too.
- .SH HOME PAGE
--http://proj.osgeo.org
--
-+https://github.com/OSGeo/proj.4/wiki
diff --git a/debian/patches/manpage-typos.patch b/debian/patches/manpage-typos.patch
deleted file mode 100644
index 892a6f4..0000000
--- a/debian/patches/manpage-typos.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Description: Fix unmatched ')' in man page.
-Author: 積丹尼 Dan Jacobson <jidanni at jidanni.org>
-Bug-Debian: https://bugs.debian.org/807145
-Forwarded: https://github.com/OSGeo/proj.4/pull/327
-Applied-Upstream: https://github.com/OSGeo/proj.4/commit/953cc00fd87425395cabe37641cda905c4b587c1
-
---- a/man/man1/cs2cs.1
-+++ b/man/man1/cs2cs.1
-@@ -116,7 +116,7 @@ The
- .B +args
- run-line arguments are associated with cartographic parameters
- and usage varies with projection and for a complete description see
--.I "Cartographic Projection Procedures for the UNIX Environment\(emA User's Manual" )
-+.I "Cartographic Projection Procedures for the UNIX Environment\(emA User's Manual"
- and supplementary documentation for Release 4.
- .PP
- The \fIcs2cs\fR program requires two coordinate system definitions. The
---- a/man/man1/proj.1
-+++ b/man/man1/proj.1
-@@ -214,7 +214,7 @@ The
- .B +args
- run-line arguments are associated with cartographic parameters
- and usage varies with projection and for a complete description see
--.I "Cartographic Projection Procedures for the UNIX Environment\(emA User's Manual" )
-+.I "Cartographic Projection Procedures for the UNIX Environment\(emA User's Manual"
- and supplementary documentation for Release 4.
- .PP
- Additional projection control parameters may be contained in two
diff --git a/debian/patches/nad2bin-reproducible-header.patch b/debian/patches/nad2bin-reproducible-header.patch
deleted file mode 100644
index f3eae08..0000000
--- a/debian/patches/nad2bin-reproducible-header.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Makes nad2bin output reproducible
- Init CTABLE.id char[80] variable with zeroes, so that nad2bin output does
- not depend on memory state before call, and hence be reproducible.
-Author: Alexis Bienvenüe <pado at passoire.fr>
-Bug-Debian: https://bugs.debian.org/825088
-Forwarded: https://github.com/OSGeo/proj.4/pull/381
-Applied-Upstream: https://github.com/OSGeo/proj.4/commit/a112ea3172e89230fa307567be3d70e286b1eeb5
-
---- a/src/nad2bin.c
-+++ b/src/nad2bin.c
-@@ -98,6 +98,7 @@ int main(int argc, char **argv) {
- /* Read the ASCII Table */
- /* ==================================================================== */
-
-+ memset(ct.id,0,MAX_TAB_ID);
- if ( NULL == fgets(ct.id, MAX_TAB_ID, stdin) ) {
- perror("fgets");
- exit(1);
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 19336d7..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,4 +0,0 @@
-manpage-typos.patch
-GTX-grids-ignore-shift-values-whose-abs-value-is-gt-1000.patch
-nad2bin-reproducible-header.patch
-manpage-improvements.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/proj.git
More information about the Pkg-grass-devel
mailing list