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

[Mathieu Malaterre]

Author: malat-guest
Date: 2012-03-06 21:07:45 +0000 (Tue, 06 Mar 2012)
New Revision: 9902

Modified:
   trunk/packages/dcmtk/trunk/debian/changelog
   trunk/packages/dcmtk/trunk/debian/compat
   trunk/packages/dcmtk/trunk/debian/control
   trunk/packages/dcmtk/trunk/debian/dcmtk.postrm
   trunk/packages/dcmtk/trunk/debian/rules
Log:
Getting some work on dcmtk package

Modified: trunk/packages/dcmtk/trunk/debian/changelog
===================================================================
--- trunk/packages/dcmtk/trunk/debian/changelog	2012-03-06 20:39:41 UTC (rev 9901)
+++ trunk/packages/dcmtk/trunk/debian/changelog	2012-03-06 21:07:45 UTC (rev 9902)
@@ -1,13 +1,14 @@
 dcmtk (3.6.0-10) UNRELEASED; urgency=low
 
-TODO: get rid of debug code in dcmtk.{post,pre}rm and finally
-find out why purge is never called (I tried dpkg --purge dcmtk;
-apt-get --purge remove dcmtk  etc. - and went always through
-remove branch
-
+  [ Andreas Tille ]
   * debian/dcmtk.prerm: when purging dirs in /var/lib need to be
-    removed in advance
+    removed in advance. Closes: #660346
 
+  [ Mathieu Malaterre ]
+  * Use libpng-dev. Closes: #662296
+  * Use libtiff-dev for transition to tiff5
+  * Bump Std-Vers to 3.9.3. No changes needed
+
  -- Andreas Tille <tille at debian.org>  Sun, 04 Dec 2011 12:57:30 +0100
 
 dcmtk (3.6.0-9) unstable; urgency=low

Modified: trunk/packages/dcmtk/trunk/debian/compat
===================================================================
--- trunk/packages/dcmtk/trunk/debian/compat	2012-03-06 20:39:41 UTC (rev 9901)
+++ trunk/packages/dcmtk/trunk/debian/compat	2012-03-06 21:07:45 UTC (rev 9902)
@@ -1 +1 @@
-7
+9

Modified: trunk/packages/dcmtk/trunk/debian/control
===================================================================
--- trunk/packages/dcmtk/trunk/debian/control	2012-03-06 20:39:41 UTC (rev 9901)
+++ trunk/packages/dcmtk/trunk/debian/control	2012-03-06 21:07:45 UTC (rev 9902)
@@ -6,9 +6,9 @@
 Uploaders: Juergen Salk <jsa at debian.org>,
  Andreas Tille <tille at debian.org>,
  Mathieu Malaterre <mathieu.malaterre at gmail.com>
-Build-Depends: debhelper (>= 7), autoconf, autotools-dev, zlib1g-dev, libtiff4-dev,
- libpng12-dev, libxml2-dev, libwrap0-dev, libssl-dev, doxygen (>= 1.7.4), quilt, graphviz, libcharls-dev
-Standards-Version: 3.9.2
+Build-Depends: debhelper (>= 7), autoconf, autotools-dev, zlib1g-dev, libtiff-dev, quilt,
+ libpng-dev, libxml2-dev, libwrap0-dev, libssl-dev, doxygen (>= 1.7.4), graphviz, libcharls-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/
 Homepage: http://dicom.offis.de/dcmtk

Modified: trunk/packages/dcmtk/trunk/debian/dcmtk.postrm
===================================================================
--- trunk/packages/dcmtk/trunk/debian/dcmtk.postrm	2012-03-06 20:39:41 UTC (rev 9901)
+++ trunk/packages/dcmtk/trunk/debian/dcmtk.postrm	2012-03-06 21:07:45 UTC (rev 9902)
@@ -5,7 +5,12 @@
 # Remove possible leftovers of imagectn -> dcmqrscp transition
 
 if [ "$1" = "purge" ] ; then
-   
+
+   if [ -d /var/lib/dcmtk/db ]; then
+      rmdir -p --ignore-fail-on-non-empty /var/lib/dcmtk/db || :
+      rmdir -p --ignore-fail-on-non-empty /var/lib/dcmtk    || :
+   fi
+
    if [ -e /etc/default/imagectn.dpkg-old ]; then
       rm -f /etc/default/imagectn.dpkg-old
    fi
@@ -15,18 +20,5 @@
    fi
 fi
 
-if [ "$1" = "purge" ] ; then
-   if [ -d /var/lib/dcmtk/db ]; then
-      echo "POST: Remove previousely created directories"
-      rm -rf /var/lib/dcmtk/db
-      rm -rf /var/lib/dcmtk
-   else
-      echo "POST: Nothing to remove ($@)"
-   fi
-else
-    echo "POST: That's not purge ($@)"
-fi
-
-
 #DEBHELPER#	
 

Modified: trunk/packages/dcmtk/trunk/debian/rules
===================================================================
--- trunk/packages/dcmtk/trunk/debian/rules	2012-03-06 20:39:41 UTC (rev 9901)
+++ trunk/packages/dcmtk/trunk/debian/rules	2012-03-06 21:07:45 UTC (rev 9902)
@@ -5,10 +5,8 @@
 
 include /usr/share/quilt/quilt.make
 
-# Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)