[med-svn] r20310 - in trunk/packages/dcmtk/trunk/debian: . patches

[Gert Wollny]

Author: gert-guest
Date: 2015-10-28 14:54:35 +0000 (Wed, 28 Oct 2015)
New Revision: 20310

Added:
   trunk/packages/dcmtk/trunk/debian/patches/soversion_abi.patch
Modified:
   trunk/packages/dcmtk/trunk/debian/changelog
   trunk/packages/dcmtk/trunk/debian/control
   trunk/packages/dcmtk/trunk/debian/patches/series
   trunk/packages/dcmtk/trunk/debian/rules
Log:
Add a patch to properly add the abi-suffix to the libraries 

The initial version to add an abi-suffix broke the build for 
insighttoolkit4, since it relies on the library names provided 
by the DCMTP-Targets*.cmake files, and here the suffix was not 
added. In addition I (Gert Wollny) added myself to the 
uploaders to facilitate future work. 



Modified: trunk/packages/dcmtk/trunk/debian/changelog
===================================================================
--- trunk/packages/dcmtk/trunk/debian/changelog	2015-10-28 11:29:19 UTC (rev 20309)
+++ trunk/packages/dcmtk/trunk/debian/changelog	2015-10-28 14:54:35 UTC (rev 20310)
@@ -1,3 +1,13 @@
+dcmtk (3.6.1~20150629-4) UNRELEASED; urgency=medium
+
+  [Gert Wollny] 
+  * Add patch soversion_abi.patch to change not only the library file 
+    name but also in the cmake related files. 
+  * d/rules: remove code to add abi-suffix to libraries on install 
+  * Add Gert Wollny to uploaders 
+
+ -- Gert Wollny <gw.fossdev at gmail.com>  Wed, 28 Oct 2015 15:39:55 +0100
+
 dcmtk (3.6.1~20150629-3) unstable; urgency=medium
 
   * Adapt prerm script for dash

Modified: trunk/packages/dcmtk/trunk/debian/control
===================================================================
--- trunk/packages/dcmtk/trunk/debian/control	2015-10-28 11:29:19 UTC (rev 20309)
+++ trunk/packages/dcmtk/trunk/debian/control	2015-10-28 14:54:35 UTC (rev 20310)
@@ -2,7 +2,8 @@
 Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
 Uploaders: Juergen Salk <jsa at debian.org>,
            Andreas Tille <tille at debian.org>,
-           Mathieu Malaterre <malat at debian.org>
+           Mathieu Malaterre <malat at debian.org>,
+           Gert Wollny <gw.fossdev at gmail.com> 
 Section: science
 Priority: optional
 Build-Depends: cmake,

Modified: trunk/packages/dcmtk/trunk/debian/patches/series
===================================================================
--- trunk/packages/dcmtk/trunk/debian/patches/series	2015-10-28 11:29:19 UTC (rev 20309)
+++ trunk/packages/dcmtk/trunk/debian/patches/series	2015-10-28 14:54:35 UTC (rev 20310)
@@ -11,3 +11,4 @@
 0001-Fixed-OFoptional-by-introducing-OFalign.patch
 performance.patch
 Set-HTML_TIMESTAMP-to-NO.patch
+soversion_abi.patch

Added: trunk/packages/dcmtk/trunk/debian/patches/soversion_abi.patch
===================================================================
--- trunk/packages/dcmtk/trunk/debian/patches/soversion_abi.patch	                        (rev 0)
+++ trunk/packages/dcmtk/trunk/debian/patches/soversion_abi.patch	2015-10-28 14:54:35 UTC (rev 20310)
@@ -0,0 +1,11 @@
+--- a/CMake/dcmtkPrepare.cmake	2015-10-28 15:16:05.279429955 +0100
++++ b/CMake/dcmtkPrepare.cmake	2015-10-28 15:17:11.058822022 +0100
+@@ -56,7 +56,7 @@
+ #SET(DCMTK_PACKAGE_URL "http://www.dcmtk.org/")
+ 
+ # Shared library version information
+-SET(DCMTK_LIBRARY_PROPERTIES VERSION "${DCMTK_PACKAGE_VERSION}" SOVERSION "${DCMTK_ABI_VERSION}")
++SET(DCMTK_LIBRARY_PROPERTIES VERSION "${DCMTK_PACKAGE_VERSION}.abi1" SOVERSION "${DCMTK_ABI_VERSION}")
+ 
+ # General build options and settings
+ OPTION(BUILD_APPS "Build command line applications and test programs." ON)

Modified: trunk/packages/dcmtk/trunk/debian/rules
===================================================================
--- trunk/packages/dcmtk/trunk/debian/rules	2015-10-28 11:29:19 UTC (rev 20309)
+++ trunk/packages/dcmtk/trunk/debian/rules	2015-10-28 14:54:35 UTC (rev 20310)
@@ -57,12 +57,6 @@
 	dh_auto_install
 	# ??
 	mv debian/tmp/usr/etc debian/tmp/
-	# Rename libraries due to changed soname (see #754583)
-	for so in `find debian -type f -name "*.so.*"` ; do \
-	    soname=`objdump -p $${so} | grep SONAME | sed 's/^ *SONAME \+//'` ; \
-	    mv $${so} $${so}.abi1 ; \
-	    ln -sf `basename $${so}`.abi1 `dirname $${so}`/$${soname} ; \
-	done
 
 override_dh_auto_install-indep:
 	#DESTDIR=debian/tmp $(MAKE) -C obj-*/doxygen install