[Git][debian-gis-team/grass][ubuntugis/bionic] 5 commits: New upstream version 7.6.1
Martin Landa
gitlab at salsa.debian.org
Thu Mar 21 16:14:36 GMT 2019
Martin Landa pushed to branch ubuntugis/bionic at Debian GIS Project / grass
Commits:
d0e5eace by Bas Couwenberg at 2019-03-20T05:55:15Z
New upstream version 7.6.1
- - - - -
4016435b by Bas Couwenberg at 2019-03-20T05:55:46Z
Merge tag 'upstream/7.6.1' into experimental
Upstream version 7.6.1
- - - - -
b85f969b by Bas Couwenberg at 2019-03-20T05:57:44Z
New upstream release.
- - - - -
af35cc82 by Bas Couwenberg at 2019-03-20T05:58:56Z
Set distribution to experimental.
- - - - -
bf9a4ace by Martin Landa at 2019-03-21T15:56:54Z
Rebuild 7.6.1 for bionic
- - - - -
10 changed files:
- − ChangeLog_7.6.1RC1.gz
- debian/changelog
- imagery/i.evapo.pt/i.evapo.pt.html
- imagery/i.landsat.toar/i.landsat.toar.html
- include/VERSION
- lib/vector/Vlib/field.c
- raster/r.info/main.c
- raster/r.sim/r.sim.water/r.sim.water.html
- raster/r.stats/main.c
- vector/v.lidar.edgedetection/v.lidar.edgedetection.html
Changes:
=====================================
ChangeLog_7.6.1RC1.gz deleted
=====================================
Binary files a/ChangeLog_7.6.1RC1.gz and /dev/null differ
=====================================
debian/changelog
=====================================
@@ -1,3 +1,15 @@
+grass (7.6.1-1~bionic1) bionic; urgency=medium
+
+ * Rebuild for bionic.
+
+ -- Martin Landa <landa.martin at gmail.com> Thu, 21 Mar 2019 16:55:01 +0100
+
+grass (7.6.1-1~exp1) experimental; urgency=medium
+
+ * New upstream release.
+
+ -- Bas Couwenberg <sebastic at debian.org> Wed, 20 Mar 2019 06:58:25 +0100
+
grass (7.6.1~rc1-1~exp1~bionic1) bionic; urgency=medium
* Rebuild for bionic.
=====================================
imagery/i.evapo.pt/i.evapo.pt.html
=====================================
@@ -37,4 +37,4 @@ Alpha values extracted from:
Yann Chemin, GRASS Development Team, 2007-08
-<p><i>Last changed: $Date: 2019-01-30 12:02:35 +0100 (Mi, 30. Jan 2019) $</i>
+<p><i>Last changed: $Date: 2019-01-30 12:02:35 +0100 (Wed, 30 Jan 2019) $</i>
=====================================
imagery/i.landsat.toar/i.landsat.toar.html
=====================================
@@ -285,4 +285,4 @@ E. Jorge Tizado (ej.tizado unileon es), Dept. Biodiversity and Environmental Ma
University of León, Spain
<p>
-<i>Last changed: $Date: 2019-01-30 12:02:35 +0100 (Mi, 30. Jan 2019) $</i>
+<i>Last changed: $Date: 2019-01-30 12:02:35 +0100 (Wed, 30 Jan 2019) $</i>
=====================================
include/VERSION
=====================================
@@ -1,4 +1,4 @@
7
6
-1RC1
+1
2019
=====================================
lib/vector/Vlib/field.c
=====================================
@@ -57,6 +57,35 @@ struct dblinks *Vect_new_dblinks_struct(void)
return p;
}
+static int name2sql(char *name)
+{
+ char *s = name;
+ int ret;
+
+ if (!s)
+ return 0;
+
+ /* sql-compliant name must start with letter */
+ if (!((*s >= 'A' && *s <= 'Z') || (*s >= 'a' && *s <= 'z'))) {
+ G_warning(_("Name <%s> is not SQL compliant. Must start with a letter."),
+ name);
+ return 0;
+ }
+
+ ret = 1;
+ /* convert illegal characters to underscore */
+ for (s++; *s; s++) {
+ if (!((*s >= 'A' && *s <= 'Z') || (*s >= 'a' && *s <= 'z') ||
+ (*s >= '0' && *s <= '9') || *s == '_')) {
+ G_debug(2, "Character '%c' not allowed.", *s);
+ *s = '_';
+ ret++;
+ }
+ }
+
+ return ret;
+}
+
/*!
\brief Reset dblinks structure (number of fields)
@@ -275,7 +304,11 @@ int Vect_add_dblink(struct dblinks *p, int number, const char *name,
if (name != NULL) {
p->field[p->n_fields].name = G_store(name);
/* replace all spaces with underscore, otherwise dbln can't be read */
- G_strchg(p->field[p->n_fields].name, ' ', '_');
+ /* G_strchg(p->field[p->n_fields].name, ' ', '_'); */
+ if (!name2sql(p->field[p->n_fields].name)) {
+ G_free(p->field[p->n_fields].name);
+ p->field[p->n_fields].name = NULL;
+ }
}
else
p->field[p->n_fields].name = NULL;
@@ -359,13 +392,27 @@ struct field_info *Vect_default_field_info(struct Map_info *Map,
fi->number = field;
+ /* Field name */
+ fi->name = NULL;
+ if (field_name && *field_name) {
+ fi->name = G_store(field_name);
+ if (!name2sql(fi->name)) {
+ G_free(fi->name);
+ fi->name = NULL;
+ }
+ }
+
/* Table name */
if (type == GV_1TABLE) {
sprintf(buf, "%s", Map->name);
}
else {
- if (field_name != NULL && strlen(field_name) > 0)
- sprintf(buf, "%s_%s", Map->name, field_name);
+ if (fi->name != NULL && strlen(fi->name) > 0) {
+ sprintf(buf, "%s_%s", Map->name, fi->name);
+ if (!name2sql(buf)) {
+ sprintf(buf, "%s_%d", Map->name, field);
+ }
+ }
else
sprintf(buf, "%s_%d", Map->name, field);
}
@@ -378,10 +425,8 @@ struct field_info *Vect_default_field_info(struct Map_info *Map,
fi->table = G_store(buf);
}
- /* Field name */
- if (field_name)
- fi->name = G_store(field_name);
- else
+ /* Field name still empty */
+ if (!fi->name)
fi->name = G_store(buf);
fi->key = G_store(GV_KEY_COLUMN); /* Should be: id/fid/gfid/... ? */
=====================================
raster/r.info/main.c
=====================================
@@ -197,7 +197,7 @@ int main(int argc, char **argv)
{
compose_line(out, " Rows: %d", cellhd.rows);
compose_line(out, " Columns: %d", cellhd.cols);
- compose_line(out, " Total Cells: %ju",
+ compose_line(out, " Total Cells: %jd",
(grass_int64)cellhd.rows * cellhd.cols);
/* This is printed as a guide to what the following eastings and
=====================================
raster/r.sim/r.sim.water/r.sim.water.html
=====================================
@@ -235,4 +235,4 @@ Chris Thaxton<br>
North Carolina State University<br>
<i><a href="mailto:csthaxto at unity.ncsu.edu">csthaxto at unity.ncsu.edu</a></i>
-<p><i>Last changed: $Date: 2019-01-30 12:02:35 +0100 (Mi, 30. Jan 2019) $</i>
+<p><i>Last changed: $Date: 2019-01-30 12:02:35 +0100 (Wed, 30 Jan 2019) $</i>
=====================================
raster/r.stats/main.c
=====================================
@@ -183,7 +183,8 @@ int main(int argc, char *argv[])
flag.x = G_define_flag();
flag.x->key = 'x';
- flag.x->description = _("Print x and y (column and row)");
+ flag.x->label = _("Print x and y (column and row)");
+ flag.x->description = _("Indexing starts with 1: first column and row are 1");
flag.x->guisection = _("Coordinates");
flag.A = G_define_flag();
=====================================
vector/v.lidar.edgedetection/v.lidar.edgedetection.html
=====================================
@@ -168,4 +168,4 @@ Update for GRASS 6.X:
Roberto Antolin and Gonzalo Moreno
<p>
-<i>Last changed: $Date: 2019-01-30 12:02:35 +0100 (Mi, 30. Jan 2019) $</i>
+<i>Last changed: $Date: 2019-01-30 12:02:35 +0100 (Wed, 30 Jan 2019) $</i>
View it on GitLab: https://salsa.debian.org/debian-gis-team/grass/compare/3ffafaacc696a3080e28e57beb602d38e9df8862...bf9a4ace44d134d64dafc442d8a2a871a4362c3b
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/grass/compare/3ffafaacc696a3080e28e57beb602d38e9df8862...bf9a4ace44d134d64dafc442d8a2a871a4362c3b
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20190321/7edd1d18/attachment-0001.html>
More information about the Pkg-grass-devel
mailing list