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

[Andreas Tille]

Author: tille
Date: 2011-02-04 22:21:30 +0000 (Fri, 04 Feb 2011)
New Revision: 5898

Removed:
   trunk/packages/dcmtk/trunk/debian/libdcmtk2.install
Modified:
   trunk/packages/dcmtk/trunk/debian/changelog
   trunk/packages/dcmtk/trunk/debian/libdcmtk2.dirs
   trunk/packages/dcmtk/trunk/debian/rules
Log:
Make sure *.dic files only show up only in libdcmtk2 but not in dcmtk


Modified: trunk/packages/dcmtk/trunk/debian/changelog
===================================================================
--- trunk/packages/dcmtk/trunk/debian/changelog	2011-02-04 18:58:03 UTC (rev 5897)
+++ trunk/packages/dcmtk/trunk/debian/changelog	2011-02-04 22:21:30 UTC (rev 5898)
@@ -1,5 +1,6 @@
 dcmtk (3.6.0-1) experimental; urgency=low
 
+  [ Mathieu Malaterre ]
   * New upstream: 3.6.0
   * Update SONAME to 2.0.0 because of change in log4cplus::Logger::addAppender
   * Fix lintian errors on misc:Depends
@@ -13,8 +14,12 @@
   * Move *.dic file to the libdcmtk2 package
   * Switch to dpkg-source 3.0 (quilt) format
 
- -- Mathieu Malaterre <mathieu.malaterre at gmail.com>  Sun, 30 Jan 2011 18:42:25 +0100
+  [ Andreas Tille ]
+  * make sure *.dic file shwo up only in libdcmtk2 package
+  * Add -f to rm statement in clean target
 
+ -- Andreas Tille <tille at debian.org>  Fri, 04 Feb 2011 22:24:40 +0100
+
 dcmtk (3.5.4-4) unstable; urgency=low
 
   [Andreas Tille]

Modified: trunk/packages/dcmtk/trunk/debian/libdcmtk2.dirs
===================================================================
--- trunk/packages/dcmtk/trunk/debian/libdcmtk2.dirs	2011-02-04 18:58:03 UTC (rev 5897)
+++ trunk/packages/dcmtk/trunk/debian/libdcmtk2.dirs	2011-02-04 22:21:30 UTC (rev 5898)
@@ -1 +1,2 @@
 usr/lib
+usr/share/dcmtk

Deleted: trunk/packages/dcmtk/trunk/debian/libdcmtk2.install
===================================================================
--- trunk/packages/dcmtk/trunk/debian/libdcmtk2.install	2011-02-04 18:58:03 UTC (rev 5897)
+++ trunk/packages/dcmtk/trunk/debian/libdcmtk2.install	2011-02-04 22:21:30 UTC (rev 5898)
@@ -1,3 +0,0 @@
-debian/dcmtk/usr/share/dcmtk/dicom.dic   usr/share/dcmtk
-debian/dcmtk/usr/share/dcmtk/private.dic usr/share/dcmtk
-debian/dcmtk/usr/share/dcmtk/diconde.dic usr/share/dcmtk

Modified: trunk/packages/dcmtk/trunk/debian/rules
===================================================================
--- trunk/packages/dcmtk/trunk/debian/rules	2011-02-04 18:58:03 UTC (rev 5897)
+++ trunk/packages/dcmtk/trunk/debian/rules	2011-02-04 22:21:30 UTC (rev 5898)
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
+# debian/rules for dcmtk
+# Authors: Juergen Salk <juergen.salk at gmx.de>
+#          Mathieu Malaterre <mathieu.malaterre at gmail.com>
 
 include /usr/share/quilt/quilt.make
 
@@ -129,8 +129,8 @@
 	-test -r config/lzwtest.tif && \
 		rm -f config/lzwtest.tif
 
-	rm config/config.sub
-	rm config/config.guess
+	rm -f config/config.sub
+	rm -f config/config.guess
 
 	dh_clean
 
@@ -196,6 +196,7 @@
 	dh_installman -a
 	dh_install -a
 	chmod 755 $(PKGDIR_DCMTK_WWW)/usr/lib/dcmtk/cgi-bin/*.p[lh]
+	mv $(PKGDIR_DCMTK)/usr/share/dcmtk/*.dic $(PKGDIR_DCMTK_LIB)/usr/share/dcmtk/
 	dh_link -a
 	dh_lintian -a
 	dh_strip -a