[med-svn] r4427 - trunk/packages/dcmtk/trunk/debian

[Andreas Tille]

Author: tille
Date: 2009-12-02 12:46:44 +0000 (Wed, 02 Dec 2009)
New Revision: 4427

Modified:
   trunk/packages/dcmtk/trunk/debian/changelog
   trunk/packages/dcmtk/trunk/debian/dot
   trunk/packages/dcmtk/trunk/debian/rules
Log:
Revert use of SVG graphics because editing the HTML files turned out to be to complex, use png:gd now; some lintian issues


Modified: trunk/packages/dcmtk/trunk/debian/changelog
===================================================================
--- trunk/packages/dcmtk/trunk/debian/changelog	2009-12-02 08:12:51 UTC (rev 4426)
+++ trunk/packages/dcmtk/trunk/debian/changelog	2009-12-02 12:46:44 UTC (rev 4427)
@@ -22,7 +22,14 @@
   * debian/{01_buildsystem_changes,01_fix_perl_script_path,02_dcmtk_3.5.4-3}.patch
     split up patches of former maintainer into maintainable pieces
   * Build-Depends: graphviz
-  * debian/dot: Hack to enable svg graphics in doxygen
+  * debian/dot: Hack to enable png:gd graphics in doxygen which was
+    told to be more compact and readable.  The hack contains also
+    working code to create SVG, but I failed to patch the HTML files
+    to render SVG files
+  * debian/libdcmtk1.lintian-overrides: we bundle more than
+    one library in this package so the warning is void
+  * debian/rules: Try to make backups of original files in config
+    but failed for two remaining files (no idea why)
 
   [Mathieu Malaterre]
   * debian/rules would not honor DEB_BUILD_OPTIONS=nostrip, since 
@@ -31,7 +38,7 @@
     `strip` from Makefiles.
     Closes: #511668, #436758
 
- -- Andreas Tille <tille at debian.org>  Wed, 14 Jan 2009 11:44:35 +0100
+ -- Andreas Tille <tille at debian.org>  Wed, 02 Dec 2009 09:54:56 +0100
 
 dcmtk (3.5.4-3) unstable; urgency=low
 

Modified: trunk/packages/dcmtk/trunk/debian/dot
===================================================================
--- trunk/packages/dcmtk/trunk/debian/dot	2009-12-02 08:12:51 UTC (rev 4426)
+++ trunk/packages/dcmtk/trunk/debian/dot	2009-12-02 12:46:44 UTC (rev 4427)
@@ -1,3 +1,12 @@
 #!/bin/sh
-ARGS=`echo $@ | sed -e 's/ -Tpng / -Tsvg /g' -e 's/\(-o .\+\.\)png/\1svg/'`
+# 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/rules
===================================================================
--- trunk/packages/dcmtk/trunk/debian/rules	2009-12-02 08:12:51 UTC (rev 4426)
+++ trunk/packages/dcmtk/trunk/debian/rules	2009-12-02 12:46:44 UTC (rev 4427)
@@ -37,8 +37,10 @@
 
 config/config.status: configure
 	dh_testdir
-	# Add here commands to configure the package.
 
+	# keep ap copy of the original config files to be able to move
+	# them back right into place in the clean target
+	cd config && mkdir backup && cp -a config* confmod include backup
 	cd config && ./autoall && cd .. && 			\
 	./configure 	--host=$(DEB_HOST_GNU_TYPE)		\
 			--build=$(DEB_BUILD_GNU_TYPE)		\
@@ -107,6 +109,7 @@
 clean: unpatch
 	dh_testdir
 	dh_testroot
+	if [ -d config/backup ] ; then cd config; mv backup/* . ; rm -rf backup ; fi
 	rm -f build-arch-stamp build-indep-stamp config/config.status
 
 	[ ! -f config/Makefile.def ] || $(MAKE) distclean
@@ -130,7 +133,7 @@
 install-indep: build-indep
 	dh_testdir
 	dh_testroot
-	dh_clean -i -k
+	dh_prep -i
 	dh_installdirs -i
 
 	$(MAKE) install-html DESTDIR=$(PKGDIR_DCMTK_DOC)
@@ -138,7 +141,7 @@
 install-arch: build-arch
 	dh_testdir
 	dh_testroot
-	dh_clean -k 
+	dh_prep
 	dh_installdirs -a
 
 	$(MAKE) install DESTDIR=$(PKGDIR_DCMTK) && \