[DebianGIS-dev] r2258 - in packages/proj/trunk: debian man/man1 man/man3

frankie at alioth.debian.org frankie at alioth.debian.org
Fri May 29 10:48:12 UTC 2009 

Author: frankie
Date: 2009-05-29 10:48:11 +0000 (Fri, 29 May 2009)
New Revision: 2258

Modified:
   packages/proj/trunk/debian/README.debian
   packages/proj/trunk/debian/control
   packages/proj/trunk/debian/rules
   packages/proj/trunk/man/man1/cs2cs.1
   packages/proj/trunk/man/man1/geod.1
   packages/proj/trunk/man/man1/nad2nad.1
   packages/proj/trunk/man/man1/proj.1
   packages/proj/trunk/man/man3/pj_init.3
Log:
Fixed datum shifts support.


Modified: packages/proj/trunk/debian/README.debian
===================================================================
--- packages/proj/trunk/debian/README.debian	2009-05-28 19:19:31 UTC (rev 2257)
+++ packages/proj/trunk/debian/README.debian	2009-05-29 10:48:11 UTC (rev 2258)
@@ -61,7 +61,7 @@
 ~~~~
 geod is useful for calculating a latitude & longitude given another
 position, along with distance and bearing.  The man page has a good
-example.  It's also useful to caculate the distance and bearing between two
+example.  It's also useful to calculate the distance and bearing between two
 locations.  Let's verify that one nautical mile is (approx) equal to one
 minute in latitude (between 42 degN and 42 degN 1 minute):
 
@@ -81,7 +81,7 @@
 nad2nad and cs2cs:
 ~~~~~~~~~~~~~~~~~
 The Debian proj package includes built-in datum conversion.  (It was
-compiled with proj-datumgrid-1.3.zip unpacked in the nad source directory.)
+compiled with proj-datumgrid-1.4.zip unpacked in the nad source directory.)
 
 nad2nad is a filter to convert data between North America Datum 1927
 (NAD27) and North American Datum 1983.  nad2nad can optionally process both
@@ -111,7 +111,8 @@
 
 117d0'2.901"W   30d0'0.407"N 0.00
 
-See http://www.remotesensing.org/proj/faq.html
+See http://trac.osgeo.org/proj/wiki/FAQ
 
 Peter S Galbraith <psg at debian.org>
-Updated April 2003
+Francesco P Lovergine <frankie at debian.org>
+Updated May 2009

Modified: packages/proj/trunk/debian/control
===================================================================
--- packages/proj/trunk/debian/control	2009-05-28 19:19:31 UTC (rev 2257)
+++ packages/proj/trunk/debian/control	2009-05-29 10:48:11 UTC (rev 2258)
@@ -4,7 +4,7 @@
 Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
 Uploaders: Peter S Galbraith <psg at debian.org>, Francesco Paolo Lovergine <frankie at debian.org>
 Build-Depends: debhelper (>= 7), sharutils, dpatch
-Standards-Version: 3.8.0
+Standards-Version: 3.8.1
 Homepage: http://trac.osgeo.org/proj/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-grass/packages/proj/
 Vcs-Svn: svn://svn.debian.org/pkg-grass/packages/proj/

