[med-svn] r9901 - trunk/packages/dcmtk/branches/experimental/debian

[Mathieu Malaterre]

Author: malat-guest
Date: 2012-03-06 20:39:41 +0000 (Tue, 06 Mar 2012)
New Revision: 9901

Modified:
   trunk/packages/dcmtk/branches/experimental/debian/compat
   trunk/packages/dcmtk/branches/experimental/debian/control
   trunk/packages/dcmtk/branches/experimental/debian/dcmtk-www.install
   trunk/packages/dcmtk/branches/experimental/debian/dcmtk.examples
   trunk/packages/dcmtk/branches/experimental/debian/rules
Log:
Some more fixes to get cmake working

Modified: trunk/packages/dcmtk/branches/experimental/debian/compat
===================================================================
--- trunk/packages/dcmtk/branches/experimental/debian/compat	2012-03-06 19:20:09 UTC (rev 9900)
+++ trunk/packages/dcmtk/branches/experimental/debian/compat	2012-03-06 20:39:41 UTC (rev 9901)
@@ -1 +1 @@
-7
+9

Modified: trunk/packages/dcmtk/branches/experimental/debian/control
===================================================================
--- trunk/packages/dcmtk/branches/experimental/debian/control	2012-03-06 19:20:09 UTC (rev 9900)
+++ trunk/packages/dcmtk/branches/experimental/debian/control	2012-03-06 20:39:41 UTC (rev 9901)
@@ -7,7 +7,8 @@
  Andreas Tille <tille at debian.org>,
  Mathieu Malaterre <mathieu.malaterre at gmail.com>
 Build-Depends: debhelper (>= 7), autoconf, autotools-dev, zlib1g-dev, libtiff4-dev, cmake,
- libpng-dev, libxml2-dev, libwrap0-dev, libssl-dev, doxygen (>= 1.7.4), graphviz, libcharls-dev
+ libpng-dev, libxml2-dev, libwrap0-dev, libssl-dev, doxygen (>= 1.7.4), graphviz, libcharls-dev,
+ libsndfile1-dev
 Standards-Version: 3.9.3
 Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/dcmtk/trunk/
 Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/dcmtk/trunk/

Modified: trunk/packages/dcmtk/branches/experimental/debian/dcmtk-www.install
===================================================================
--- trunk/packages/dcmtk/branches/experimental/debian/dcmtk-www.install	2012-03-06 19:20:09 UTC (rev 9900)
+++ trunk/packages/dcmtk/branches/experimental/debian/dcmtk-www.install	2012-03-06 20:39:41 UTC (rev 9901)
@@ -1,7 +1,7 @@
-dcmwlm/wwwapps/preplock		usr/lib/dcmtk/cgi-bin
-dcmwlm/wwwapps/readoviw		usr/lib/dcmtk/cgi-bin
-dcmwlm/wwwapps/readwlst		usr/lib/dcmtk/cgi-bin
-dcmwlm/wwwapps/writwlst		usr/lib/dcmtk/cgi-bin
+usr/bin/preplock    usr/lib/dcmtk/cgi-bin
+usr/bin/readoviw    usr/lib/dcmtk/cgi-bin
+usr/bin/readwlst    usr/lib/dcmtk/cgi-bin
+usr/bin/writwlst    usr/lib/dcmtk/cgi-bin
 dcmwlm/perl/*			usr/lib/dcmtk/cgi-bin
 dcmwlm/images/*			usr/share/dcmtk/www
 debian/apache.conf              etc/dcmtk

Modified: trunk/packages/dcmtk/branches/experimental/debian/dcmtk.examples
===================================================================
--- trunk/packages/dcmtk/branches/experimental/debian/dcmtk.examples	2012-03-06 19:20:09 UTC (rev 9900)
+++ trunk/packages/dcmtk/branches/experimental/debian/dcmtk.examples	2012-03-06 20:39:41 UTC (rev 9901)
@@ -1,2 +1,2 @@
-dcmwlm/wlistdb
-dcmwlm/wlistqry
+debian/tmp/usr/share/dcmtk/wlistdb
+debian/tmp/usr/share/dcmtk/wlistqry

Modified: trunk/packages/dcmtk/branches/experimental/debian/rules
===================================================================
--- trunk/packages/dcmtk/branches/experimental/debian/rules	2012-03-06 19:20:09 UTC (rev 9900)
+++ trunk/packages/dcmtk/branches/experimental/debian/rules	2012-03-06 20:39:41 UTC (rev 9901)
@@ -4,9 +4,24 @@
 %:
 	dh $@ --parallel --buildsystem=cmake
 
+CMAKE_EXTRA_FLAGS += -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \
+ -DBUILD_SHARED_LIBS:BOOL=ON \
+ -DDCMTK_WITH_OPENSSL:BOOL=ON \
+ -DDCMTK_WITH_PRIVATE_TAGS:BOOL=ON \
+ -DDCMTK_WITH_XML:BOOL=ON \
+ -DDCMTK_WITH_ICONV:BOOL=ON \
+ -DCMAKE_SKIP_RPATH:BOOL=ON
+
 override_dh_auto_configure:
-	dh_auto_configure -- -DCMAKE_BUILD_TYPE:STRING=Release -DBUILD_SHARED_LIBS:BOOL=ON -DDCMTK_WITH_OPENSSL:BOOL=ON -DDCMTK_WITH_PRIVATE_TAGS:BOOL=ON -DDCMTK_WITH_XML:BOOL=ON -DCMAKE_VERBOSE_MAKEFILE:BOOL=OFF -DCMAKE_SKIP_RPATH:BOOL=YES
+	dh_auto_configure -- $(CMAKE_EXTRA_FLAGS)
 
-.PHONY: get-orig-source
+# remove tests for now
+override_dh_auto_test:
+
+override_dh_install:
+	dh_install --list-missing
+
 get-orig-source:
 	uscan --force-download --verbose
+
+.PHONY: get-orig-source