[Git][debian-gis-team/jeolib-miallib][master] 7 commits: New upstream version 1.2
Bas Couwenberg (@sebastic)
gitlab at salsa.debian.org
Fri Jul 24 18:28:29 BST 2026
Bas Couwenberg pushed to branch master at Debian GIS Project / jeolib-miallib
Commits:
2b9ac0c8 by Bas Couwenberg at 2026-07-24T18:45:11+02:00
New upstream version 1.2
- - - - -
b6fe6de7 by Bas Couwenberg at 2026-07-24T18:45:13+02:00
Update upstream source from tag 'upstream/1.2'
Update to upstream version '1.2'
with Debian dir 4b765fcd54ee604b60ed0d8903aa367ff98b5ce3
- - - - -
12541257 by Bas Couwenberg at 2026-07-24T18:45:51+02:00
New upstream release.
- - - - -
939f3f9d by Bas Couwenberg at 2026-07-24T18:56:26+02:00
Update copyright file.
- - - - -
eec797d0 by Bas Couwenberg at 2026-07-24T18:59:03+02:00
(closes: #1124862)
* Drop libdir.patch, applied upstream.
- - - - -
adeb376c by Bas Couwenberg at 2026-07-24T19:25:33+02:00
Add patch to install headers.
- - - - -
a28503c5 by Bas Couwenberg at 2026-07-24T19:25:33+02:00
Set distribution to unstable.
- - - - -
10 changed files:
- CMakeLists.txt
- cmake.pc.in
- debian/changelog
- debian/copyright
- debian/libmiallib-dev.install
- − debian/patches/buildflags.patch
- + debian/patches/install-headers.patch
- − debian/patches/libdir.patch
- debian/patches/series
- miallib-config.cmake.in
Changes:
=====================================
CMakeLists.txt
=====================================
@@ -1,6 +1,6 @@
###############################################################################
# Author(s): Pieter.Kempeneers at ec.europa.eu
-# Copyright (C) 2000-2023 European Union (Joint Research Centre)
+# Copyright (C) 2000-2026 European Union (Joint Research Centre)
# This file is part of miallib.
@@ -31,8 +31,8 @@ project(miallib)
set(MIALLIB_LIB_NAME miallib)
set (MIALLIB_VERSION_MAJOR 1)
-set (MIALLIB_VERSION_MINOR 1)
-set (MIALLIB_VERSION_PATCH 7)
+set (MIALLIB_VERSION_MINOR 2)
+set (MIALLIB_VERSION_PATCH 0)
set (MIALLIB_VERSION "${MIALLIB_VERSION_MAJOR}.${MIALLIB_VERSION_MINOR}.${MIALLIB_VERSION_PATCH}")
set (MIALLIB_SOVERSION "${MIALLIB_VERSION_MAJOR}")
@@ -74,12 +74,6 @@ message(STATUS "cmake module path: ${CMAKE_MODULE_PATH}")
set(MIALLIB_SRC_DIR ${PROJECT_SOURCE_DIR}/core/c)
-#simple way to get all src files, but not recommended
-# file(GLOB SRC_FILES ${PROJECT_SOURCE_DIR}/core/*.c")
-# set(SOURCES
-# ${SRC_FILES}
-# )
-
set(MIALLIB_H
${MIALLIB_SRC_DIR}/miallib_convolve.h
${MIALLIB_SRC_DIR}/miallib_dem.h
@@ -269,18 +263,24 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)
option (BUILD_SHARED_LIBS "Build with shared library" ON)
###############################################################################
-# Define the miallib library.
-# add_library( ${MIALLIB_LIB_NAME} ${SRC_FILES})
-add_library(${MIALLIB_LIB_NAME} ${SOURCES})
+
+add_library(${MIALLIB_LIB_NAME} SHARED ${SOURCES})
###############################################################################
+add_library(miallib::miallib ALIAS ${MIALLIB_LIB_NAME})
+
SET_TARGET_PROPERTIES(${MIALLIB_LIB_NAME}
PROPERTIES
- SOVERSION ${MIALLIB_SOVERSION}
VERSION ${MIALLIB_VERSION}
- NAMESPACE ${MIALLIB_LIB_NAME}::
+ SOVERSION ${MIALLIB_SOVERSION}
)
+target_include_directories(${MIALLIB_LIB_NAME} PUBLIC
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/core/c>
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>
+ $<INSTALL_INTERFACE:include>
+)
+
include_directories("core/c")
find_package(PkgConfig REQUIRED)
@@ -289,7 +289,6 @@ find_package(PkgConfig REQUIRED)
# configure a header file to pass some of the CMake settings to the source code
configure_file ( "cmake-config.h.in" "${CMAKE_CURRENT_BINARY_DIR}/core/c/config_miallib.h")
-# configure_file ( "cmake-config.in" "${CMAKE_CURRENT_BINARY_DIR}/miallib-config" @ONLY )
include_directories("${CMAKE_CURRENT_BINARY_DIR}/core/c")# needed for config_miallib.h
add_definitions(-DHAVE_CONFIG_H)
@@ -359,12 +358,10 @@ if(PROCESS_IN_PARALLEL)
find_package(OpenMP REQUIRED)
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
- set (CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
set(PARALLEL_BOOL 1)
message(STATUS "parallel processing: ${PARALLEL_BOOL}")
- SET(CMAKE_C_FLAGS "-DOPENMP=${PARALLEL_BOOL}")
+ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DOPENMP=${PARALLEL_BOOL}")
target_link_libraries(${MIALLIB_LIB_NAME} OpenMP::OpenMP_CXX)
- # string(REPLACE ".so" "_omp.so" FFTW_OMP_LIBRARIES "${FFTW_LIBRARIES}")
message(STATUS "FFTW_OMP_LIBRARIES: ${FFTW_OMP_LIBRARIES}")
target_link_libraries(${MIALLIB_LIB_NAME} ${FFTW_OMP_LIBRARIES})
else(PROCESS_IN_PARALLEL)
@@ -375,8 +372,6 @@ endif(PROCESS_IN_PARALLEL)
find_package(PkgConfig REQUIRED)
set(BLA_VENDOR OpenBLAS)
-set(CMAKE_C_FLAGS -fopenmp)
-#find_package(BLAS REQUIRED)
find_package(GSL REQUIRED)
if(GSL_FOUND)
@@ -395,15 +390,29 @@ target_link_libraries(${MIALLIB_LIB_NAME} ${SHAPELIB_LIBRARIES})
add_definitions(-DSHAPE_DLL)
INSTALL(TARGETS ${MIALLIB_LIB_NAME}
- EXPORT "${MIALLIB_LIB_NAME}"
+ EXPORT miallib-targets
COMPONENT libraries
- LIBRARY DESTINATION lib)
-INSTALL(FILES ${MIALLIB_H} DESTINATION include/miallib/)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/miallib-config.cmake
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ PUBLIC_HEADER DESTINATION include/miallib/
+)
+
+INSTALL(EXPORT miallib-targets
+ FILE miallib-targets.cmake
+ NAMESPACE miallib::
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/miallib
+ COMPONENT headers
+)
+
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/miallib-config.cmake
${CMAKE_CURRENT_BINARY_DIR}/miallib-config-version.cmake
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/miallib
COMPONENT headers
- )
+)
+
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/miallib.pc
- DESTINATION lib/pkgconfig
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
)
+
+# Export the package to the CMake User Package Registry (Optional but helpful)
+# This allows other projects on your machine to find this build tree
+export(PACKAGE MIALLIB)
=====================================
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: miallib
=====================================
debian/changelog
=====================================
@@ -1,12 +1,15 @@
-jeolib-miallib (1.1.7-3) UNRELEASED; urgency=medium
+jeolib-miallib (1.2-1) unstable; urgency=medium
* Team upload.
+ * New upstream release.
+ (closes: #1124862)
* Drop Priority: optional, default since dpkg 1.22.13.
* Bump Standards-Version to 4.7.4, changes: priority.
- * Add patch to use buildflags set in the environment.
- (closes: #1124862)
+ * Update copyright file.
+ * Drop libdir.patch, applied upstream.
+ * Add patch to install headers.
- -- Bas Couwenberg <sebastic at debian.org> Sat, 03 Jan 2026 13:58:15 +0100
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 24 Jul 2026 18:59:04 +0200
jeolib-miallib (1.1.7-2) unstable; urgency=medium
=====================================
debian/copyright
=====================================
@@ -1,28 +1,14 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: jeolib-mialib
-Upstream-Contact: Pierre Soille
+Upstream-Name: jeolib-miallib
+Upstream-Contact: miallib developers (https://github.com/ec-jrc/jeolib-miallib/issues)
Source: https://github.com/ec-jrc/jeolib-miallib
Files: *
-Copyright: 2000-2020, European Union (Joint Research Centre)
-License: GPL-3+
-
-Files: core/doc/doxy2swig.py
-Copyright: Prabhu Ramachandran
- 2015, Michael Thon
-License: BSD-2-clause
-
-Files: CMakeLists.txt
- core/c/*
-Copyright: 2000, Michael Wilkinson, Arnold Meijster, and Jos Roerdink.
- 2000, Pierre Soille.
- 2000-2025, European Union (Joint Research Centre).
+Copyright: 2000, Arnold Meijster
+ 2000, Jos Roerdink
+ 2000, Michael Wilkinson
2025, Francesco Lovergine <francesco at lovergine.com>
-License: GPL-3+
-
-Files: core/c/uswilk.c
-Copyright: 2000, Michael Wilkinson, Arnold Meijster, and Jos Roerdink
- 2000, Arnold Meijster, Michael Wilkinson
+ 2000-2026, European Union (Joint Research Centre)
License: GPL-3+
Files: cmake/modules/FindPROJ.cmake
@@ -35,6 +21,11 @@ Files: cmake/modules/FindGeoTIFF.cmake
Copyright: 2005-2019, Centre National d'Etudes Spatiales (CNES)
License: Apache-2.0
+Files: core/doc/doxy2swig.py
+Copyright: 2015, Michael Thon
+ Prabhu Ramachandran
+License: BSD-2-clause
+
Files: debian/*
Copyright: 2024, Francesco Paolo Lovergine <frankie at debian.org>
License: GPL-3+
=====================================
debian/libmiallib-dev.install
=====================================
@@ -1,5 +1,4 @@
usr/include/*
usr/lib/*/lib*.so
usr/lib/*/pkgconfig/miallib.pc
-usr/lib/*/cmake/miallib/miallib-config.cmake
-usr/lib/*/cmake/miallib/miallib-config-version.cmake
+usr/lib/*/cmake/*
=====================================
debian/patches/buildflags.patch deleted
=====================================
@@ -1,28 +0,0 @@
-Description: Don't overwrite CMAKE_C{,XX}_FLAGS.
-Author: Bas Couwenberg <sebastic at debian.org>
-Bug-Debian: https://bugs.debian.org/1124862
-Forwarded: https://github.com/ec-jrc/jeolib-miallib/pull/9
-Applied-Upstream: https://github.com/ec-jrc/jeolib-miallib/commit/ca4a6186c37f1227b1e3bc6df1fb52930ac59f65
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -359,10 +359,9 @@ if(PROCESS_IN_PARALLEL)
- find_package(OpenMP REQUIRED)
- set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
-- set (CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
- set(PARALLEL_BOOL 1)
- message(STATUS "parallel processing: ${PARALLEL_BOOL}")
-- SET(CMAKE_C_FLAGS "-DOPENMP=${PARALLEL_BOOL}")
-+ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DOPENMP=${PARALLEL_BOOL}")
- target_link_libraries(${MIALLIB_LIB_NAME} OpenMP::OpenMP_CXX)
- # string(REPLACE ".so" "_omp.so" FFTW_OMP_LIBRARIES "${FFTW_LIBRARIES}")
- message(STATUS "FFTW_OMP_LIBRARIES: ${FFTW_OMP_LIBRARIES}")
-@@ -375,7 +374,6 @@ endif(PROCESS_IN_PARALLEL)
- find_package(PkgConfig REQUIRED)
-
- set(BLA_VENDOR OpenBLAS)
--set(CMAKE_C_FLAGS -fopenmp)
- #find_package(BLAS REQUIRED)
-
- find_package(GSL REQUIRED)
=====================================
debian/patches/install-headers.patch
=====================================
@@ -0,0 +1,18 @@
+Description: Install headers.
+Author: Bas Couwenberg <sebastic at debian.org>
+Bug: https://github.com/ec-jrc/jeolib-miallib/issues/10
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -393,9 +393,10 @@ INSTALL(TARGETS ${MIALLIB_LIB_NAME}
+ EXPORT miallib-targets
+ COMPONENT libraries
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+- PUBLIC_HEADER DESTINATION include/miallib/
+ )
+
++INSTALL(FILES ${MIALLIB_H} DESTINATION include/miallib/)
++
+ INSTALL(EXPORT miallib-targets
+ FILE miallib-targets.cmake
+ NAMESPACE miallib::
=====================================
debian/patches/libdir.patch deleted
=====================================
@@ -1,33 +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-miallib/pull/7
-Applied-Upstream: https://github.com/ec-jrc/jeolib-miallib/commit/772c72c576ed7967ff8617f00f93dcb3e071f046
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -397,7 +397,7 @@ add_definitions(-DSHAPE_DLL)
- INSTALL(TARGETS ${MIALLIB_LIB_NAME}
- EXPORT "${MIALLIB_LIB_NAME}"
- COMPONENT libraries
-- LIBRARY DESTINATION lib)
-+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
- INSTALL(FILES ${MIALLIB_H} DESTINATION include/miallib/)
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/miallib-config.cmake
- ${CMAKE_CURRENT_BINARY_DIR}/miallib-config-version.cmake
-@@ -405,5 +405,5 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR
- COMPONENT headers
- )
- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/miallib.pc
-- DESTINATION lib/pkgconfig
-+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
- )
---- 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: miallib
=====================================
debian/patches/series
=====================================
@@ -1,2 +1 @@
-libdir.patch
-buildflags.patch
+install-headers.patch
=====================================
miallib-config.cmake.in
=====================================
@@ -10,4 +10,6 @@ set_and_check(MIALLIB_LIBRARY_DIR "@PACKAGE_LIBRARY_INSTALL_DIR@")
set_and_check(MIALLIB_LIBRARY "@PACKAGE_LIBRARY_INSTALL_DIR@/libmiallib.so")
set_and_check(MIALLIB_LIBRARIES ${MIALLIB_LIBRARY})
+include("${CMAKE_CURRENT_LIST_DIR}/miallib-targets.cmake")
+
check_required_components(miallib)
View it on GitLab: https://salsa.debian.org/debian-gis-team/jeolib-miallib/-/compare/2ab2bf6c737b1032ef8bce1d92c622ffb71cb405...a28503c595310c25bb0585d2a5902995045fed06
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/jeolib-miallib/-/compare/2ab2bf6c737b1032ef8bce1d92c622ffb71cb405...a28503c595310c25bb0585d2a5902995045fed06
You're receiving this email because of your account on salsa.debian.org. Manage all notifications: https://salsa.debian.org/-/profile/notifications | Help: https://salsa.debian.org/help
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20260724/59b1cc7a/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list