[DebianGIS-dev] r2934 - in packages/grass/trunk/debian: . patches
frankie at alioth.debian.org
frankie at alioth.debian.org
Tue Sep 28 09:45:20 UTC 2010
Author: frankie
Date: 2010-09-28 09:45:16 +0000 (Tue, 28 Sep 2010)
New Revision: 2934
Added:
packages/grass/trunk/debian/patches/clean_nodes.dpatch
packages/grass/trunk/debian/patches/convert.c.dpatch
packages/grass/trunk/debian/patches/g.proj.dpatch
packages/grass/trunk/debian/patches/r.grow.distance.dpatch
packages/grass/trunk/debian/patches/read_sig.c.dpatch
Modified:
packages/grass/trunk/debian/changelog
packages/grass/trunk/debian/patches/00list
Log:
Some fixes taken from 6.4 final.
Modified: packages/grass/trunk/debian/changelog
===================================================================
--- packages/grass/trunk/debian/changelog 2010-09-22 08:48:47 UTC (rev 2933)
+++ packages/grass/trunk/debian/changelog 2010-09-28 09:45:16 UTC (rev 2934)
@@ -4,11 +4,25 @@
splitted in a few sub-patches for specific improvements.
+ localization.dpatch: updates to .po files.
+ doc.dpatch: various documentation fixes with update to main URL too.
- + gcs.dpatch: fix a proj description in a .csv file for a specific CRS.
+ + gcs.dpatch: Port GDAL's http://trac.osgeo.org/gdal/changeset/19810
+ to fix missing towsg84 for EPSG codes: 3120 2172 2173 2174 2175
+ 3333 3334 3335 3329 3330 3331 3332 3328 4179.
+ It also forces ETRS89 datum to be
+ interpreted as 0,0,0,0,0,0,0 instead of 0.000,0.000,0.000 (i.e.
+ overrides the datum.table ETRS89 setting, too). More info:
+ http://lists.osgeo.org/pipermail/grass-dev/2010-June/050918.html,
+ http://trac.osgeo.org/gdal/ticket/3579.
+ g.extension.dpatch: added Markus g.extension script to download and
eventually install extension from GRASS svn add-ons repo.
+ scripts.dpatch: some plain fixes to some shell scripts: m.proj,
r.mask, v.in.gpsbabel, v.in.mapgen. r.regression.line.
+ + g.proj: only split at space characters if there is a + character
+ following
+ + clean_nodes: in Vlib fixes segfault when cleaning small angles
+ at nodes
+ + read_sig.c: catch empty sig files
+ + convert.c: added non-standard datum name lookup
+ + r.grow.distance: bugfix for distance calculation
* Added missing docs used by GUIs: AUTHORS, contributors CSV files,
COPYING and a symlink to GPL-2 license in /usr/share/common-licenses.
Those files need to be symlinked in GISBASE to be found at run-time.
Modified: packages/grass/trunk/debian/patches/00list
===================================================================
--- packages/grass/trunk/debian/patches/00list 2010-09-22 08:48:47 UTC (rev 2933)
+++ packages/grass/trunk/debian/patches/00list 2010-09-28 09:45:16 UTC (rev 2934)
@@ -8,3 +8,8 @@
doc
gcs
g.extension
+g.proj
+clean_nodes
+read_sig.c
+convert.c
+r.grow.distance
Added: packages/grass/trunk/debian/patches/clean_nodes.dpatch
===================================================================
--- packages/grass/trunk/debian/patches/clean_nodes.dpatch (rev 0)
+++ packages/grass/trunk/debian/patches/clean_nodes.dpatch 2010-09-28 09:45:16 UTC (rev 2934)
@@ -0,0 +1,38 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## clean_nodes.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 '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' grass-6.4.0~rc6+42329~/lib/vector/Vlib/clean_nodes.c grass-6.4.0~rc6+42329/lib/vector/Vlib/clean_nodes.c
+--- grass-6.4.0~rc6+42329~/lib/vector/Vlib/clean_nodes.c 2010-03-15 14:27:12.000000000 +0100
++++ grass-6.4.0~rc6+42329/lib/vector/Vlib/clean_nodes.c 2010-09-28 11:30:43.000000000 +0200
+@@ -162,6 +162,10 @@
+ Vect_line_delete_point(Points, Points->n_points - 1); /* last */
+ }
+
++ /* It may happen that it is one line: node could be deleted,
++ * in that case we have to read the node coords first */
++ Vect_get_node_coor(Map, node, &nx, &ny, &nz);
++
+ if (Points->n_points > 1) {
+ new_short_line =
+ Vect_rewrite_line(Map, abs(short_line),
+@@ -200,7 +204,6 @@
+ type = GV_LINE;
+ }
+
+- Vect_get_node_coor(Map, node, &nx, &ny, &nz);
+ Vect_reset_line(Points);
+ Vect_append_point(Points, nx, ny, nz);
+ Vect_append_point(Points, x, y, z);
+@@ -242,7 +245,7 @@
+ angle1 = angle2;
+ }
+
+- if (clean)
++ if (clean || !Vect_node_alive(Map, node))
+ break;
+ }
+ }
Property changes on: packages/grass/trunk/debian/patches/clean_nodes.dpatch
___________________________________________________________________
Added: svn:executable
+ *
Added: packages/grass/trunk/debian/patches/convert.c.dpatch
===================================================================
--- packages/grass/trunk/debian/patches/convert.c.dpatch (rev 0)
+++ packages/grass/trunk/debian/patches/convert.c.dpatch 2010-09-28 09:45:16 UTC (rev 2934)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## convert.c.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 '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' grass-6.4.0~rc6+42329~/lib/proj/convert.c grass-6.4.0~rc6+42329/lib/proj/convert.c
+--- grass-6.4.0~rc6+42329~/lib/proj/convert.c 2010-03-15 14:27:23.000000000 +0100
++++ grass-6.4.0~rc6+42329/lib/proj/convert.c 2010-09-28 11:42:02.000000000 +0200
+@@ -744,6 +744,8 @@
+ "Militar_Geographische_Institut",
+ "Potsdam_Datum_83",
+ "Deutsches_Hauptdreiecksnetz",
++ "South_American_1969",
++ "South_American_Datum_1969",
+ NULL
+ };
+
Property changes on: packages/grass/trunk/debian/patches/convert.c.dpatch
___________________________________________________________________
Added: svn:executable
+ *
Added: packages/grass/trunk/debian/patches/g.proj.dpatch
===================================================================
--- packages/grass/trunk/debian/patches/g.proj.dpatch (rev 0)
+++ packages/grass/trunk/debian/patches/g.proj.dpatch 2010-09-28 09:45:16 UTC (rev 2934)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## g.proj.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 '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' grass-6.4.0~rc6+42329~/general/g.proj/output.c grass-6.4.0~rc6+42329/general/g.proj/output.c
+--- grass-6.4.0~rc6+42329~/general/g.proj/output.c 2010-03-15 14:28:48.000000000 +0100
++++ grass-6.4.0~rc6+42329/general/g.proj/output.c 2010-09-28 11:23:02.000000000 +0200
+@@ -114,7 +114,7 @@
+ if (i == proj4mod && *i == ' ')
+ continue;
+
+- if (*i == ' ' && !(dontprettify))
++ if (*i == ' ' && *(i+1) == '+' && !(dontprettify))
+ fputc('\n', stdout);
+ else
+ fputc(*i, stdout);
Property changes on: packages/grass/trunk/debian/patches/g.proj.dpatch
___________________________________________________________________
Added: svn:executable
+ *
Added: packages/grass/trunk/debian/patches/r.grow.distance.dpatch
===================================================================
--- packages/grass/trunk/debian/patches/r.grow.distance.dpatch (rev 0)
+++ packages/grass/trunk/debian/patches/r.grow.distance.dpatch 2010-09-28 09:45:16 UTC (rev 2934)
@@ -0,0 +1,23 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## r.grow.distance.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 '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' grass-6.4.0~rc6+42329~/raster/r.grow.distance/main.c grass-6.4.0~rc6+42329/raster/r.grow.distance/main.c
+--- grass-6.4.0~rc6+42329~/raster/r.grow.distance/main.c 2010-03-15 14:25:49.000000000 +0100
++++ grass-6.4.0~rc6+42329/raster/r.grow.distance/main.c 2010-09-28 11:44:22.000000000 +0200
+@@ -287,6 +287,12 @@
+ check(col, 1, -1);
+ }
+
++ for (col = 0; col < ncols; col++)
++ check(col, -1, 0);
++
++ for (col = ncols - 1; col >= 0; col--)
++ check(col, 1, 0);
++
+ if (dist_name) {
+ if (out_row != dist_row)
+ for (col = 0; col < ncols; col++)
Property changes on: packages/grass/trunk/debian/patches/r.grow.distance.dpatch
___________________________________________________________________
Added: svn:executable
+ *
Added: packages/grass/trunk/debian/patches/read_sig.c.dpatch
===================================================================
--- packages/grass/trunk/debian/patches/read_sig.c.dpatch (rev 0)
+++ packages/grass/trunk/debian/patches/read_sig.c.dpatch 2010-09-28 09:45:16 UTC (rev 2934)
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## read_sig.c.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 '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' grass-6.4.0~rc6+42329~/imagery/i.smap/shapiro/read_sig.c grass-6.4.0~rc6+42329/imagery/i.smap/shapiro/read_sig.c
+--- grass-6.4.0~rc6+42329~/imagery/i.smap/shapiro/read_sig.c 2010-03-15 14:28:18.000000000 +0100
++++ grass-6.4.0~rc6+42329/imagery/i.smap/shapiro/read_sig.c 2010-09-28 11:34:11.000000000 +0200
+@@ -26,6 +26,9 @@
+ if (I_ReadSigSet(fd, S) < 0 || Ref.nfiles != S->nbands)
+ G_fatal_error(_("Signature file <%s> is invalid"), parms->sigfile);
+
++ if (S->ClassSig == NULL || S->title == NULL)
++ G_fatal_error(_("Signature file <%s> is empty"), parms->sigfile);
++
+ fclose(fd);
+
+ return 0;
Property changes on: packages/grass/trunk/debian/patches/read_sig.c.dpatch
___________________________________________________________________
Added: svn:executable
+ *
More information about the Pkg-grass-devel
mailing list