This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch master in repository proj.
commit fa8ace33f0b513b814810b15f341c97197f7897e Author: Bas Couwenberg <[email protected]> Date: Sun Apr 6 23:53:42 2014 +0200 Merge changes from 4.8.0-2 source package. --- debian/changelog | 18 ++++++++++++++++++ debian/libproj-dev.install | 2 +- debian/patches/manpages | 46 ++++++++++++++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + debian/rules | 1 + 5 files changed, 67 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index dc53b50..97e834d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,21 @@ +proj (4.8.0-2) unstable; urgency=low + + * Added back projects.h to libproj-dev, it is still used by Saga and + possibly other programs. + * The old utility nad2nad is not more distributed. + (closes: #716123) + * Wrong annotation is fixed. + (closes: #661827) + * Fixed minor manpages errors and removed reference to the obsolete nad2nad. + Added a patch manpages for that, because it is still not fixed upstream. + (closes: #575364) + * A few past errors seem fixed upstream + (closes: #323305, #516874) + or not issues + (closes: #475533) + + -- Francesco Paolo Lovergine <[email protected]> Fri, 29 Nov 2013 11:53:34 +0100 + proj (4.8.0-1) unstable; urgency=low [ Jerome Villeneuve Larouche ] diff --git a/debian/libproj-dev.install b/debian/libproj-dev.install index e14e055..b5eb625 100644 --- a/debian/libproj-dev.install +++ b/debian/libproj-dev.install @@ -3,4 +3,4 @@ usr/lib/libproj.la usr/lib/libproj.so usr/include/org_proj4_Projections.h usr/include/proj_api.h -src/projects.h usr/include/projects.h +usr/include/projects.h diff --git a/debian/patches/manpages b/debian/patches/manpages new file mode 100644 index 0000000..3e584f4 --- /dev/null +++ b/debian/patches/manpages @@ -0,0 +1,46 @@ +Index: proj/man/man1/cs2cs.1 +=================================================================== +--- proj.orig/man/man1/cs2cs.1 2013-11-29 12:20:15.000000000 +0100 ++++ proj/man/man1/cs2cs.1 2013-11-29 12:20:15.000000000 +0100 +@@ -184,7 +184,7 @@ + \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). +Index: proj/man/man1/proj.1 +=================================================================== +--- proj.orig/man/man1/proj.1 2013-11-29 12:20:15.000000000 +0100 ++++ proj/man/man1/proj.1 2013-11-29 12:20:36.000000000 +0100 +@@ -278,14 +278,11 @@ + 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). +Index: proj/man/man3/pj_init.3 +=================================================================== +--- proj.orig/man/man3/pj_init.3 2013-11-29 12:20:15.000000000 +0100 ++++ proj/man/man3/pj_init.3 2013-11-29 12:20:15.000000000 +0100 +@@ -103,7 +103,7 @@ + .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/series b/debian/patches/series index 963da70..3142a30 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ # no patches currently +manpages diff --git a/debian/rules b/debian/rules index 04a3472..7f0f091 100755 --- a/debian/rules +++ b/debian/rules @@ -47,6 +47,7 @@ install-stamp: dh_prep $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install + cp $(CURDIR)/src/projects.h $(CURDIR)/debian/tmp/usr/include/. # Fix manpages for man in $(CURDIR)/debian/tmp/usr/share/man/man1/*.1 $(CURDIR)/debian/tmp/usr/share/man/man3/*.3; \ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/proj.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
