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


Commits:
3be13558 by Bas Couwenberg at 2021-10-01T18:46:54+02:00
Update test_docs.patch to fix failure instead of disabling test.

- - - - -


2 changed files:

- debian/changelog
- debian/patches/test_docs.patch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+geos (3.10.0~beta1-1~exp2) UNRELEASED; urgency=medium
+
+  * Update test_docs.patch to fix failure instead of disabling test.
+
+ -- Bas Couwenberg <[email protected]>  Fri, 01 Oct 2021 18:46:24 +0200
+
 geos (3.10.0~beta1-1~exp1) experimental; urgency=medium
 
   * New upstream beta release.


=====================================
debian/patches/test_docs.patch
=====================================
@@ -1,21 +1,16 @@
-Description: Disabled test_docs, causes FTBFS.
-Author: Bas Couwenberg <[email protected]>
+Description: Fix test_docs failure.
+Author: Paul Ramsey <[email protected]>
+Origin: 
https://git.osgeo.org/gitea/geos/geos/commit/75cb982535b845a613e4050eda1f970662510554
 Bug: https://lists.osgeo.org/pipermail/geos-devel/2021-September/010360.html
 
---- a/doc/CMakeLists.txt
-+++ b/doc/CMakeLists.txt
-@@ -44,10 +44,10 @@ if(BUILD_DOCUMENTATION)
-         COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
-         BYPRODUCTS ${DOXYGEN_LOGFILE} 
${CMAKE_CURRENT_BINARY_DIR}/doxygen_docs)
- 
--    add_test(NAME test_docs
--        COMMAND ${CMAKE_COMMAND}
--            -D DOXYGEN_LOGFILE="${DOXYGEN_LOGFILE}"
--            -P "${CMAKE_CURRENT_BINARY_DIR}/${CHECK_ERROR_SCRIPT}")
-+#   add_test(NAME test_docs
-+#       COMMAND ${CMAKE_COMMAND}
-+#           -D DOXYGEN_LOGFILE="${DOXYGEN_LOGFILE}"
-+#           -P "${CMAKE_CURRENT_BINARY_DIR}/${CHECK_ERROR_SCRIPT}")
- 
-     unset(DOXYGEN_LOGFILE)
-     unset(CHECK_ERROR_SCRIPT)
+--- a/capi/geos_c.h.in
++++ b/capi/geos_c.h.in
+@@ -259,7 +259,7 @@ typedef void (*GEOSQueryCallback)(void *
+ *
+ * \param item1 first of the pair of items to calculate distance between
+ * \param item2 second of the pair of items to calculate distance between
+-* \param return distance the distance between the items here
++* \param distance the distance between the items here
+ * \param userdata extra data for the calculation
+ *
+ * \return zero if distance calculation succeeded, non-zero otherwise



View it on GitLab: 
https://salsa.debian.org/debian-gis-team/geos/-/commit/3be1355839f453ec92498cf604226ffbf13c19b8

-- 
View it on GitLab: 
https://salsa.debian.org/debian-gis-team/geos/-/commit/3be1355839f453ec92498cf604226ffbf13c19b8
You're receiving this email because of your account on salsa.debian.org.


_______________________________________________
Pkg-grass-devel mailing list
[email protected]
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-grass-devel

Reply via email to