HOWTO_RELEASE

 - Set version in configure.ac
 - Tweak -version-info in src/Makefile.am
 - Run make distcheck, fix if needed
-- Commit all of the above
-- Regenerate ChangeLog (make cl) and commit again
-- Commit and push to repository, confirm bots are all happy
+- Commit all of the above, confirm bots are all happy
 - Add annotated tag: git tag -sa librttopo-<version>
 - Push annotated tag to repository: git push <remote> librttopo-<version>
 - Create release artifacts: make dist

NEWS.md

@@ -6,6 +6,9 @@ YYYY-MM-DD
  - Support for tolerance/precision=0 added, -1 is the new value
    for automatic computation of minimal tolerance.
 
+ - The getEdgeWithinBox2D backend callback needs to support a NULL
+   value as BBOX pointer (to return all edges)
+
  # New Features
 
  - Function `rtt_AddLineNoFace`, to add lines w/out determining new

README.md

@@ -5,7 +5,7 @@ RT Topology Library
 
 | OSGeo | GitLab |
 |:---   |:---    |
-| [![Build Status](https://drone.osgeo.kbt.io/api/badges/rttopo/librttopo/status.svg)] (https://drone.osgeo.kbt.io/rttopo/librttopo) | [![Gitlab-CI](https://gitlab.com/rttopo/rttopo/badges/master/build.svg)] (https://gitlab.com/rttopo/rttopo/commits/master) |
+| [![Build Status](https://drone.osgeo.org/api/badges/rttopo/librttopo/status.svg)] (https://drone.osgeo.org/rttopo/librttopo) | [![Gitlab-CI](https://gitlab.com/rttopo/rttopo/badges/master/build.svg)] (https://gitlab.com/rttopo/rttopo/commits/master) |
 
 
 ## About
@@ -23,7 +23,7 @@ The RT Topology Library was funded by "Regione Toscana - SITA"
 (CIG: 6445512CC1), which also funded many improvements in the
 originating liblwgeom.
 
-Official code repository is https://git.osgeo.org/gogs/rttopo/librttopo.
+Official code repository is https://git.osgeo.org/gitea/rttopo/librttopo.
 
 A mirror exists at https://gitlab.com/rttopo/rttopo, automatically
 updated on every push to the official repository.

configure.ac

@@ -20,10 +20,23 @@ AC_DEFINE_UNQUOTED([LIBRTGEOM_VERSION], ["$VERSION"], [rtgeom version])
 AC_SUBST([LIBRTGEOM_VERSION])
 AH_TEMPLATE([RTGEOM_GEOS_VERSION],
             [RTTOPO GEOS version.])
-AH_TEMPLATE([RTGEOM_DEBUG_LEVEL],
-            [RTGEOM Debug Level.])
-AC_DEFINE(RTGEOM_DEBUG_LEVEL)
-AC_DEFINE_UNQUOTED([RTGEOM_DEBUG_LEVEL], [0], [debug level])
+
+AC_ARG_ENABLE([debug], AC_HELP_STRING([--enable-debug@<:@=LEVEL@:>@],
+  [Enable debugging messages up to LEVEL (4 if omitted)]),
+  [
+if test "$enableval" = "no"; then
+  RTGEOM_DEBUG_LEVEL=0;
+else
+  if test "$enableval" = "yes"; then
+    RTGEOM_DEBUG_LEVEL=4;
+  else
+    RTGEOM_DEBUG_LEVEL=$enableval;
+  fi;
+fi
+  ],
+  [RTGEOM_DEBUG_LEVEL=0])
+AC_DEFINE_UNQUOTED([RTGEOM_DEBUG_LEVEL], [$RTGEOM_DEBUG_LEVEL], [RTGEOM Debug level])
+
 
 # Checks for header files.
 AC_CHECK_HEADERS(stdlib.h,, [AC_MSG_ERROR([cannot find stdlib.h, bailing out])])

debian/changelog

-librttopo (1.1.0~rc0-1~exp4) UNRELEASED; urgency=medium
+librttopo (1.1.0~rc1-1~exp1) experimental; urgency=medium
 
+  * New upstream release candidate.
   * Update URLs for move from gogs to gitea.
-  * Bump Standards-Version to 4.1.2, no changes.
+  * Bump Standards-Version to 4.1.3, no changes.
   * Update copyright-format URL to use HTTPS.
+  * Mark packages as Multi-Arch: same.
 
- -- Bas Couwenberg <sebastic@debian.org>  Fri, 22 Dec 2017 23:52:19 +0100
+ -- Bas Couwenberg <sebastic@debian.org>  Thu, 25 Jan 2018 10:12:34 +0100
 
 librttopo (1.1.0~rc0-1~exp3) experimental; urgency=medium
 

debian/control

@@ -9,13 +9,14 @@ Build-Depends: debhelper (>= 9),
                libjson-c-dev,
                libpcre3-dev,
                libxml2-dev
-Standards-Version: 4.1.2
+Standards-Version: 4.1.3
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/librttopo.git/
 Vcs-Git: https://anonscm.debian.org/git/pkg-grass/librttopo.git
 Homepage: https://git.osgeo.org/gitea/rttopo/librttopo
 
 Package: librttopo1
 Architecture: any
+Multi-Arch: same
 Section: libs
 Depends: ${shlibs:Depends},
          ${misc:Depends}
@@ -31,6 +32,7 @@ Description: Tuscany Region topology library
 
 Package: librttopo-dev
 Architecture: any
+Multi-Arch: same
 Section: libdevel
 Depends: librttopo1 (= ${binary:Version}),
          ${misc:Depends},

headers/librttopo.h

 /**********************************************************************
  *
  * rttopo - topology library
- * http://git.osgeo.org/gogs/rttopo/librttopo
+ * http://git.osgeo.org/gitea/rttopo/librttopo
  *
  * rttopo is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -458,7 +458,7 @@ typedef struct RTT_BE_CALLBACKS_T {
    * Get edges whose bounding box overlaps a given 2D bounding box
    *
    * @param topo the topology to act upon
-   * @param box the query box
+   * @param box the query box, to be considered infinite if NULL
    * @param numelems output parameter, gets number of elements found
    *                 if the return is not null, otherwise see @return
    *                 section for semantic.
@@ -1418,21 +1418,22 @@ RTGEOM* rtt_GetFaceGeometry(RTT_TOPOLOGY* topo, RTT_ELEMID face);
 /*
  * rtt_tpsnap - snap geometry to topology
  *
- * Uses Trevisani-Peri algorithm version 7 as reported here:
- * https://git.osgeo.org/gogs/rttopo/librttopo/wiki/SnapToTopo-algorithm
+ * Uses Trevisani-Peri algorithm version 13 as reported here:
+ * https://git.osgeo.org/gitea/rttopo/librttopo/wiki/SnapToTopo-algorithm
  *
  * @param topo the reference topology
  * @param gin the input geometry
- * @param tssnap snap tolerance
+ * @param tolerance_snap snap tolerance
+ * @param tolerance_removal removal tolerance (use -1 to skip removal phase)
  * @param iterate if non zero, allows snapping to more than a single vertex,
  *                iteratively
- * @param remove_vertices if non zero, makes an initial pass removing
- *                        vertices within tolerance
  *
  * @return a new geometry, or NULL on error
  *
  */
 RTGEOM* rtt_tpsnap(RTT_TOPOLOGY *topo, const RTGEOM *gin,
-                   double tssnap, int iterate, int remove_vertices);
+                   double tolerance_snap,
+                   double tolerance_removal,
+                   int iterate);
 
 #endif /* LIBRTGEOM_TOPO_H */

headers/librttopo_geom.h.in

 /**********************************************************************
  *
  * rttopo - topology library
- * http://git.osgeo.org/gogs/rttopo/librttopo
+ * http://git.osgeo.org/gitea/rttopo/librttopo
  *
  * rttopo is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/Makefile.am

 
-AM_CPPFLAGS = -I$(top_srcdir)/src
-AM_CPPFLAGS += -I$(top_srcdir)/headers
+AM_CPPFLAGS = -I$(top_builddir)/src
+AM_CPPFLAGS += -I$(top_builddir)/headers -I$(top_srcdir)/headers
 
 lib_LTLIBRARIES = librttopo.la
 

src/box2d.c

 /**********************************************************************
  *
  * rttopo - topology library
- * http://git.osgeo.org/gogs/rttopo/librttopo
+ * http://git.osgeo.org/gitea/rttopo/librttopo
  *
  * rttopo is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -25,6 +25,7 @@
  **********************************************************************/
 
 
+#include "rttopo_config.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

src/bytebuffer.c

 /**********************************************************************
  *
  * rttopo - topology library
- * http://git.osgeo.org/gogs/rttopo/librttopo
+ * http://git.osgeo.org/gitea/rttopo/librttopo
  *
  * rttopo is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -25,6 +25,7 @@
 
 
 
+#include "rttopo_config.h"
 #include "librttopo_geom_internal.h"
 #include "bytebuffer.h"
 

src/bytebuffer.h

 /**********************************************************************
  *
  * rttopo - topology library
- * http://git.osgeo.org/gogs/rttopo/librttopo
+ * http://git.osgeo.org/gitea/rttopo/librttopo
  *
  * rttopo is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/g_box.c

 /**********************************************************************
  *
  * rttopo - topology library
- * http://git.osgeo.org/gogs/rttopo/librttopo
+ * http://git.osgeo.org/gitea/rttopo/librttopo
  *
  * rttopo is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,6 +27,7 @@
 #if !HAVE_ISFINITE
 #endif
 
+#include "rttopo_config.h"
 #include "librttopo_geom_internal.h"
 #include "rtgeom_log.h"
 #include <stdlib.h>

src/g_serialized.c

 /**********************************************************************
  *
  * rttopo - topology library
- * http://git.osgeo.org/gogs/rttopo/librttopo
+ * http://git.osgeo.org/gitea/rttopo/librttopo
  *
  * rttopo is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
 
 
 
+#include "rttopo_config.h"
 #include "librttopo_geom_internal.h"
 #include "rtgeom_log.h"
 

src/g_util.c

 /**********************************************************************
  *
  * rttopo - topology library
- * http://git.osgeo.org/gogs/rttopo/librttopo
+ * http://git.osgeo.org/gitea/rttopo/librttopo
  *
  * rttopo is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
 
 
 
+#include "rttopo_config.h"
 #include <ctype.h>
 
 #include "librttopo_geom_internal.h"

src/librttopo_geom_internal.h

 /**********************************************************************
  *
  * rttopo - topology library
- * http://git.osgeo.org/gogs/rttopo/librttopo
+ * http://git.osgeo.org/gitea/rttopo/librttopo
  *
  * rttopo is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -30,7 +30,6 @@
 #ifndef _LIBRTGEOM_INTERNAL_H
 #define _LIBRTGEOM_INTERNAL_H 1
 
-#include "rttopo_config.h"
 #include "librttopo_geom.h"
 
 #include "rtgeom_log.h"

src/librttopo_internal.h

 /**********************************************************************
  *
  * rttopo - topology library
- * http://git.osgeo.org/gogs/rttopo/librttopo
+ * http://git.osgeo.org/gitea/rttopo/librttopo
  *
  * rttopo is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,7 +27,6 @@
 #ifndef LIBRTGEOM_TOPO_INTERNAL_H
 #define LIBRTGEOM_TOPO_INTERNAL_H 1
 
-#include "rttopo_config.h"
 #include "geos_c.h"
 
 #include "librttopo_geom.h"

src/measures.c

 /**********************************************************************
  *
  * rttopo - topology library
- * http://git.osgeo.org/gogs/rttopo/librttopo
+ * http://git.osgeo.org/gitea/rttopo/librttopo
  *
  * rttopo is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26,6 +26,7 @@
 
 
 
+#include "rttopo_config.h"
 #include <string.h>
 #include <stdlib.h>
 

src/measures.h

 /**********************************************************************
  *
  * rttopo - topology library
- * http://git.osgeo.org/gogs/rttopo/librttopo
+ * http://git.osgeo.org/gitea/rttopo/librttopo
  *
  * rttopo is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -28,7 +28,7 @@
 /**********************************************************************
  *
  * rttopo - topology library
- * http://git.osgeo.org/gogs/rttopo/librttopo
+ * http://git.osgeo.org/gitea/rttopo/librttopo
  * Copyright 2010 Nicklas Avén
  *
  * This is free software; you can redistribute and/or modify it under

src/measures3d.c

 /**********************************************************************
  *
  * rttopo - topology library
- * http://git.osgeo.org/gogs/rttopo/librttopo
+ * http://git.osgeo.org/gitea/rttopo/librttopo
  *
  * rttopo is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -28,7 +28,7 @@
 /**********************************************************************
  *
  * rttopo - topology library
- * http://git.osgeo.org/gogs/rttopo/librttopo
+ * http://git.osgeo.org/gitea/rttopo/librttopo
  * Copyright 2011 Nicklas Avén
  *
  * This is free software; you can redistribute and/or modify it under
@@ -36,6 +36,7 @@
  *
  **********************************************************************/
 
+#include "rttopo_config.h"
 #include <string.h>
 #include <stdlib.h>