[Git][debian-gis-team/grass][experimental] 4 commits: Explicitly use autoconf2.13 for autoreconf.

[Bas Couwenberg]

Bas Couwenberg pushed to branch experimental at Debian GIS Project / grass


Commits:
4ac52ea0 by Bas Couwenberg at 2020-04-27T09:54:57+02:00
Explicitly use autoconf2.13 for autoreconf.

- - - - -
0c1dba85 by Bas Couwenberg at 2020-04-27T09:55:00+02:00
Drop autotools-dev build dependency

- - - - -
3cdd844a by Bas Couwenberg at 2020-04-27T09:55:14+02:00
Add patch to fix spelling errors.

- - - - -
05289a89 by Bas Couwenberg at 2020-04-27T09:55:15+02:00
Set distribution to experimental.

- - - - -


6 changed files:

- + debian/autoconf.sh
- debian/changelog
- debian/control
- debian/patches/series
- + debian/patches/spelling-errors.patch
- debian/rules


Changes:

=====================================
debian/autoconf.sh
=====================================
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+autoconf2.13


=====================================
debian/changelog
=====================================
@@ -1,14 +1,17 @@
-grass (7.8.3~rc1-1) UNRELEASED; urgency=medium
+grass (7.8.3~rc1-1~exp1) experimental; urgency=medium
 
   * New upstream release candidate.
   * Add python3-distutils to grass-core dependencies for g.extension.
   * Bump Standards-Version to 4.5.0, no changes.
   * Bump debhelper compat to 10, changes:
     - Drop --parallel option, enabled by default
+    - Drop autotools-dev build dependency
   * Update copyright years for GRASS Development Team.
   * Refresh patches.
+  * Explicitly use autoconf2.13 for autoreconf.
+  * Add patch to fix spelling errors.
 
- -- Bas Couwenberg <sebastic at debian.org>  Mon, 27 Apr 2020 05:58:31 +0200
+ -- Bas Couwenberg <sebastic at debian.org>  Mon, 27 Apr 2020 09:54:04 +0200
 
 grass (7.8.2-1) unstable; urgency=medium
 


=====================================
debian/control
=====================================
@@ -5,7 +5,6 @@ Uploaders: Francesco Paolo Lovergine <frankie at debian.org>,
 Section: science
 Priority: optional
 Build-Depends: autoconf2.13,
-               autotools-dev,
                bison,
                debhelper (>= 10~),
                dh-python,


=====================================
debian/patches/series
=====================================
@@ -2,3 +2,4 @@ pager
 instdir
 no-fail-html.patch
 jquery.patch
+spelling-errors.patch


=====================================
debian/patches/spelling-errors.patch
=====================================
@@ -0,0 +1,39 @@
+Description: Fix spelling errors.
+ * neighour     -> neighbour
+ * excentricity -> eccentricity
+Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: https://github.com/OSGeo/grass/pull/561
+
+--- a/imagery/i.segment/region_growing.c
++++ b/imagery/i.segment/region_growing.c
+@@ -474,7 +474,7 @@ int region_growing(struct globals *globa
+ 				pathflag = FALSE;
+ 
+ 			    if (Rk_bestn.id < 0) {
+-				G_debug(4, "Rk's best neighour is negative");
++				G_debug(4, "Rk's best neighbour is negative");
+ 				pathflag = FALSE;
+ 			    }
+ 
+--- a/lib/vector/Vlib/remove_areas.c
++++ b/lib/vector/Vlib/remove_areas.c
+@@ -119,7 +119,7 @@ Vect_remove_small_areas_ext(struct Map_i
+ 	}
+ 	G_debug(3, "num neighbours = %d", AList->n_values);
+ 
+-	/* Go through the list of neighours and find that with the longest boundary */
++	/* Go through the list of neighbours and find that with the longest boundary */
+ 	dissolve_neighbour = 0;
+ 	length = -1.0;
+ 	for (i = 0; i < AList->n_values; i++) {
+--- a/imagery/i.ortho.photo/i.ortho.camera/i.ortho.camera.html
++++ b/imagery/i.ortho.photo/i.ortho.camera/i.ortho.camera.html
+@@ -54,7 +54,7 @@ fiducial marks. In the ideal case of no
+ calibration certificate) the center is the origin and the values are 0 for
+ both X and Y of Point of Symmetry. But usually the principal point does not
+ fall on the intersection of the radii at the center of the picture. This
+-excentricity is usually of the order of a few micrometers. <p>
++eccentricity is usually of the order of a few micrometers. <p>
+ 
+ You are then asked to enter the X and Y photo coordinates of each fiducial
+ as follows.


=====================================
debian/rules
=====================================
@@ -16,6 +16,8 @@ ifeq ($(VENDOR_DERIVES_FROM_UBUNTU),yes)
   endif
 endif
 
+export AUTOCONF = ./debian/autoconf.sh
+
 VERSION=$(shell echo `head -2 $(CURDIR)/include/VERSION` | sed -e 's/ //')
 ABI=$(shell echo `head -3 $(CURDIR)/include/VERSION` | sed -e 's/ //g' -e 's/RC/-/')
 GRASS_ABI=grass$(ABI)



View it on GitLab: https://salsa.debian.org/debian-gis-team/grass/-/compare/d46c1fabcdb12cec1b3eb628e719a48414bf994c...05289a898902eccb96bfad04a54e780ce05d554f

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/grass/-/compare/d46c1fabcdb12cec1b3eb628e719a48414bf994c...05289a898902eccb96bfad04a54e780ce05d554f
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/20200427/234b8bd5/attachment-0001.html>