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

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-11-23 14:57:10 +0000 (Wed, 23 Nov 2011)
New Revision: 8657

Removed:
   trunk/packages/dcmtk/trunk/debian/dot
Modified:
   trunk/packages/dcmtk/trunk/debian/changelog
   trunk/packages/dcmtk/trunk/debian/patches/07_doxygen.patch
   trunk/packages/dcmtk/trunk/debian/rules
Log:
Prepare next upload

Modified: trunk/packages/dcmtk/trunk/debian/changelog
===================================================================
--- trunk/packages/dcmtk/trunk/debian/changelog	2011-11-23 12:32:00 UTC (rev 8656)
+++ trunk/packages/dcmtk/trunk/debian/changelog	2011-11-23 14:57:10 UTC (rev 8657)
@@ -1,3 +1,11 @@
+dcmtk (3.6.0-9) UNRELEASED; urgency=low
+
+  * Remove dot wrapper, not required anymore.
+  * Generate doc using svg instead of png to save disk space
+  * Fix compilation. Thanks to Bhavani Shankar. Closes: #646316
+
+ -- Mathieu Malaterre <mathieu.malaterre at gmail.com>  Wed, 23 Nov 2011 15:54:51 +0100
+
 dcmtk (3.6.0-8) unstable; urgency=low
 
   * Adding a storescp daemon

Deleted: trunk/packages/dcmtk/trunk/debian/dot
===================================================================
--- trunk/packages/dcmtk/trunk/debian/dot	2011-11-23 12:32:00 UTC (rev 8656)
+++ trunk/packages/dcmtk/trunk/debian/dot	2011-11-23 14:57:10 UTC (rev 8657)
@@ -1,12 +0,0 @@
-#!/bin/sh
-# This way you can SVG instead of PNG to enable smooth scaling
-# but you need to tweak HTML pages accordingly.
-# ARGS=`echo $@ | sed -e 's/ -Tpng / -Tsvg /g' -e 's/\(-o .\+\.\)png/\1svg/'`
-#
-# So we just try to render PNGs with GD library
-#
-# To disable this feature or remove the DOT_PATH
-# setting in doxygen/htmldocs.cfg (quilt patch)
-
-ARGS=`echo $@ | sed -e 's/ -Tpng / -Tpng:gd /g'`
-/usr/bin/dot $ARGS

Modified: trunk/packages/dcmtk/trunk/debian/patches/07_doxygen.patch
===================================================================
--- trunk/packages/dcmtk/trunk/debian/patches/07_doxygen.patch	2011-11-23 12:32:00 UTC (rev 8656)
+++ trunk/packages/dcmtk/trunk/debian/patches/07_doxygen.patch	2011-11-23 14:57:10 UTC (rev 8657)
@@ -1,7 +1,7 @@
 Index: dcmtk-3.6.0/doxygen/htmldocs.cfg
 ===================================================================
---- dcmtk-3.6.0.orig/doxygen/htmldocs.cfg	2010-11-29 13:02:49.000000000 +0100
-+++ dcmtk-3.6.0/doxygen/htmldocs.cfg	2011-01-28 10:12:13.000000000 +0100
+--- dcmtk-3.6.0.orig/doxygen/htmldocs.cfg	2011-11-23 15:49:41.000000000 +0100
++++ dcmtk-3.6.0/doxygen/htmldocs.cfg	2011-11-23 15:50:00.000000000 +0100
 @@ -1,4 +1,4 @@
 -# Doxyfile 1.5.1
 +# Doxyfile 1.7.1
@@ -1793,12 +1793,12 @@
  
  # If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen 
  # will generate a graph for each documented class showing the direct and 
-@@ -1187,7 +1540,7 @@
+@@ -1182,7 +1535,7 @@
+ # generated by dot. Possible values are png, jpg, or gif
+ # If left blank png will be used.
+ 
+-DOT_IMAGE_FORMAT       = png
++DOT_IMAGE_FORMAT       = svg
+ 
  # The tag DOT_PATH can be used to specify the path where the dot tool can be 
  # found. If left blank, it is assumed the dot tool can be found in the path.
- 
--DOT_PATH               = 
-+DOT_PATH               = ../debian
- 
- # The DOTFILE_DIRS tag can be used to specify one or more directories that 
- # contain dot files that are included in the documentation (see the 

Modified: trunk/packages/dcmtk/trunk/debian/rules
===================================================================
--- trunk/packages/dcmtk/trunk/debian/rules	2011-11-23 12:32:00 UTC (rev 8656)
+++ trunk/packages/dcmtk/trunk/debian/rules	2011-11-23 14:57:10 UTC (rev 8657)
@@ -29,6 +29,7 @@
 LIB_VERSION=2.0.0
 
 CFLAGS = -Wall -g
+LDFLAGS = -Wl,--no-as-needed
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -O0
@@ -89,9 +90,6 @@
 	# utilities and the static libraries without -fPIC but links the
 	# utilities dynamically against the shared library versions.
 
-	# make sure dot wrapper for doxygen executable
-	chmod 755 debian/dot
-
 	mv config/Makefile.def config/Makefile.def.static && \
 	sed -e '/^CFLAGS =/s/-O/-fPIC -O2/' -e '/^CXXFLAGS =/s/-O/-fPIC -O2/' \
 	-e '/^AR =/s/ar/gcc/' -e '/^ARFLAGS =/s/cruv/-shared -Wl,-soname,\$$\@.2 -o/' \