This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch experimental
in repository proj.
commit 288ff4f23553d50e9c470481af8190340cdfa233
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date: Sat Feb 21 18:43:40 2015 +0100
Drop patches applied upstream.
---
debian/changelog | 1 +
debian/patches/epsg-28992-precision.patch | 31 -----------
debian/patches/geos-manpage-error.patch | 18 -------
debian/patches/hyphen-used-as-minus-sign.patch | 71 --------------------------
debian/patches/manpages | 45 ----------------
debian/patches/nad2bin-data.patch | 43 ----------------
debian/patches/series | 5 --
7 files changed, 1 insertion(+), 213 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index a7bd333..8d8f175 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ proj (4.9.1~rc3-1) UNRELEASED; urgency=medium
* New upstream release candidate.
* Ignore test failures instead of failing the build.
+ * Drop patches applied upstream.
-- Bas Couwenberg <sebas...@debian.org> Sat, 21 Feb 2015 18:37:53 +0100
diff --git a/debian/patches/epsg-28992-precision.patch
b/debian/patches/epsg-28992-precision.patch
deleted file mode 100644
index caa705b..0000000
--- a/debian/patches/epsg-28992-precision.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Description: Use the higher precision towgs84 values as specified by Kadaster.
- The Dutch Kadaster has publiced the values to use three times so far:
- .
- Until 2004:
- +towgs84=565.040,49.910,465.840,-0.409394,0.359705,-1.868491,4.0772
- .
- From 2005 until 2008:
- +towgs84=565.2369,50.0087,465.6580,-0.406857,0.350733,-1.870347,4.0812
- .
- From 2009:
- +towgs84=565.4171,50.3319,465.5524,-0.398957,0.343988,-1.877402,4.0725
- .
- For related discussion in Dutch see:
- http://lists.osgeo.org/pipermail/dutch/2014-October/000980.html
- .
-Author: Bas Couwenberg <sebas...@xs4all.nl>
-
---- a/nad/epsg
-+++ b/nad/epsg
-@@ -8230,9 +8230,9 @@
- # Qatar 1974 / Qatar National Grid
- <28600> +proj=tmerc +lat_0=24.45 +lon_0=51.21666666666667 +k=0.99999
+x_0=200000 +y_0=300000 +ellps=intl +towgs84=-128.16,-282.42,21.93,0,0,0,0
+units=m +no_defs <>
- # Amersfoort / RD Old
--<28991> +proj=sterea +lat_0=52.15616055555555 +lon_0=5.38763888888889
+k=0.9999079 +x_0=0 +y_0=0 +ellps=bessel
+towgs84=565.417,50.3319,465.552,-0.398957,0.343988,-1.8774,4.0725 +units=m
+no_defs <>
-+<28991> +proj=sterea +lat_0=52.15616055555555 +lon_0=5.38763888888889
+k=0.9999079 +x_0=0 +y_0=0 +ellps=bessel
+towgs84=565.4171,50.3319,465.5524,-0.398957,0.343988,-1.877402,4.0725 +units=m
+no_defs <>
- # Amersfoort / RD New
--<28992> +proj=sterea +lat_0=52.15616055555555 +lon_0=5.38763888888889
+k=0.9999079 +x_0=155000 +y_0=463000 +ellps=bessel
+towgs84=565.417,50.3319,465.552,-0.398957,0.343988,-1.8774,4.0725 +units=m
+no_defs <>
-+<28992> +proj=sterea +lat_0=52.15616055555555 +lon_0=5.38763888888889
+k=0.9999079 +x_0=155000 +y_0=463000 +ellps=bessel
+towgs84=565.4171,50.3319,465.5524,-0.398957,0.343988,-1.877402,4.0725 +units=m
+no_defs <>
- # SAD69 / Brazil Polyconic (deprecated)
- <29100> +proj=poly +lat_0=0 +lon_0=-54 +x_0=5000000 +y_0=10000000
+ellps=GRS67 +towgs84=-57,1,-41,0,0,0,0 +units=m +no_defs <>
- # SAD69 / Brazil Polyconic
diff --git a/debian/patches/geos-manpage-error.patch
b/debian/patches/geos-manpage-error.patch
deleted file mode 100644
index eba56b0..0000000
--- a/debian/patches/geos-manpage-error.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Fix man warnings for unknown special characters.
- warning: can't find special character ```'
- warning: can't find special character `'''
-Author: Bas Couwenberg <sebas...@xs4all.nl>
-Forwarded: https://trac.osgeo.org/proj/ticket/259
-Applied-Upstream: r2620, https://trac.osgeo.org/proj/changeset/2620
-
---- a/man/man1/geod.1
-+++ b/man/man1/geod.1
-@@ -34,7 +34,7 @@ file[s]
- (direct) and
- .I invgeod
- (inverse)
--perform geodesic (\(``Great Circle\('') computations for determining
-+perform geodesic (\*(lqGreat Circle\*(rq) computations for determining
- latitude, longitude and back azimuth of a terminus point
- given a initial point latitude, longitude, azimuth and distance (direct) or
- the forward and back azimuths and distance between an initial and
diff --git a/debian/patches/hyphen-used-as-minus-sign.patch
b/debian/patches/hyphen-used-as-minus-sign.patch
deleted file mode 100644
index 86cbfea..0000000
--- a/debian/patches/hyphen-used-as-minus-sign.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-Description: Fix hyphen-used-as-minus-sign lintian issues by escaping minus.
-Author: Bas Couwenberg <sebas...@xs4all.nl>
-Forwarded: https://trac.osgeo.org/proj/ticket/259
-Applied-Upstream: r2620, https://trac.osgeo.org/proj/changeset/2620
-
---- a/man/man1/cs2cs.1
-+++ b/man/man1/cs2cs.1
-@@ -169,9 +169,9 @@ projected (cartesian) coordinates will b
- The following script
- .RS 5
- \f(CWcs2cs +proj=latlong +datum=NAD83
-- +to +proj=utm +zone=10 +datum=NAD27 -r <<EOF
-+ +to +proj=utm +zone=10 +datum=NAD27 \-r <<EOF
- 45d15'33.1" 111.5W
-- 45d15.551666667N -111d30
-+ 45d15.551666667N \-111d30
- +45.25919444444 111d30'000w
- EOF\fR
- .RE
---- a/man/man1/proj.1
-+++ b/man/man1/proj.1
-@@ -202,7 +202,7 @@ is an integer number specifying the powe
- approximation.
- For example, a
- .I res
--of -3 specifies an approximation with an accuracy better than .001.
-+of \-3 specifies an approximation with an accuracy better than .001.
- .I Umax,
- and
- .I vmax
-@@ -256,9 +256,9 @@ with trailing, zero-valued minute-second
- .SH EXAMPLE
- The following script
- .RS 5
-- \f(CWproj +proj=utm +lon_0=112w +ellps=clrk66 -r <<EOF
-+ \f(CWproj +proj=utm +lon_0=112w +ellps=clrk66 \-r <<EOF
- 45d15'33.1" 111.5W
-- 45d15.551666667N -111d30
-+ 45d15.551666667N \-111d30
- +45.25919444444 111d30'000w
- EOF\fR
- .RE
---- a/man/man1/geod.1
-+++ b/man/man1/geod.1
-@@ -90,7 +90,7 @@ is employed the fields will be constant
- .TP
- .B \-p
- This option causes the azimuthal values to be output as unsigned
--DMS numbers between 0 and 360 degrees. Also note -f.
-+DMS numbers between 0 and 360 degrees. Also note \-f.
- .PP
- The
- .B +args
-@@ -174,7 +174,7 @@ and number of points to be determined.
- The following script determines the geodesic azimuths and distance in
- U.S. statute miles from Boston, MA, to Portland, OR:
- .RS 5
-- \f(CWgeod +ellps=clrk66 <<EOF -I +units=us-mi
-+ \f(CWgeod +ellps=clrk66 <<EOF \-I +units=us\-mi
- 42d15'N 71d07'W 45d31'N 123d41'W
- EOF\fR
- .RE
-@@ -190,7 +190,7 @@ An example of forward geodesic use is to
- Portland's location by azimuth and distance:
- .RS 5
- \f(CWgeod +ellps=clrk66 <<EOF +units=us-mi
-- 42d15'N 71d07'W -66d31'50.141" 2587.504
-+ 42d15'N 71d07'W \-66d31'50.141" 2587.504
- EOF\fR
- .RE
- which gives:
diff --git a/debian/patches/manpages b/debian/patches/manpages
deleted file mode 100644
index c23d1a8..0000000
--- a/debian/patches/manpages
+++ /dev/null
@@ -1,45 +0,0 @@
-Description: Fix man page section, remove references to no longer distributed
nad2nad
-Author: Francesco Paolo Lovergine <fran...@debian.org>
-Forwarded: https://trac.osgeo.org/proj/ticket/259
-Applied-Upstream: r2620, https://trac.osgeo.org/proj/changeset/2620
-
---- a/man/man1/cs2cs.1
-+++ b/man/man1/cs2cs.1
-@@ -184,7 +184,7 @@ The x\-y output data will appear as thre
- \f(CW1402285.99 5076292.42 0.000
- .RE
- .SH SEE ALSO
--.B proj(1U),
-+.B proj(1),
- .br
- .I "Cartographic Projection Procedures for the UNIX Environment\(emA User's
Manual,"
- (Evenden, 1990, Open-file report 90\-284).
---- a/man/man1/proj.1
-+++ b/man/man1/proj.1
-@@ -278,14 +278,11 @@ projection coordinates within one datum.
- The \fIcs2cs\fR program operates
- similarly, but allows translation between any pair of definable coordinate
- systems, including support for datum translation.
--.PP
--The \fInad2nad\fR program provides for translation between NAD27 and NAD83
--(also available in \fRcs2cs\fI) in a convenient manner.
- .PP
- The \fIgeod\fR program provides the ability to compute geodesic (Great
- Circle) computations.
- .SH SEE ALSO
--.B cs2cs(1U), nad2nad(1U), geod(1U), pj_init(3U),
-+.B cs2cs(1), geod(1), pj_init(3),
- .br
- .I "Cartographic Projection Procedures for the UNIX Environment\(emA User's
Manual,"
- (Evenden, 1990, Open-file report 90\-284).
---- a/man/man3/pj_init.3
-+++ b/man/man3/pj_init.3
-@@ -103,7 +103,7 @@ 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(1U),
-+.B http://proj.osgeo.org/ProjAPI, proj(1),
- .br
- .I "Cartographic Projection Procedures for the UNIX Environment\(emA User's
Manual,"
- (Evenden, 1990, Open-file report 90\-284).
diff --git a/debian/patches/nad2bin-data.patch
b/debian/patches/nad2bin-data.patch
deleted file mode 100644
index 1861fc8..0000000
--- a/debian/patches/nad2bin-data.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Description: Don't assume the .lla files from proj-datumgrid are present.
- The .lla files need to be extracted from proj-datumgrid-1.5, but aren't
- included in proj-datumgrid-1.6RC1 anymore.
- .
- Before proj-datagrids 1.6RC1 the simple binary format produced by nad2bin
- was not endianess-aware, making the resulting data files architecture
- specific and needing to be installed under /usr/lib/proj.
- .
-Author: Bas Couwenberg <sebas...@xs4all.nl>
-Bug-Debian: https://bugs.debian.org/747862
-Forwarded: http://trac.osgeo.org/proj/ticket/249
-Applied-Upstream: r2619, https://trac.osgeo.org/proj/changeset/2619
-
---- a/nad/Makefile.am
-+++ b/nad/Makefile.am
-@@ -34,7 +34,8 @@ process-nad2bin:
-
- install-data-local: process-nad2bin
- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
-- @for x in $(NADPATH)/*.lla ; do \
-+ @if [ -f $(NADPATH)/null.lla -a ! -f $(NADPATH)/null ] || [ -f
$(NADPATH)/conus.lla -a ! -f $(NADPATH)/conus ] ; then \
-+ for x in $(NADPATH)/*.lla ; do \
- DEST=$(DESTDIR)$(pkgdatadir)/`basename $$x .lla`; \
- echo "../src/nad2bin$(EXEEXT) $$DEST < $$x"; \
- ../src/nad2bin$(EXEEXT) $$DEST < $$x ; \
-@@ -42,11 +43,14 @@ install-data-local: process-nad2bin
- echo "nad2bin$(EXEEXT) failed to install $$DEST"; \
- exit 1; \
- fi; \
-- done
-- @if [ ! -f $(NADPATH)/conus.lla ] ; then \
-+ done; \
-+ else \
- echo "nad2nad NADCON source files not present"; \
- fi
-- @for gridfile in $(NADPATH)/*.gsb $(NADPATH)/ntv1_can.dat dummy ; do \
-+ @for gridfile in $(NADPATH)/*.gsb $(NADPATH)/ntv1_can.dat dummy \
-+ $(NADPATH)/alaska $(NADPATH)/conus $(NADPATH)/hawaii
$(NADPATH)/null \
-+ $(NADPATH)/prvi $(NADPATH)/stgeorge $(NADPATH)/stlrnc
$(NADPATH)/stpaul \
-+ $(NADPATH)/FL $(NADPATH)/MD $(NADPATH)/TN
$(NADPATH)/WI $(NADPATH)/WO; do \
- if test "$$gridfile" != "dummy" -a -f "$$gridfile" ; then \
- echo $(INSTALL_DATA) $$gridfile $(DESTDIR)$(pkgdatadir)/`basename
$$gridfile`; \
- $(INSTALL_DATA) $$gridfile $(DESTDIR)$(pkgdatadir)/`basename
$$gridfile`; \
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 597fd81..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,5 +0,0 @@
-manpages
-geos-manpage-error.patch
-hyphen-used-as-minus-sign.patch
-nad2bin-data.patch
-epsg-28992-precision.patch
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/proj.git
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
