Mathieu Malaterre pushed to branch master at Debian Med / charls
Commits: 32cf2ef0 by Mathieu Malaterre at 2020-10-30T18:43:54+01:00 d/patches: Remove change_library_name patch Rework the logic and instead provide upstream binaries: libcharls.so.* Debian will maintain the symlink to prevent breakages for the time being. - - - - - 4 changed files: - debian/libcharls2.symbols - − debian/patches/change_library_name.patch - debian/patches/series - debian/rules Changes: ===================================== debian/libcharls2.symbols ===================================== @@ -1,4 +1,4 @@ -libCharLS.so.2 libcharls2 #MINVER# +libcharls.so.2 libcharls2 #MINVER# JpegLsDecode@Base 2.0.0+dfsg JpegLsDecodeRect@Base 2.0.0+dfsg JpegLsEncode@Base 2.0.0+dfsg ===================================== debian/patches/change_library_name.patch deleted ===================================== @@ -1,21 +0,0 @@ -Description: rename library to libCharLS.so to prevent breakage -Author: Shayan Doust <[email protected]> -Bug-Debian: https://bugs.debian.org/971425/ -Bug-Debian: https://bugs.debian.org/971431/ -Bug-Debian: https://bugs.debian.org/971435/ -Last-Update: 2020-09-30 ---- - -Index: charls/src/CMakeLists.txt -=================================================================== ---- charls.orig/src/CMakeLists.txt -+++ charls/src/CMakeLists.txt -@@ -20,6 +20,8 @@ if(WIN32 AND BUILD_SHARED_LIBS) - endif() - endif() - -+set_target_properties(charls PROPERTIES OUTPUT_NAME "CharLS") -+ - set_target_properties(charls PROPERTIES - VERSION ${PROJECT_VERSION} - SOVERSION ${PROJECT_VERSION_MAJOR}) ===================================== debian/patches/series ===================================== @@ -1,3 +1,2 @@ -change_library_name.patch stl_symbols_hack.patch noexplicitstd.patch ===================================== debian/rules ===================================== @@ -26,6 +26,9 @@ pkg_run = libcharls2 pkg_dev = libcharls-dev override_dh_install-arch: + # See #971425, #971431 & #971435: + dh_link -p$(pkg_run) usr/lib/$(DEB_HOST_MULTIARCH)/libcharls.so.2 usr/lib/$(DEB_HOST_MULTIARCH)/libCharLS.so.2 + dh_link -p$(pkg_dev) usr/lib/$(DEB_HOST_MULTIARCH)/libcharls.so usr/lib/$(DEB_HOST_MULTIARCH)/libCharLS.so # Runtime Package dh_install -p$(pkg_run) usr/lib/$(DEB_HOST_MULTIARCH)/lib*.so.* # Development Package View it on GitLab: https://salsa.debian.org/med-team/charls/-/commit/32cf2ef0585a9b31855dad789321d0e680617dd9 -- View it on GitLab: https://salsa.debian.org/med-team/charls/-/commit/32cf2ef0585a9b31855dad789321d0e680617dd9 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ debian-med-commit mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit
