[med-svn] r13592 - in trunk/packages/dcmtk/branches: . experimental experimental/debian

[Mathieu Malaterre]

Author: malat
Date: 2013-05-16 10:44:54 +0000 (Thu, 16 May 2013)
New Revision: 13592

Added:
   trunk/packages/dcmtk/branches/TODO
   trunk/packages/dcmtk/branches/experimental/debian/libdcmtk3.dirs
   trunk/packages/dcmtk/branches/experimental/debian/libdcmtk3.lintian-overrides
Removed:
   trunk/packages/dcmtk/branches/experimental/TODO
   trunk/packages/dcmtk/branches/experimental/debian/libdcmtk1.dirs
   trunk/packages/dcmtk/branches/experimental/debian/libdcmtk1.lintian-overrides
Modified:
   trunk/packages/dcmtk/branches/experimental/debian/rules
Log:
Fix lintian errors

Copied: trunk/packages/dcmtk/branches/TODO (from rev 13561, trunk/packages/dcmtk/branches/experimental/TODO)
===================================================================
--- trunk/packages/dcmtk/branches/TODO	                        (rev 0)
+++ trunk/packages/dcmtk/branches/TODO	2013-05-16 10:44:54 UTC (rev 13592)
@@ -0,0 +1,2 @@
+cmake does not build applications in dcmwlm/wwwapps/*
+contacted upstream for reason

Deleted: trunk/packages/dcmtk/branches/experimental/TODO
===================================================================
--- trunk/packages/dcmtk/branches/experimental/TODO	2013-05-15 17:57:55 UTC (rev 13591)
+++ trunk/packages/dcmtk/branches/experimental/TODO	2013-05-16 10:44:54 UTC (rev 13592)
@@ -1,2 +0,0 @@
-cmake does not build applications in dcmwlm/wwwapps/*
-contacted upstream for reason

Deleted: trunk/packages/dcmtk/branches/experimental/debian/libdcmtk1.dirs
===================================================================
--- trunk/packages/dcmtk/branches/experimental/debian/libdcmtk1.dirs	2013-05-15 17:57:55 UTC (rev 13591)
+++ trunk/packages/dcmtk/branches/experimental/debian/libdcmtk1.dirs	2013-05-16 10:44:54 UTC (rev 13592)
@@ -1 +0,0 @@
-usr/lib

Deleted: trunk/packages/dcmtk/branches/experimental/debian/libdcmtk1.lintian-overrides
===================================================================
--- trunk/packages/dcmtk/branches/experimental/debian/libdcmtk1.lintian-overrides	2013-05-15 17:57:55 UTC (rev 13591)
+++ trunk/packages/dcmtk/branches/experimental/debian/libdcmtk1.lintian-overrides	2013-05-16 10:44:54 UTC (rev 13592)
@@ -1,4 +0,0 @@
-# There is more than one library in one package bundles which makes perfectly
-# sense in this application but does not enable naming the library package apropriately
-libdcmtk1: package-name-doesnt-match-sonames libcharls1 libdcmdata1 libdcmdsig1 libdcmimage1 libdcmimgle1 libdcmjpeg1 libdcmjpls1 libdcmnet1 libdcmpstat1 libdcmqrdb1 libdcmsr1 libdcmtls1 libdcmwlm1 libi2d1 libijg12-1 libijg16-1 libijg8-1 liboflog1 libofstd1
-libdcmtk1: embedded-libjpeg

Copied: trunk/packages/dcmtk/branches/experimental/debian/libdcmtk3.dirs (from rev 13591, trunk/packages/dcmtk/branches/experimental/debian/libdcmtk1.dirs)
===================================================================
--- trunk/packages/dcmtk/branches/experimental/debian/libdcmtk3.dirs	                        (rev 0)
+++ trunk/packages/dcmtk/branches/experimental/debian/libdcmtk3.dirs	2013-05-16 10:44:54 UTC (rev 13592)
@@ -0,0 +1 @@
+usr/lib

Copied: trunk/packages/dcmtk/branches/experimental/debian/libdcmtk3.lintian-overrides (from rev 13591, trunk/packages/dcmtk/branches/experimental/debian/libdcmtk1.lintian-overrides)
===================================================================
--- trunk/packages/dcmtk/branches/experimental/debian/libdcmtk3.lintian-overrides	                        (rev 0)
+++ trunk/packages/dcmtk/branches/experimental/debian/libdcmtk3.lintian-overrides	2013-05-16 10:44:54 UTC (rev 13592)
@@ -0,0 +1,4 @@
+# There is more than one library in one package bundles which makes perfectly
+# sense in this application but does not enable naming the library package apropriately
+libdcmtk1: package-name-doesnt-match-sonames libcharls1 libdcmdata1 libdcmdsig1 libdcmimage1 libdcmimgle1 libdcmjpeg1 libdcmjpls1 libdcmnet1 libdcmpstat1 libdcmqrdb1 libdcmsr1 libdcmtls1 libdcmwlm1 libi2d1 libijg12-1 libijg16-1 libijg8-1 liboflog1 libofstd1
+libdcmtk1: embedded-libjpeg

Modified: trunk/packages/dcmtk/branches/experimental/debian/rules
===================================================================
--- trunk/packages/dcmtk/branches/experimental/debian/rules	2013-05-15 17:57:55 UTC (rev 13591)
+++ trunk/packages/dcmtk/branches/experimental/debian/rules	2013-05-16 10:44:54 UTC (rev 13592)
@@ -27,6 +27,8 @@
  -DDCMTK_WITH_ZLIB:BOOL=ON \
  -DDCMTK_WITH_ICONV:BOOL=ON \
  -DUSE_COMPILER_HIDDEN_VISIBILITY:BOOL=ON \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_VERBOSE_MAKEFILE=ON \
  -DCMAKE_SKIP_RPATH:BOOL=OFF
 
 override_dh_auto_configure:
@@ -45,6 +47,7 @@
 override_dh_auto_test-indep:
 
 override_dh_install:
+	chmod +x debian/dcmtk-www/usr/lib/dcmtk/cgi-bin/*
 	dh_install --list-missing
 
 override_dh_strip: