[med-svn] [Git][med-team/libxdf][master] 4 commits: Restore SOVERSION

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / libxdf


Commits:
bf0f347a by Andreas Tille at 2020-12-18T19:07:09+01:00
Restore SOVERSION

- - - - -
3b698817 by Andreas Tille at 2020-12-18T21:32:38+01:00
Fix d-shlibs

- - - - -
c9f0a381 by Andreas Tille at 2020-12-18T21:33:42+01:00
Upload to unstable

- - - - -
157250c4 by Andreas Tille at 2020-12-18T21:42:58+01:00
Add missing newline

- - - - -


3 changed files:

- debian/changelog
- debian/patches/shared_and_static.patch
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,4 +1,4 @@
-libxdf (0.99.6+dfsg-1) UNRELEASED; urgency=medium
+libxdf (0.99.6+dfsg-1) unstable; urgency=medium
 
   * New upstream version
   * Standards-Version: 4.5.1 (routine-update)
@@ -8,7 +8,7 @@ libxdf (0.99.6+dfsg-1) UNRELEASED; urgency=medium
   * Set upstream metadata fields: Bug-Database, Bug-Submit, Repository,
     Repository-Browse.
 
- -- Andreas Tille <tille at debian.org>  Fri, 18 Dec 2020 16:56:00 +0100
+ -- Andreas Tille <tille at debian.org>  Fri, 18 Dec 2020 21:32:48 +0100
 
 libxdf (0.99+dfsg-1) unstable; urgency=medium
 


=====================================
debian/patches/shared_and_static.patch
=====================================
@@ -4,15 +4,16 @@ Description: Create shared and static library
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -26,6 +26,7 @@ set(SOURCES
+@@ -26,6 +26,8 @@ set(SOURCES
  )
  
  add_library(xdf ${SOURCES})
 +add_library(xdf_shared SHARED ${SOURCES})
++set_target_properties(xdf_shared PROPERTIES SOVERSION 0)
  
  find_package(pugixml 1.9 QUIET)
  if(TARGET pugixml AND NOT XDF_NO_SYSTEM_PUGIXML)
-@@ -39,6 +40,7 @@ endif()
+@@ -39,6 +41,7 @@ endif()
  
  target_compile_features(xdf PUBLIC cxx_std_11)
  set_target_properties(xdf PROPERTIES OUTPUT_NAME xdf PUBLIC_HEADER xdf.h)
@@ -20,7 +21,7 @@ Description: Create shared and static library
  target_include_directories(xdf PUBLIC
  	$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}>
  	$<INSTALL_INTERFACE:include>
-@@ -50,6 +52,12 @@ install(TARGETS xdf
+@@ -50,6 +53,12 @@ install(TARGETS xdf
  	LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
  	PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
  )


=====================================
debian/rules
=====================================
@@ -10,5 +10,9 @@ override_dh_install:
 	d-shlibmove --commit \
 		    --multiarch \
 		    --devunversioned \
-		    --movedev *.h usr/include \
-		    obj*/*.so
+		    --exclude-la \
+		    --movedev debian/tmp/usr/include usr \
+		    --movedev debian/tmp/usr/share/libxdfConfig.cmake usr/lib/$(DEB_BUILD_GNU_TYPE)/cmake \
+		    debian/tmp/usr/lib/*/*.so
+	# No idea whether this is needed in user installations - but the name sounds strange
+	find debian -name libxdfConfig-none.cmake -delete



View it on GitLab: https://salsa.debian.org/med-team/libxdf/-/compare/7825557ce7457596c840540a9737fa442436d836...157250c4f20feec7f220412b6942408540ec3eda

-- 
View it on GitLab: https://salsa.debian.org/med-team/libxdf/-/compare/7825557ce7457596c840540a9737fa442436d836...157250c4f20feec7f220412b6942408540ec3eda
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/debian-med-commit/attachments/20201218/01ca4bc2/attachment-0001.html>