[DebianGIS-dev] r1803 - in packages/proj/trunk/debian: . patches

Wed Nov 26 16:54:39 UTC 2008

Author: frankie
Date: 2008-11-26 16:54:38 +0000 (Wed, 26 Nov 2008)
New Revision: 1803

Added:
   packages/proj/trunk/debian/patches/
   packages/proj/trunk/debian/patches/00list
   packages/proj/trunk/debian/patches/manpages.dpatch
Modified:
   packages/proj/trunk/debian/changelog
   packages/proj/trunk/debian/control
   packages/proj/trunk/debian/rules
Log:
Some minor fixes


Modified: packages/proj/trunk/debian/changelog
===================================================================

--- packages/proj/trunk/debian/changelog	2008-11-25 16:38:14 UTC (rev 1802)
+++ packages/proj/trunk/debian/changelog	2008-11-26 16:54:38 UTC (rev 1803)
@@ -6,8 +6,12 @@
   * Added US NAD83/NAD27, Canadian and French datum grids as distributed
     in http://download.osgeo.org/proj/proj-datumgrid-1.4.zip 
     (closes: #458369)
+  * Added dpatch support.
+  * [PATCH] manpages fixes manpages known typos. 
+    (closes: #407399, #407400, #407401, #407402)
+  * Added a README.sources with comments about datum grids.
 
- -- Francesco Paolo Lovergine <frankie at debian.org>  Tue, 25 Nov 2008 17:06:30 +0100
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Wed, 26 Nov 2008 17:49:22 +0100
 
 proj (4.6.0-2) unstable; urgency=low
 

Modified: packages/proj/trunk/debian/control
===================================================================
--- packages/proj/trunk/debian/control	2008-11-25 16:38:14 UTC (rev 1802)
+++ packages/proj/trunk/debian/control	2008-11-26 16:54:38 UTC (rev 1803)
@@ -3,7 +3,7 @@
 Priority: extra
 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 (>=5.0.0), sharutils
+Build-Depends: debhelper (>=5.0.0), sharutils, dpatch
 Standards-Version: 3.8.0
 Homepage: http://trac.osgeo.org/proj/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-grass/packages/proj/

Added: packages/proj/trunk/debian/patches/00list
===================================================================
--- packages/proj/trunk/debian/patches/00list	                        (rev 0)
+++ packages/proj/trunk/debian/patches/00list	2008-11-26 16:54:38 UTC (rev 1803)
@@ -0,0 +1 @@
+manpages

Added: packages/proj/trunk/debian/patches/manpages.dpatch
===================================================================
--- packages/proj/trunk/debian/patches/manpages.dpatch	                        (rev 0)
+++ packages/proj/trunk/debian/patches/manpages.dpatch	2008-11-26 16:54:38 UTC (rev 1803)
@@ -0,0 +1,71 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## manpages.dpatch by Francesco Paolo Lovergine <frankie at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad proj~/man/man1/cs2cs.1 proj/man/man1/cs2cs.1
+--- proj~/man/man1/cs2cs.1	2007-04-02 00:42:34.000000000 +0200
++++ proj/man/man1/cs2cs.1	2008-11-26 17:48:08.000000000 +0100
+@@ -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
+diff -urNad proj~/man/man1/geod.1 proj/man/man1/geod.1
+--- proj~/man/man1/geod.1	2007-04-02 00:40:58.000000000 +0200
++++ proj/man/man1/geod.1	2008-11-26 17:46:12.000000000 +0100
+@@ -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
+diff -urNad proj~/man/man1/nad2nad.1 proj/man/man1/nad2nad.1
+--- proj~/man/man1/nad2nad.1	2007-04-02 00:40:58.000000000 +0200
++++ proj/man/man1/nad2nad.1	2008-11-26 17:47:28.000000000 +0100
+@@ -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
+diff -urNad proj~/man/man1/proj.1 proj/man/man1/proj.1
+--- proj~/man/man1/proj.1	2007-04-02 00:40:58.000000000 +0200
++++ proj/man/man1/proj.1	2008-11-26 17:48:44.000000000 +0100
+@@ -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
+diff -urNad proj~/man/man3/pj_init.3 proj/man/man3/pj_init.3
+--- proj~/man/man3/pj_init.3	2007-04-02 00:42:34.000000000 +0200
++++ proj/man/man3/pj_init.3	2008-11-26 17:46:41.000000000 +0100
+@@ -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


Property changes on: packages/proj/trunk/debian/patches/manpages.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: packages/proj/trunk/debian/rules
===================================================================
--- packages/proj/trunk/debian/rules	2008-11-25 16:38:14 UTC (rev 1802)
+++ packages/proj/trunk/debian/rules	2008-11-26 16:54:38 UTC (rev 1803)
@@ -12,24 +12,28 @@
 endif
 # `nostrip' handled by dh_strip...
 
+include /usr/share/dpatch/dpatch.make
+
 datumgrids: datumgrids-stamp
 datumgrids-stamp:
 	unshar -c -d $(CURDIR)/nad $(CURDIR)/debian/datumgrids.shar
 	touch datumgrids-stamp
 
-build: datumgrids build-stamp
+config: patch-stamp datumgrids config.status
+config.status: 
+	./configure --prefix=/usr --infodir=/usr/share/info --mandir=/usr/share/man
+
+build: config build-stamp
 build-stamp:
 	dh_testdir
-	
-	./configure --prefix=/usr --infodir=/usr/share/info --mandir=/usr/share/man
 	make CFLAGS="$(CFLAGS)"
 	touch build-stamp
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	( cd $(CURDIR)/nad && cat $(CURDIR)/debian/datumgrids.list | xargs rm -f )
-	rm -f build-stamp install-stamp datumgrids-stamp
+	rm -f build-stamp install-stamp datumgrids-stamp 
 	[ ! -f Makefile ] || $(MAKE) distclean
 	dh_clean
 


