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

Mathieu Malaterre malat at alioth.debian.org
Thu May 31 09:19:11 UTC 2012 

Author: malat
Date: 2012-05-31 09:19:11 +0000 (Thu, 31 May 2012)
New Revision: 11131

Modified:
   trunk/packages/dcmtk/trunk/debian/changelog
   trunk/packages/dcmtk/trunk/debian/control
   trunk/packages/dcmtk/trunk/debian/dcmtk.README.Debian
   trunk/packages/dcmtk/trunk/debian/patches/underlink.patch
   trunk/packages/dcmtk/trunk/debian/rules
   trunk/packages/dcmtk/trunk/debian/storescp.init
Log:
prepare next upload

Modified: trunk/packages/dcmtk/trunk/debian/changelog
===================================================================
--- trunk/packages/dcmtk/trunk/debian/changelog	2012-05-31 09:14:48 UTC (rev 11130)
+++ trunk/packages/dcmtk/trunk/debian/changelog	2012-05-31 09:19:11 UTC (rev 11131)
@@ -2,7 +2,9 @@
 
   * Fix compilation with gcc 4.7. Closes: #674361
    - debian/patches/bug674361.patch
-  * Make sure to link against libxml2
+  * Make sure to link against libxml2. Closes: #510120
+  * Fix some underlinking. Closes: #674586
+   - debian/patches/underlink.patch
 
  -- Mathieu Malaterre <malat at debian.org>  Fri, 25 May 2012 11:19:22 +0200
 

Modified: trunk/packages/dcmtk/trunk/debian/control
===================================================================
--- trunk/packages/dcmtk/trunk/debian/control	2012-05-31 09:14:48 UTC (rev 11130)
+++ trunk/packages/dcmtk/trunk/debian/control	2012-05-31 09:19:11 UTC (rev 11131)
@@ -6,7 +6,7 @@
 Uploaders: Juergen Salk <jsa at debian.org>,
  Andreas Tille <tille at debian.org>,
  Mathieu Malaterre <malat at debian.org>
-Build-Depends: debhelper (>= 9), autoconf, autotools-dev, zlib1g-dev, libtiff-dev, quilt,
+Build-Depends: debhelper (>= 9), autoconf, autotools-dev, zlib1g-dev, libtiff-dev,
  libpng-dev, libxml2-dev, libwrap0-dev, libssl-dev, doxygen (>= 1.7.4), graphviz, libcharls-dev
 Standards-Version: 3.9.3
 Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/dcmtk/trunk/

Modified: trunk/packages/dcmtk/trunk/debian/dcmtk.README.Debian
===================================================================
--- trunk/packages/dcmtk/trunk/debian/dcmtk.README.Debian	2012-05-31 09:14:48 UTC (rev 11130)
+++ trunk/packages/dcmtk/trunk/debian/dcmtk.README.Debian	2012-05-31 09:19:11 UTC (rev 11131)
@@ -200,4 +200,4 @@
 source distribution to allow compilation with external CharLS library.
 
 
- -- Mathieu Malaterre <mathieu.malaterre at gmail.com>  Tue, 08 Feb 2011 19:20:13 +0100
+ -- Mathieu Malaterre <malat at debian.org>  Tue, 08 Feb 2011 19:20:13 +0100

Modified: trunk/packages/dcmtk/trunk/debian/patches/underlink.patch
===================================================================
--- trunk/packages/dcmtk/trunk/debian/patches/underlink.patch	2012-05-31 09:14:48 UTC (rev 11130)
+++ trunk/packages/dcmtk/trunk/debian/patches/underlink.patch	2012-05-31 09:19:11 UTC (rev 11131)
@@ -1,7 +1,13 @@
+Description: fix underlinked libraries
+ Each of these libraries is built twice, first as .so with gcc, then as .a with
+ ar. We need to provide libraries only when dynamic library is built.
+Author: Ilya Barygin <randomaction at ubuntu.com>
+Bug-Debian: http://bugs.debian.org/674586
+
 Index: dcmtk-3.6.0/dcmsign/libsrc/Makefile.in
 ===================================================================