Modified: packages/proj/trunk/debian/rules
===================================================================
--- packages/proj/trunk/debian/rules	2009-05-28 19:19:31 UTC (rev 2257)
+++ packages/proj/trunk/debian/rules	2009-05-29 10:48:11 UTC (rev 2258)
@@ -39,13 +39,14 @@
 	rm -f $(CURDIR)/debian/*.log
 	dh_clean
 
-install: build
+install: build install-stamp
+install-stamp:
 	dh_testdir
 	dh_testroot
-	dh_prep
 	dh_installdirs
+	dh_prep 
 	
-	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
+	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install 
 	
 	# Fix manpages 
 	for man in $(CURDIR)/debian/tmp/usr/share/man/man1/*.1 $(CURDIR)/debian/tmp/usr/share/man/man3/*.3; \
@@ -54,13 +55,15 @@
 	done
 	# Fixating man section in pj_init.3
 	sed -i -e 's/\(.TH PJ_INIT\) 3U\(.*\)/\1 3\2/' $(CURDIR)/debian/tmp/usr/share/man/man3/pj_init.3
+	touch $@
 
-install-data: config
+install-data: build install-data-stamp
+install-data-stamp:
 	dh_testdir
 	dh_testroot
-	dh_prep
 	dh_installdirs
 	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install-data
+	touch $@
 
 # Build architecture-independent files here.
 binary-indep: 
@@ -75,7 +78,7 @@
 	dh_builddeb -i
 
 # Build architecture-dependent files here.
-binary-arch: install install-data
+binary-arch: install 
 	dh_testdir -a
 	dh_testroot -a
 	dh_install -a

Modified: packages/proj/trunk/man/man1/cs2cs.1
===================================================================
--- packages/proj/trunk/man/man1/cs2cs.1	2009-05-28 19:19:31 UTC (rev 2257)
+++ packages/proj/trunk/man/man1/cs2cs.1	2009-05-29 10:48:11 UTC (rev 2258)
@@ -130,7 +130,7 @@
 each and may have the same or different datums.  
 .PP
 Additional projection control parameters may be contained in two
-auxilliary control files:
+auxiliary control files:
 the first is optionally referenced with the
 .BI +init= file:id
 and the second is always processed after the name

Modified: packages/proj/trunk/man/man1/geod.1
===================================================================
--- packages/proj/trunk/man/man1/geod.1	2009-05-28 19:19:31 UTC (rev 2257)
+++ packages/proj/trunk/man/man1/geod.1	2009-05-29 10:48:11 UTC (rev 2258)
@@ -97,10 +97,10 @@
 for specifying the ellipsoidal or sphere to use.
 See
 .B proj
-documentation for full list of these parameters and contrl.
+documentation for full list of these parameters and controls.
 The options are processed in left to right order
 from the run line.
-Reentry of an option is ignored with the first occurance assumed to
+Reentry of an option is ignored with the first occurrence assumed to
 be the desired value.
 .PP
 One or more

Modified: packages/proj/trunk/man/man1/nad2nad.1
===================================================================
--- packages/proj/trunk/man/man1/nad2nad.1	2009-05-28 19:19:31 UTC (rev 2257)
+++ packages/proj/trunk/man/man1/nad2nad.1	2009-05-29 10:48:11 UTC (rev 2258)
@@ -41,7 +41,7 @@
 Datum conversion requires the data to be in geographic coordinates, but
 .B nad2nad
 will allow conversion of data to and from SPCS or UTM grid systems.
-The following are keywords and arguments reconized by both the
+The following are keywords and arguments recognized by both the
 .B \-i
 and
 .B \-o

Modified: packages/proj/trunk/man/man1/proj.1
===================================================================
--- packages/proj/trunk/man/man1/proj.1	2009-05-28 19:19:31 UTC (rev 2257)
+++ packages/proj/trunk/man/man1/proj.1	2009-05-29 10:48:11 UTC (rev 2258)
@@ -218,7 +218,7 @@
 and supplementary documentation for Release 4.
 .PP
 Additional projection control parameters may be contained in two
-auxilliary control files:
+auxiliary control files:
 the first is optionally referenced with the
 .BI +init= file:id
 and the second is always processed after the name

Modified: packages/proj/trunk/man/man3/pj_init.3
===================================================================
--- packages/proj/trunk/man/man3/pj_init.3	2009-05-28 19:19:31 UTC (rev 2257)
+++ packages/proj/trunk/man/man3/pj_init.3	2009-05-29 10:48:11 UTC (rev 2258)
@@ -76,7 +76,7 @@
 Memory associated with the projection may be freed with \fBpj_free\fR.
 .SH EXAMPLE
 The following program reads latitude and longitude values in decimal
-degress, performs Mercator projection with a Clarke 1866 ellipsoid and
+degrees, performs Mercator projection with a Clarke 1866 ellipsoid and
 a 33\(de latitude of true scale and prints the projected
 cartesian values in meters:
 .nf

More information about the Pkg-grass-devel mailing list