[Git][debian-gis-team/jeolib-miallib][master] 2 commits: Add patch to fix library installation path.

[Bas Couwenberg (@sebastic)]

Bas Couwenberg pushed to branch master at Debian GIS Project / jeolib-miallib


Commits:
5d7d8933 by Bas Couwenberg at 2025-10-25T17:41:53+02:00
Add patch to fix library installation path.

- - - - -
6e40c5a9 by Bas Couwenberg at 2025-10-25T17:42:05+02:00
Set distribution to unstable.

- - - - -


6 changed files:

- debian/changelog
- debian/libmiallib-dev.install
- debian/libmiallib1.install
- + debian/patches/libdir.patch
- + debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,9 +1,10 @@
-jeolib-miallib (1.1.7-2) UNRELEASED; urgency=medium
+jeolib-miallib (1.1.7-2) unstable; urgency=medium
 
   * Team upload.
   * Use test-build-validate-cleanup instead of test-build-twice.
+  * Add patch to fix library installation path.
 
- -- Bas Couwenberg <sebastic at debian.org>  Sat, 25 Oct 2025 12:57:53 +0200
+ -- Bas Couwenberg <sebastic at debian.org>  Sat, 25 Oct 2025 17:41:03 +0200
 
 jeolib-miallib (1.1.7-1) unstable; urgency=medium
 


=====================================
debian/libmiallib-dev.install
=====================================
@@ -1,5 +1,5 @@
 usr/include/*
-usr/lib/lib*.so              usr/lib/${DEB_HOST_MULTIARCH}
-usr/lib/pkgconfig/miallib.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig
+usr/lib/*/lib*.so
+usr/lib/*/pkgconfig/miallib.pc
 usr/lib/*/cmake/miallib/miallib-config.cmake
 usr/lib/*/cmake/miallib/miallib-config-version.cmake


=====================================
debian/libmiallib1.install
=====================================
@@ -1 +1 @@
-usr/lib/lib*.so.* usr/lib/${DEB_HOST_MULTIARCH}
+usr/lib/*/lib*.so.*


=====================================
debian/patches/libdir.patch
=====================================
@@ -0,0 +1,32 @@
+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
+
+--- 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
=====================================
@@ -0,0 +1 @@
+libdir.patch


=====================================
debian/rules
=====================================
@@ -17,8 +17,5 @@ override_dh_auto_configure:
 	dh_auto_configure -- \
 		-DCMAKE_BUILD_TYPE=RelWithDebInfo
 
-execute_after_dh_auto_install:
-	sed -i -e "s|$(CURDIR)/build||g" -e "s|/include|/usr/include|" debian/tmp/usr/lib/*/cmake/miallib/miallib-config.cmake
-
 override_dh_makeshlibs:
 	dh_makeshlibs -- -v$(UPSTREAM_VERSION)



View it on GitLab: https://salsa.debian.org/debian-gis-team/jeolib-miallib/-/compare/1362239b14a22d64afa171d5d72591885e8f6719...6e40c5a9ce846c4be68f10dca3d2179fa914ddb9

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/jeolib-miallib/-/compare/1362239b14a22d64afa171d5d72591885e8f6719...6e40c5a9ce846c4be68f10dca3d2179fa914ddb9
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/20251025/d9454f09/attachment-0001.htm>