[med-svn] r18912 - trunk/packages/orthanc/trunk/debian

[Sebastien Jodogne]

Author: jodogne-guest
Date: 2015-03-05 16:05:15 +0000 (Thu, 05 Mar 2015)
New Revision: 18912

Modified:
   trunk/packages/orthanc/trunk/debian/postinst
   trunk/packages/orthanc/trunk/debian/prerm
   trunk/packages/orthanc/trunk/debian/rules
Log:
fixes

Modified: trunk/packages/orthanc/trunk/debian/postinst
===================================================================
--- trunk/packages/orthanc/trunk/debian/postinst	2015-03-05 10:34:21 UTC (rev 18911)
+++ trunk/packages/orthanc/trunk/debian/postinst	2015-03-05 16:05:15 UTC (rev 18912)
@@ -29,10 +29,12 @@
 
 	# Start the Orthanc service after installation
         # https://www.debian.org/doc/debian-policy/ch-opersys.html#s9.3.3.2
-        if which invoke-rc.d >/dev/null 2>&1; then
-            invoke-rc.d orthanc start
-        else
-            /etc/init.d/orthanc start
+	if [ -x /etc/init.d/orthanc ]; then
+           if which invoke-rc.d >/dev/null 2>&1; then
+               invoke-rc.d orthanc start
+           else
+               /etc/init.d/orthanc start
+           fi
         fi
 	;;
 

Modified: trunk/packages/orthanc/trunk/debian/prerm
===================================================================
--- trunk/packages/orthanc/trunk/debian/prerm	2015-03-05 10:34:21 UTC (rev 18911)
+++ trunk/packages/orthanc/trunk/debian/prerm	2015-03-05 16:05:15 UTC (rev 18912)
@@ -5,16 +5,18 @@
 VERSION=%VERSION%
 
 case $1 in
-    remove|upgrade|deconfigure)
-	# Stop the Orthanc service
+    upgrade|remove|deconfigure)
+	# Stop the Orthanc service before removal/upgrade
         # https://www.debian.org/doc/debian-policy/ch-opersys.html#s9.3.3.2
-        if which invoke-rc.d >/dev/null 2>&1; then
-            invoke-rc.d orthanc stop
-        else
-            /etc/init.d/orthanc stop
+	if [ -x /etc/init.d/orthanc ]; then
+            if which invoke-rc.d >/dev/null 2>&1; then
+		invoke-rc.d orthanc stop
+            else
+		/etc/init.d/orthanc stop
+            fi
         fi
 	;;
-
+    
     failed-upgrade)
 	;;
 

Modified: trunk/packages/orthanc/trunk/debian/rules
===================================================================
--- trunk/packages/orthanc/trunk/debian/rules	2015-03-05 10:34:21 UTC (rev 18911)
+++ trunk/packages/orthanc/trunk/debian/rules	2015-03-05 16:05:15 UTC (rev 18912)
@@ -67,7 +67,7 @@
         # Install "debian/orthanc-sqlite.orthanc.init" as
         # "/etc/init.d/orthanc.init", but do not start/stop the
         # "orthanc" service from the orthanc-sqlite package. It is
-        # stopped/started from prerm/postinst in the sqlite package.
+        # stopped/started from prerm/postinst in the orthanc package.
 	dh_installinit --package=orthanc-sqlite --name=orthanc --no-start
 
 override_dh_installchangelogs: