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

[Andreas Tille]

Author: tille
Date: 2015-09-12 05:50:51 +0000 (Sat, 12 Sep 2015)
New Revision: 20054

Modified:
   trunk/packages/dcmtk/trunk/debian/changelog
   trunk/packages/dcmtk/trunk/debian/dcmtk-www.postinst
   trunk/packages/dcmtk/trunk/debian/dcmtk-www.postrm
   trunk/packages/dcmtk/trunk/debian/dcmtk.NEWS
   trunk/packages/dcmtk/trunk/debian/dcmtk.prerm
Log:
Do not hardcode path to invoke-rc.d in maintainer scripts


Modified: trunk/packages/dcmtk/trunk/debian/changelog
===================================================================
--- trunk/packages/dcmtk/trunk/debian/changelog	2015-09-12 05:14:06 UTC (rev 20053)
+++ trunk/packages/dcmtk/trunk/debian/changelog	2015-09-12 05:50:51 UTC (rev 20054)
@@ -7,6 +7,7 @@
   * Do gcc-5 transition on new version
   * There is no package libdcmtk3 any more
     Closes: #754583
+  * Do not hardcode path to invoke-rc.d in maintainer scripts
 
  -- Andreas Tille <tille at debian.org>  Fri, 11 Sep 2015 21:23:03 +0200
 

Modified: trunk/packages/dcmtk/trunk/debian/dcmtk-www.postinst
===================================================================
--- trunk/packages/dcmtk/trunk/debian/dcmtk-www.postinst	2015-09-12 05:14:06 UTC (rev 20053)
+++ trunk/packages/dcmtk/trunk/debian/dcmtk-www.postinst	2015-09-12 05:50:51 UTC (rev 20054)
@@ -9,7 +9,7 @@
                 ln -s ../../${pkg}/apache.conf /etc/$webserver/conf-available/${pkg}
 	        # Restart webserver to register configuration for dcmtk if config is considered to be OK
         	if ${webserver}ctl configtest 2>/dev/null; then
-	            if [ -x /usr/sbin/invoke-rc.d ]; then
+	            if which invoke-rc.d ; then
         	        invoke-rc.d $webserver reload 3>/dev/null || true
 	            else
         	        /etc/init.d/$webserver reload 3>/dev/null || true

Modified: trunk/packages/dcmtk/trunk/debian/dcmtk-www.postrm
===================================================================
--- trunk/packages/dcmtk/trunk/debian/dcmtk-www.postrm	2015-09-12 05:14:06 UTC (rev 20053)
+++ trunk/packages/dcmtk/trunk/debian/dcmtk-www.postrm	2015-09-12 05:50:51 UTC (rev 20054)
@@ -7,7 +7,7 @@
     purge|remove|upgrade)
         # Restart Apache to register configuration for dcmtk
         if apache2ctl configtest 2>/dev/null; then
-            if [ -x /usr/sbin/invoke-rc.d ]; then
+            if which invoke-rc.d ; then
                 invoke-rc.d apache2 reload 3>/dev/null || true
             else
                 /etc/init.d/apache2 reload 3>/dev/null || true

Modified: trunk/packages/dcmtk/trunk/debian/dcmtk.NEWS
===================================================================
--- trunk/packages/dcmtk/trunk/debian/dcmtk.NEWS	2015-09-12 05:14:06 UTC (rev 20053)
+++ trunk/packages/dcmtk/trunk/debian/dcmtk.NEWS	2015-09-12 05:50:51 UTC (rev 20054)
@@ -66,7 +66,7 @@
   - Refactored code of the tool findscu into a C++ class.  This facilitates
     re-use of the findscu code in other applications.
   
-  - Added further "switches" to the dcmdata module which allow to better cope
+  - Added further "switches" to the dcmdata module which allow one to better cope
     with incorrectly encoded DICOM files or datasets.  These switches are also
     available as new options to the tools dcmdump and dcmconv.
   

Modified: trunk/packages/dcmtk/trunk/debian/dcmtk.prerm
===================================================================
--- trunk/packages/dcmtk/trunk/debian/dcmtk.prerm	2015-09-12 05:14:06 UTC (rev 20053)
+++ trunk/packages/dcmtk/trunk/debian/dcmtk.prerm	2015-09-12 05:50:51 UTC (rev 20054)
@@ -3,7 +3,7 @@
 
 # This is in case we upgrade from dcmtk version < 3.5.4
 if [ -x "/etc/init.d/imagectn" ]; then
-	if [ -x /usr/sbin/invoke-rc.d ]; then
+    if which invoke-rc.d ; then
         invoke-rc.d --quiet imagectn stop 
     else
         /etc/init.d/imagectn stop 
@@ -11,7 +11,7 @@
 fi
 
 if [ -x "/etc/init.d/dcmqrscp" ]; then
-    if [ -x /usr/sbin/invoke-rc.d ]; then
+    if [ which invoke-rc.d ]; then
         invoke-rc.d --quiet dcmqrscp stop
     else
         /etc/init.d/dcmqrscp stop