---- dcmtk-3.6.0.orig/dcmsign/libsrc/Makefile.in	2012-05-29 22:22:52.000000000 +0200
-+++ dcmtk-3.6.0/dcmsign/libsrc/Makefile.in	2012-05-29 22:23:25.000000000 +0200
+--- dcmtk-3.6.0.orig/dcmsign/libsrc/Makefile.in	2012-05-31 10:45:58.207193330 +0200
++++ dcmtk-3.6.0/dcmsign/libsrc/Makefile.in	2012-05-31 10:45:59.843193307 +0200
 @@ -34,7 +34,11 @@
  
  
@@ -16,8 +22,8 @@
  
 Index: dcmtk-3.6.0/ofstd/libsrc/Makefile.in
 ===================================================================
---- dcmtk-3.6.0.orig/ofstd/libsrc/Makefile.in	2012-05-29 19:55:25.000000000 +0200
-+++ dcmtk-3.6.0/ofstd/libsrc/Makefile.in	2012-05-29 19:58:39.000000000 +0200
+--- dcmtk-3.6.0.orig/ofstd/libsrc/Makefile.in	2012-05-31 10:45:58.219193330 +0200
++++ dcmtk-3.6.0/ofstd/libsrc/Makefile.in	2012-05-31 10:45:59.843193307 +0200
 @@ -29,7 +29,11 @@
  
  

Modified: trunk/packages/dcmtk/trunk/debian/rules
===================================================================
--- trunk/packages/dcmtk/trunk/debian/rules	2012-05-31 09:14:48 UTC (rev 11130)
+++ trunk/packages/dcmtk/trunk/debian/rules	2012-05-31 09:19:11 UTC (rev 11131)
@@ -20,8 +20,13 @@
 # Library version
 LIB_VERSION=2.0.0
 
-export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
-export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+# the build system is currently too complex to modify to handle --no-undefined
+# leave undefined symbols for now
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed #-Wl,--no-undefined
+# build system is too complex to modify for support -fPIE to exe and -fPIC to
+# shared libs we would need to use libtool or equivalent to filter shared libs
+# from exe
+#export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/buildflags.mk
 
@@ -79,8 +84,8 @@
 	# utilities dynamically against the shared library versions.
 
 	mv config/Makefile.def config/Makefile.def.static && \
-	sed -e '/^CFLAGS =/s/-O/-fPIC/' -e '/^CXXFLAGS =/s/-O/-fPIC/' \
-	-e '/^AR =/s/ar/gcc/' -e '/^ARFLAGS =/s/cruv/-shared -Wl,-soname,\$$\@.2 -o/' \
+	sed -e '/^CFLAGS =/s/-O -/-fPIC -/' -e '/^CXXFLAGS =/s/-O -/-fPIC -/' \
+	-e '/^AR =/s/ar/gcc/' -e '/^ARFLAGS =/s/cruv/-lstdc++ -lz -lxml2 -lpthread -lssl -lcrypto $(LDFLAGS) -shared -Wl,-soname,\$$\@.2 -o/' \
 	-e '/^LIBEXT =/s/a/so/' -e '/^RANLIB =/s/ranlib/:/' \
 	<config/Makefile.def.static >config/Makefile.def && \
 	$(MAKE) libsrc-all && \

Modified: trunk/packages/dcmtk/trunk/debian/storescp.init
===================================================================
--- trunk/packages/dcmtk/trunk/debian/storescp.init	2012-05-31 09:14:48 UTC (rev 11130)
+++ trunk/packages/dcmtk/trunk/debian/storescp.init	2012-05-31 09:19:11 UTC (rev 11131)
@@ -8,7 +8,7 @@
 # Short-Description: Init-Script for DCMTK STORE SCP: storescp
 ### END INIT INFO
 
-# Author: Mathieu Malaterre <mathieu.malaterre at gmail.com>
+# Author: Mathieu Malaterre <malat at debian.org>
 
 # PATH should only include /usr/* if it runs after the mountnfs.sh script
 PATH=/sbin:/usr/sbin:/bin:/usr/bin

More information about the debian-med-commit mailing list