[Git][debian-gis-team/jeolib-jiplib][master] 5 commits: New upstream version 1.1.7+ds
Bas Couwenberg (@sebastic)
gitlab at salsa.debian.org
Mon Feb 9 12:54:54 GMT 2026
Bas Couwenberg pushed to branch master at Debian GIS Project / jeolib-jiplib
Commits:
67996f18 by Bas Couwenberg at 2026-02-09T13:42:29+01:00
New upstream version 1.1.7+ds
- - - - -
93a3ce44 by Bas Couwenberg at 2026-02-09T13:42:33+01:00
Update upstream source from tag 'upstream/1.1.7+ds'
Update to upstream version '1.1.7+ds'
with Debian dir 4ec5201917f458190eac65b06f6dbd4d846dba12
- - - - -
0ffaf5ec by Bas Couwenberg at 2026-02-09T13:43:03+01:00
New upstream release.
- - - - -
87043814 by Bas Couwenberg at 2026-02-09T13:45:34+01:00
Drop patches applied upstream, refresh remaining patches.
- - - - -
3e916145 by Bas Couwenberg at 2026-02-09T13:46:04+01:00
Set distribution to unstable.
- - - - -
16 changed files:
- CMakeLists.txt
- cmake.pc.in
- debian/changelog
- debian/copyright
- − debian/patches/boost1.89.patch
- − debian/patches/gdal-3.12.patch
- − debian/patches/libdir.patch
- debian/patches/pip-break-sys-pkg.patch
- debian/patches/series
- − debian/patches/spelling-errors-take2.patch
- doc/conf.py
- src/imageclasses/VectorOgr.cc
- src/imageclasses/VectorOgr.h
- src/imageclasses/jlpolygonize_lib.cc
- src/python/__init__.py
- src/python/setup.py
Changes:
=====================================
CMakeLists.txt
=====================================
@@ -1,7 +1,7 @@
###############################################################################
# CMakeLists build script for cmake
# Author(s): Pieter.Kempeneers at ec.europa.eu
-# Copyright (C) 2016-2023 European Union (Joint Research Centre)
+# Copyright (C) 2016-2026 European Union (Joint Research Centre)
#
# This file is part of jiplib.
@@ -32,7 +32,7 @@ INCLUDE(CTest)
SET(JIPLIB_VERSION_MAJOR 1)
SET(JIPLIB_VERSION_MINOR 1)
-SET(JIPLIB_VERSION_PATCH 6)
+SET(JIPLIB_VERSION_PATCH 7)
SET(JIPLIB_VERSION "${JIPLIB_VERSION_MAJOR}.${JIPLIB_VERSION_MINOR}.${JIPLIB_VERSION_PATCH}")
SET(PACKAGE_VERSION "${JIPLIB_VERSION}")
SET(JIPLIB_SOVERSION "${JIPLIB_VERSION_MAJOR}")
@@ -124,7 +124,7 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake/modules")
# Make sure Boost libraries are found
SET(Boost_DEBUG 0)
-find_package(Boost COMPONENTS filesystem system serialization REQUIRED)
+find_package(Boost COMPONENTS filesystem serialization REQUIRED)
if(BUILD_WITH_PYTHON)
# SET(CREATE_WHEEL TRUE CACHE BOOL "Choose if jiplib PYTHON wheel is to be created")
@@ -689,7 +689,7 @@ endif(BUILD_WITH_PYTHON)
########## INSTALL ##########
INSTALL(TARGETS ${JIPLIB_LIB_NAME}
LIBRARY
- DESTINATION lib
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}
COMPONENT libraries
PUBLIC_HEADER
DESTINATION include/${JIPLIB_LIB_NAME}
@@ -697,7 +697,7 @@ INSTALL(TARGETS ${JIPLIB_LIB_NAME}
)
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/jiplib.pc
- DESTINATION lib/pkgconfig
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
)
INSTALL(CODE
"execute_process(COMMAND ${Python_EXECUTABLE} -m pip install ${_pip_args} ${CMAKE_CURRENT_BINARY_DIR}/jiplib-${JIPLIB_VERSION}-py3-none-any.whl --force-reinstall)"
=====================================
cmake.pc.in
=====================================
@@ -1,6 +1,6 @@
prefix=@CMAKE_INSTALL_PREFIX@
exec_prefix=@CMAKE_INSTALL_PREFIX@/bin
-libdir=@CMAKE_INSTALL_PREFIX@/lib
+libdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@
includedir=@CMAKE_INSTALL_PREFIX@/include
Name: jiplib
=====================================
debian/changelog
=====================================
@@ -1,13 +1,14 @@
-jeolib-jiplib (1.1.6+ds-4) UNRELEASED; urgency=medium
+jeolib-jiplib (1.1.7+ds-1) unstable; urgency=medium
* Team upload.
+ * New upstream release.
+ (closes: #1110635)
* Drop Priority: optional, default since dpkg 1.22.13.
* Bump Standards-Version to 4.7.3, changes: priority.
* Mark libjiplib1 as Multi-Arch: same.
- * Add patch to fix FTBFS with Boost 1.90.
- (closes: #1110635)
+ * Drop patches applied upstream, refresh remaining patches.
- -- Bas Couwenberg <sebastic at debian.org> Sat, 03 Jan 2026 13:58:06 +0100
+ -- Bas Couwenberg <sebastic at debian.org> Mon, 09 Feb 2026 13:45:52 +0100
jeolib-jiplib (1.1.6+ds-3) unstable; urgency=medium
=====================================
debian/copyright
=====================================
@@ -10,7 +10,7 @@ Files-Excluded:
Files: *
Copyright: 2016, Pierre.Soille at jrc.ec.europa.eu
- 2016-2025, European Union (Joint Research Centre)
+ 2016-2026, European Union (Joint Research Centre)
License: GPL-3+
Files: src/algorithms/myfann_cpp.h
=====================================
debian/patches/boost1.89.patch deleted
=====================================
@@ -1,16 +0,0 @@
-Description: Don't require boost-system, header-only since 1.69, removed in 1.89.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://github.com/ec-jrc/jeolib-jiplib/pull/9
-Applied-Upstream: https://github.com/ec-jrc/jeolib-jiplib/commit/c1a9272a5a6a91c80c472ebfa93178ddd1db3d6a
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -124,7 +124,7 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_C
-
- # Make sure Boost libraries are found
- SET(Boost_DEBUG 0)
--find_package(Boost COMPONENTS filesystem system serialization REQUIRED)
-+find_package(Boost COMPONENTS filesystem serialization REQUIRED)
-
- if(BUILD_WITH_PYTHON)
- # SET(CREATE_WHEEL TRUE CACHE BOOL "Choose if jiplib PYTHON wheel is to be created")
=====================================
debian/patches/gdal-3.12.patch deleted
=====================================
@@ -1,36 +0,0 @@
-Description: Fix FTBFS with GDAL 3.12.0.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://github.com/ec-jrc/jeolib-jiplib/pull/7
-Applied-Upstream: https://github.com/ec-jrc/jeolib-jiplib/commit/6890fc0bc9998e792fba822430359e9de3812db9
-
---- a/src/imageclasses/VectorOgr.cc
-+++ b/src/imageclasses/VectorOgr.cc
-@@ -475,7 +475,7 @@ void VectorOgr::close(void)
- }
-
- ///Create a layer
--OGRErr VectorOgr::pushLayer(const std::string& layername, OGRSpatialReference* theSRS, const OGRwkbGeometryType& geometryType, char** papszOptions){
-+OGRErr VectorOgr::pushLayer(const std::string& layername, const OGRSpatialReference* theSRS, const OGRwkbGeometryType& geometryType, char** papszOptions){
- if( !m_gds->TestCapability( ODsCCreateLayer ) ){
- // std::ostringstream errorStream;
- // errorStream << "Error: Test capability to create layer " << layername << " failed (1)" << std::endl;
-@@ -2016,7 +2016,7 @@ void VectorOgr::merge(VectorOgr &ogrRead
- if(verbose_opt[0])
- std::cout << "layer: " << layerstream.str() << std::endl;
-
-- OGRSpatialReference *thatSpatialRef=ogrReader.getLayer(ilayer)->GetSpatialRef();
-+ OGRSpatialReference *thatSpatialRef=ogrReader.getLayer(ilayer)->GetSpatialRef()->Clone();
- #if GDAL_VERSION_MAJOR > 2
- thatSpatialRef->SetAxisMappingStrategy(OSRAxisMappingStrategy::OAMS_TRADITIONAL_GIS_ORDER);
- #endif
---- a/src/imageclasses/VectorOgr.h
-+++ b/src/imageclasses/VectorOgr.h
-@@ -207,7 +207,7 @@ class VectorOgr : public std::enable_sha
- ///Get the filename of this dataset
- std::string getFileName() const {return m_filename;};
- ///Create a layer
-- OGRErr pushLayer(const std::string& layername, OGRSpatialReference* theSRS, const OGRwkbGeometryType& geometryType=wkbUnknown, char** papszOptions=NULL);
-+ OGRErr pushLayer(const std::string& layername, const OGRSpatialReference* theSRS, const OGRwkbGeometryType& geometryType=wkbUnknown, char** papszOptions=NULL);
- ///Create a layer
- OGRErr pushLayer(const std::string& layername, const std::string& theProjection=std::string(), const OGRwkbGeometryType& geometryType=wkbUnknown, char** papszOptions=NULL);
- ///Create a layer
=====================================
debian/patches/libdir.patch deleted
=====================================
@@ -1,35 +0,0 @@
-Description: Use ${CMAKE_INSTALL_LIBDIR} from GNUInstallDirs instead of lib.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://github.com/ec-jrc/jeolib-jiplib/pull/8
-Applied-Upstream: https://github.com/ec-jrc/jeolib-jiplib/commit/711bfd8f4004f7446e271cb341666fb56bb35597
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -689,7 +689,7 @@ endif(BUILD_WITH_PYTHON)
- ########## INSTALL ##########
- INSTALL(TARGETS ${JIPLIB_LIB_NAME}
- LIBRARY
-- DESTINATION lib
-+ DESTINATION ${CMAKE_INSTALL_LIBDIR}
- COMPONENT libraries
- PUBLIC_HEADER
- DESTINATION include/${JIPLIB_LIB_NAME}
-@@ -697,7 +697,7 @@ INSTALL(TARGETS ${JIPLIB_LIB_NAME}
- )
-
- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/jiplib.pc
-- DESTINATION lib/pkgconfig
-+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
- )
- INSTALL(CODE
- "execute_process(COMMAND ${Python_EXECUTABLE} -m pip install --root-user-action ignore --root ${CMAKE_CURRENT_SOURCE_DIR}/debian/tmp --verbose --break-system-packages ${_pip_args} ${CMAKE_CURRENT_BINARY_DIR}/jiplib-${JIPLIB_VERSION}-py3-none-any.whl --force-reinstall)"
---- a/cmake.pc.in
-+++ b/cmake.pc.in
-@@ -1,6 +1,6 @@
- prefix=@CMAKE_INSTALL_PREFIX@
- exec_prefix=@CMAKE_INSTALL_PREFIX@/bin
--libdir=@CMAKE_INSTALL_PREFIX@/lib
-+libdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@
- includedir=@CMAKE_INSTALL_PREFIX@/include
-
- Name: jiplib
=====================================
debian/patches/pip-break-sys-pkg.patch
=====================================
@@ -5,7 +5,7 @@ Forwarded: not-needed
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -700,6 +700,6 @@ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR
- DESTINATION lib/pkgconfig
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
)
INSTALL(CODE
- "execute_process(COMMAND ${Python_EXECUTABLE} -m pip install ${_pip_args} ${CMAKE_CURRENT_BINARY_DIR}/jiplib-${JIPLIB_VERSION}-py3-none-any.whl --force-reinstall)"
=====================================
debian/patches/series
=====================================
@@ -1,6 +1,2 @@
pip-break-sys-pkg.patch
-spelling-errors-take2.patch
-gdal-3.12.patch
-libdir.patch
wheel.patch
-boost1.89.patch
=====================================
debian/patches/spelling-errors-take2.patch deleted
=====================================
@@ -1,41 +0,0 @@
-Description: Fix spelling errors.
- * clould -> could
-Author: Francesco Paolo Lovergine <frankie at debian.org>
-Forwarded: https://github.com/ec-jrc/jeolib-jiplib/pull/6
-Applied-Upstream: https://github.com/ec-jrc/jeolib-jiplib/commit/4ba7d08d688bbfe15b00591cb0ae5597ce0cc88b
-
---- a/src/imageclasses/jlpolygonize_lib.cc
-+++ b/src/imageclasses/jlpolygonize_lib.cc
-@@ -112,7 +112,7 @@ void Jim::polygonize(VectorOgr&ogrWriter
- }
- }
- else{
-- std::string errorString="Error: clould not create memory dataset for mask dataset";
-+ std::string errorString="Error: could not create memory dataset for mask dataset";
- throw(errorString);
- }
- }
-@@ -165,12 +165,12 @@ void Jim::polygonize(VectorOgr&ogrWriter
- }
- }
- else{
-- std::string errorString="Error: clould not create memory dataset for input dataset";
-+ std::string errorString="Error: could not create memory dataset for input dataset";
- throw(errorString);
- }
- }
- else{
-- std::string errorString="Error: clould not create memory driver";
-+ std::string errorString="Error: could not create memory driver";
- throw(errorString);
- }
- }
-@@ -179,7 +179,7 @@ void Jim::polygonize(VectorOgr&ogrWriter
- throw;
- }
- catch(...){
-- std::cerr << "Error: clould not polygonize" << std::endl;
-+ std::cerr << "Error: could not polygonize" << std::endl;
- throw;
- }
- }
=====================================
doc/conf.py
=====================================
@@ -59,7 +59,7 @@ master_doc = 'index'
# General information about the project.
project = u'JEOlib: JIPlib'
-copyright = u'European Commission, 2016-2022'
+copyright = u'European Commission, 2016-2026'
author = u'Pieter Kempeneers and Pierre Soille'
# The version info for the project you're documenting, acts as replacement for
@@ -67,9 +67,9 @@ author = u'Pieter Kempeneers and Pierre Soille'
# built documents.
#
# The short X.Y version.
-version = u'1.1.6'
+version = u'1.1.7'
# The full version, including alpha/beta/rc tags.
-release = u'1.1.6'
+release = u'1.1.7'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
=====================================
src/imageclasses/VectorOgr.cc
=====================================
@@ -475,7 +475,7 @@ void VectorOgr::close(void)
}
///Create a layer
-OGRErr VectorOgr::pushLayer(const std::string& layername, OGRSpatialReference* theSRS, const OGRwkbGeometryType& geometryType, char** papszOptions){
+OGRErr VectorOgr::pushLayer(const std::string& layername, const OGRSpatialReference* theSRS, const OGRwkbGeometryType& geometryType, char** papszOptions){
if( !m_gds->TestCapability( ODsCCreateLayer ) ){
// std::ostringstream errorStream;
// errorStream << "Error: Test capability to create layer " << layername << " failed (1)" << std::endl;
@@ -2016,7 +2016,7 @@ void VectorOgr::merge(VectorOgr &ogrReader, VectorOgr &ogrWriter, app::AppFactor
if(verbose_opt[0])
std::cout << "layer: " << layerstream.str() << std::endl;
- OGRSpatialReference *thatSpatialRef=ogrReader.getLayer(ilayer)->GetSpatialRef();
+ OGRSpatialReference *thatSpatialRef=ogrReader.getLayer(ilayer)->GetSpatialRef()->Clone();
#if GDAL_VERSION_MAJOR > 2
thatSpatialRef->SetAxisMappingStrategy(OSRAxisMappingStrategy::OAMS_TRADITIONAL_GIS_ORDER);
#endif
=====================================
src/imageclasses/VectorOgr.h
=====================================
@@ -207,7 +207,7 @@ class VectorOgr : public std::enable_shared_from_this<VectorOgr>
///Get the filename of this dataset
std::string getFileName() const {return m_filename;};
///Create a layer
- OGRErr pushLayer(const std::string& layername, OGRSpatialReference* theSRS, const OGRwkbGeometryType& geometryType=wkbUnknown, char** papszOptions=NULL);
+ OGRErr pushLayer(const std::string& layername, const OGRSpatialReference* theSRS, const OGRwkbGeometryType& geometryType=wkbUnknown, char** papszOptions=NULL);
///Create a layer
OGRErr pushLayer(const std::string& layername, const std::string& theProjection=std::string(), const OGRwkbGeometryType& geometryType=wkbUnknown, char** papszOptions=NULL);
///Create a layer
=====================================
src/imageclasses/jlpolygonize_lib.cc
=====================================
@@ -112,7 +112,7 @@ void Jim::polygonize(VectorOgr&ogrWriter, app::AppFactory &theApp, std::shared_p
}
}
else{
- std::string errorString="Error: clould not create memory dataset for mask dataset";
+ std::string errorString="Error: could not create memory dataset for mask dataset";
throw(errorString);
}
}
@@ -165,12 +165,12 @@ void Jim::polygonize(VectorOgr&ogrWriter, app::AppFactory &theApp, std::shared_p
}
}
else{
- std::string errorString="Error: clould not create memory dataset for input dataset";
+ std::string errorString="Error: could not create memory dataset for input dataset";
throw(errorString);
}
}
else{
- std::string errorString="Error: clould not create memory driver";
+ std::string errorString="Error: could not create memory driver";
throw(errorString);
}
}
@@ -179,7 +179,7 @@ void Jim::polygonize(VectorOgr&ogrWriter, app::AppFactory &theApp, std::shared_p
throw;
}
catch(...){
- std::cerr << "Error: clould not polygonize" << std::endl;
+ std::cerr << "Error: could not polygonize" << std::endl;
throw;
}
}
=====================================
src/python/__init__.py
=====================================
@@ -3,7 +3,7 @@ Install the jiplib package.
Author(s): Pieter.Kempeneers at ec.europa.eu,
Ondrej Pesek,
Pierre.Soille at ec.europa.eu
-Copyright (C) 2018-2025 European Union (Joint Research Centre)
+Copyright (C) 2018-2026 European Union (Joint Research Centre)
This file is part of jiplib.
@@ -23,4 +23,4 @@ from __future__ import absolute_import
from .jiplib import *
-__version__ = '1.1.6'
+__version__ = '1.1.7'
=====================================
src/python/setup.py
=====================================
@@ -1,7 +1,7 @@
"""
Install the jiplib package.
Author(s): Pieter.Kempeneers at ec.europa.eu,
-Copyright (C) 2018-2023 European Union (Joint Research Centre)
+Copyright (C) 2018-2026 European Union (Joint Research Centre)
This file is part of jiplib.
@@ -27,7 +27,7 @@ from setuptools import find_packages
setup(
name='jiplib',
- version='1.1.6',
+ version='1.1.7',
author='Pieter Kempeneers',
author_email='pieter.kempeneers at ec.europa.eu',
url='https://jeodpp.jrc.ec.europa.eu/apps/gitlab/JIPlib/jiplib',
View it on GitLab: https://salsa.debian.org/debian-gis-team/jeolib-jiplib/-/compare/aea1c2779fe7ca80b9301953659a92f793dbc912...3e916145a61f056181209c89b54cc1c0fd9dfd90
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/jeolib-jiplib/-/compare/aea1c2779fe7ca80b9301953659a92f793dbc912...3e916145a61f056181209c89b54cc1c0fd9dfd90
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/20260209/f6efd7fe/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list