[Git][debian-gis-team/saga][experimental] 7 commits: Rename library packages to match SONAME.
Bas Couwenberg (@sebastic)
gitlab at salsa.debian.org
Thu Apr 14 12:25:21 BST 2022
Bas Couwenberg pushed to branch experimental at Debian GIS Project / saga
Commits:
5066b077 by Bas Couwenberg at 2022-04-14T12:40:38+02:00
Rename library packages to match SONAME.
- - - - -
88f37d5d by Bas Couwenberg at 2022-04-14T12:40:46+02:00
Don't hardcode upstream version.
- - - - -
15f494eb by Bas Couwenberg at 2022-04-14T12:40:46+02:00
Remove extra newline.
- - - - -
ce83ed7e by Bas Couwenberg at 2022-04-14T12:40:46+02:00
Drop obsolete dependencies and related changes.
- - - - -
41f97466 by Bas Couwenberg at 2022-04-14T12:40:47+02:00
Add DEP3 patch headers.
- - - - -
397aa941 by Bas Couwenberg at 2022-04-14T12:57:55+02:00
Fix SVM build.
- - - - -
4d232550 by Bas Couwenberg at 2022-04-14T13:15:49+02:00
Drop disable_tools.patch, build failures are fixed.
- - - - -
14 changed files:
- debian/control
- − debian/control.in
- − debian/libsaga-api-8.2.0.install
- + debian/libsaga-api8.install
- debian/libsaga-api-8.2.0.lintian-overrides → debian/libsaga-api8.lintian-overrides
- − debian/libsaga-gdi-8.2.0.install
- + debian/libsaga-gdi8.install
- debian/libsaga-gdi-8.2.0.lintian-overrides → debian/libsaga-gdi8.lintian-overrides
- − debian/patches/disable_tools.patch
- + debian/patches/imagery_svm.patch
- debian/patches/io_shapes_dxf.patch
- debian/patches/multiarch_cmake.patch
- debian/patches/series
- debian/rules
Changes:
=====================================
debian/control
=====================================
@@ -6,7 +6,6 @@ Section: science
Priority: optional
Build-Depends: cmake,
debhelper-compat (= 12),
- dh-python,
libdxflib-dev,
libexpat-dev,
libgdal-dev,
@@ -16,9 +15,7 @@ Build-Depends: cmake,
libsvm-dev,
libvigraimpex-dev,
libwxgtk3.0-gtk3-dev,
- pkg-config,
- python3-dev,
- swig
+ pkg-config
Standards-Version: 4.6.0
Vcs-Browser: https://salsa.debian.org/debian-gis-team/saga
Vcs-Git: https://salsa.debian.org/debian-gis-team/saga.git -b experimental
@@ -56,8 +53,8 @@ Package: libsaga-dev
Architecture: any
Multi-Arch: same
Section: libdevel
-Depends: libsaga-api-8.2.0 (= ${binary:Version}),
- libsaga-gdi-8.2.0 (= ${binary:Version}),
+Depends: libsaga-api8 (= ${binary:Version}),
+ libsaga-gdi8 (= ${binary:Version}),
${misc:Depends}
Suggests: saga (= ${binary:Version})
Description: SAGA GIS development files
@@ -67,7 +64,7 @@ Description: SAGA GIS development files
This package contains the header files for developing with SAGA.
Install this package if you wish to develop software that uses the SAGA API.
-Package: libsaga-api-8.2.0
+Package: libsaga-api8
Architecture: any
Multi-Arch: same
Section: libs
@@ -80,7 +77,7 @@ Description: SAGA GIS shared libraries
.
This package contains the library files for developing with SAGA.
-Package: libsaga-gdi-8.2.0
+Package: libsaga-gdi8
Architecture: any
Multi-Arch: same
Section: libs
=====================================
debian/control.in deleted
=====================================
@@ -1,94 +0,0 @@
-Source: saga
-Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
-Uploaders: Johan Van de Wauw <johan at vandewauw.be>,
- Francesco Paolo Lovergine <frankie at debian.org>
-Section: science
-Priority: optional
-Build-Depends: cmake,
- debhelper-compat (= 12),
- dh-python,
- libdxflib-dev,
- libexpat-dev,
- libgdal-dev,
- libhpdf-dev,
- libproj-dev,
- libqhull-dev,
- libsvm-dev,
- libvigraimpex-dev,
- libwxgtk3.0-gtk3-dev,
- pkg-config,
- python3-dev,
- swig
-Standards-Version: 4.6.0
-Vcs-Browser: https://salsa.debian.org/debian-gis-team/saga
-Vcs-Git: https://salsa.debian.org/debian-gis-team/saga.git -b experimental
-Homepage: http://www.saga-gis.org/
-
-Package: saga
-Architecture: any
-Depends: saga-common (= ${source:Version}),
- ${shlibs:Depends},
- ${misc:Depends}
-Pre-Depends: ${misc:Pre-Depends}
-Description: System for Automated Geoscientific Analyses
- SAGA GIS (System for Automated Geoscientific Analyses) is a free and
- open source geographic information system used for editing and
- analysing spatial data. It includes a large number of modules for the
- analysis of vector (point, line and polygon), table, grid and image
- data. Among others the package includes modules for geostatistics,
- image classification, projections, simulation of dynamic processes
- (hydrology, landscape development) and terrain analysis.
- The functionality can be accessed through a GUI, the command line or
- by using the C++ API.
-
-Package: saga-common
-Architecture: all
-Depends: ${misc:Depends}
-Breaks: saga (<< 2.2.5+dfsg-1~)
-Replaces: saga (<< 2.2.5+dfsg-1~)
-Description: SAGA GIS architecture independent files
- SAGA GIS (System for Automated Geoscientific Analyses) is a geographic
- information system used for editing and analysing spatial data.
- .
- This package contains the architecture independent files for SAGA.
-
-Package: libsaga-dev
-Architecture: any
-Multi-Arch: same
-Section: libdevel
-Depends: libsaga-api- at VERSION@ (= ${binary:Version}),
- libsaga-gdi- at VERSION@ (= ${binary:Version}),
- ${misc:Depends}
-Suggests: saga (= ${binary:Version})
-Description: SAGA GIS development files
- SAGA GIS (System for Automated Geoscientific Analyses) is a geographic
- information system used for editing and analysing spatial data.
- .
- This package contains the header files for developing with SAGA.
- Install this package if you wish to develop software that uses the SAGA API.
-
-Package: libsaga-api- at VERSION@
-Architecture: any
-Multi-Arch: same
-Section: libs
-Depends: ${shlibs:Depends},
- ${misc:Depends}
-Pre-Depends: ${misc:Pre-Depends}
-Description: SAGA GIS shared libraries
- SAGA GIS (System for Automated Geoscientific Analyses) is a geographic
- information system used for editing and analysing spatial data.
- .
- This package contains the library files for developing with SAGA.
-
-Package: libsaga-gdi- at VERSION@
-Architecture: any
-Multi-Arch: same
-Section: libs
-Depends: ${shlibs:Depends},
- ${misc:Depends}
-Pre-Depends: ${misc:Pre-Depends}
-Description: SAGA GIS shared library (graphical models)
- SAGA GIS (System for Automated Geoscientific Analyses) is a geographic
- information system used for editing and analysing spatial data.
- .
- This package contains the library files for developing graphical modules.
=====================================
debian/libsaga-api-8.2.0.install deleted
=====================================
@@ -1,2 +0,0 @@
-usr/lib/*/libsaga_api.so.8.2.0
-usr/lib/*/libsaga_api.so.8
=====================================
debian/libsaga-api8.install
=====================================
@@ -0,0 +1,2 @@
+usr/lib/*/libsaga_api.so.*
+usr/lib/*/libsaga_api.so.*
=====================================
debian/libsaga-api-8.2.0.lintian-overrides → debian/libsaga-api8.lintian-overrides
=====================================
=====================================
debian/libsaga-gdi-8.2.0.install deleted
=====================================
@@ -1,2 +0,0 @@
-usr/lib/*/libsaga_gdi.so.8.2.0
-usr/lib/*/libsaga_gdi.so.8
=====================================
debian/libsaga-gdi8.install
=====================================
@@ -0,0 +1,2 @@
+usr/lib/*/libsaga_gdi.so.*
+usr/lib/*/libsaga_gdi.so.*
=====================================
debian/libsaga-gdi-8.2.0.lintian-overrides → debian/libsaga-gdi8.lintian-overrides
=====================================
=====================================
debian/patches/disable_tools.patch deleted
=====================================
@@ -1,31 +0,0 @@
---- a/saga-gis/src/tools/io/io_shapes_dxf/CMakeLists.txt
-+++ b/saga-gis/src/tools/io/io_shapes_dxf/CMakeLists.txt
-@@ -1,6 +1,7 @@
- option(WITH_SYSTEM_DXF "Check to use system version of dxflib library instead of embedded copy" OFF)
-+option(WITH_DXF "Build dxflib tools" ON)
-
--if(WITH_TOOLS)
-+if(WITH_TOOLS AND WITH_DXF)
- project(io_shapes_dxf)
-
- if(WITH_SYSTEM_DXF)
---- a/saga-gis/src/tools/imagery/imagery_svm/CMakeLists.txt
-+++ b/saga-gis/src/tools/imagery/imagery_svm/CMakeLists.txt
-@@ -1,6 +1,7 @@
- option(WITH_SYSTEM_SVM "Check to use system version of libsvm instead of embedded copy" OFF)
-+option(WITH_SVM "Build SVM module" ON)
-
--if(WITH_TOOLS)
-+if(WITH_TOOLS AND WITH_SVM)
- project(imagery_svm)
-
- if(WITH_SYSTEM_SVM)
-@@ -13,7 +14,7 @@ if(WITH_TOOLS)
- endif()
-
- include(../../CMakePluginTemplate.cmake) # load common tool template
--
-+
- if(SVM_FOUND)
- target_include_directories(${PROJECT_NAME} PRIVATE ${SVM_INCLUDE})
- target_link_libraries (${PROJECT_NAME} ${SVM_LIBRARY})
=====================================
debian/patches/imagery_svm.patch
=====================================
@@ -0,0 +1,14 @@
+Description: Fix imagery_svm build.
+Author: Bas Couwenberg <sebastic at debian.org>
+
+--- a/saga-gis/src/tools/imagery/imagery_svm/CMakeLists.txt
++++ b/saga-gis/src/tools/imagery/imagery_svm/CMakeLists.txt
+@@ -10,6 +10,8 @@ if(WITH_TOOLS)
+ if(NOT SVM_FOUND)
+ set(SAGA_TOOL_CUSTOM_SOURCE_LIST ./svm/svm.cpp)
+ set(SAGA_TOOL_CUSTOM_HEADER_LIST ./svm/svm.h)
++ else()
++ add_compile_definitions(SYSTEM_SVM)
+ endif()
+
+ include(../../CMakePluginTemplate.cmake) # load common tool template
=====================================
debian/patches/io_shapes_dxf.patch
=====================================
@@ -3,8 +3,8 @@ Author: Bas Couwenberg <sebastic at debian.org>
--- a/saga-gis/src/tools/io/io_shapes_dxf/CMakeLists.txt
+++ b/saga-gis/src/tools/io/io_shapes_dxf/CMakeLists.txt
-@@ -4,6 +4,9 @@ option(WITH_DXF "Build dxflib tools" ON)
- if(WITH_TOOLS AND WITH_DXF)
+@@ -3,6 +3,9 @@ option(WITH_SYSTEM_DXF "Check to use sys
+ if(WITH_TOOLS)
project(io_shapes_dxf)
+ # load common tool template
@@ -13,7 +13,7 @@ Author: Bas Couwenberg <sebastic at debian.org>
if(WITH_SYSTEM_DXF)
# link dxflib library
# Ubuntu 16.04 package libdxflib-dev
-@@ -29,7 +32,4 @@ if(WITH_TOOLS AND WITH_DXF)
+@@ -28,7 +31,4 @@ if(WITH_TOOLS)
dxflib/dl_writer_ascii.h
)
endif()
=====================================
debian/patches/multiarch_cmake.patch
=====================================
@@ -1,3 +1,6 @@
+Description: Use Multi-Arch directory for libraries.
+Author: Johan Van de Wauw <johan at gisky.be>
+
--- a/saga-gis/src/saga_core/saga_api/CMakeLists.txt
+++ b/saga-gis/src/saga_core/saga_api/CMakeLists.txt
@@ -163,7 +163,7 @@ set_target_properties(saga_api PROPERTIE
=====================================
debian/patches/series
=====================================
@@ -1,5 +1,5 @@
spelling-errors.patch
disable_fire_spreading.patch
multiarch_cmake.patch
-disable_tools.patch
io_shapes_dxf.patch
+imagery_svm.patch
=====================================
debian/rules
=====================================
@@ -5,34 +5,26 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all
CFLAGS += $(CPPFLAGS)
-VERSION := 8.2.0
+include /usr/share/dpkg/pkg-info.mk
-TEMPLATES = $(wildcard debian/*.in)
-
-templates:
- for TEMPLATE in $(TEMPLATES) ; do \
- sed -e 's/@VERSION@/$(VERSION)/g' $$TEMPLATE > `echo $$TEMPLATE | sed 's/.in$$//'` ; \
- done
+UPSTREAM_VERSION = $(shell echo $(DEB_VERSION_UPSTREAM) | sed -e 's/\+.*//')
%:
- dh $@ --buildsystem=cmake --sourcedirectory=saga-gis
+ dh $@ --buildsystem=cmake --sourcedirectory=saga-gis
override_dh_clean:
dh_clean src/saga_core/saga_api/saga_api.py saga_cmd.1 saga_gui.1
-override_dh_auto_configure: templates
+override_dh_auto_configure:
dh_auto_configure -- \
-DWITH_SYSTEM_SVM=on \
-DWITH_SYSTEM_DXF=on \
-DWITH_TRIANGLE=off \
- -DWITH_FIRE_SPREADING=off \
- -DWITH_DXF=on \
- -DWITH_SVM=off
-
+ -DWITH_FIRE_SPREADING=off
override_dh_auto_build:
- pod2man --section=1 --release=$(VERSION) --center " " debian/saga_gui.pod > saga_gui.1
- pod2man --section=1 --release=$(VERSION) --center " " debian/saga_cmd.pod > saga_cmd.1
+ pod2man --section=1 --release=$(UPSTREAM_VERSION) --center " " debian/saga_gui.pod > saga_gui.1
+ pod2man --section=1 --release=$(UPSTREAM_VERSION) --center " " debian/saga_cmd.pod > saga_cmd.1
dh_auto_build
override_dh_auto_install:
@@ -42,14 +34,4 @@ override_dh_auto_install:
chmod -x debian/*/usr/share/saga/*.*
# Explicitly remove files not to be installed
- find $(CURDIR)/debian/tmp/usr/lib -name "*.a" -delete
- find $(CURDIR)/debian/tmp/usr/lib -name "*.la" -delete
- find $(CURDIR)/debian/tmp/usr/lib -name "*.pyc" -delete
- find $(CURDIR)/debian/tmp/usr/lib -name "*.pyo" -delete
$(RM) -r $(CURDIR)/debian/tmp/usr/include
-
-override_dh_python3:
- dh_python3 --no-ext-rename
-
-override_dh_makeshlibs:
- dh_makeshlibs -Xpython3-saga
View it on GitLab: https://salsa.debian.org/debian-gis-team/saga/-/compare/cafebcb08ab9f5843e77c878438b554e54dd7542...4d2325509bbec33e4c70ffb245305fd383911249
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/saga/-/compare/cafebcb08ab9f5843e77c878438b554e54dd7542...4d2325509bbec33e4c70ffb245305fd383911249
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/20220414/4bf6d118/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list