[Pkg-mono-svn-commits] rev 1025 - xsp/trunk/debian

[Pablo Fischer]

Author: pabl0-guest
Date: 2004-06-16 13:04:53 -0600 (Wed, 16 Jun 2004)
New Revision: 1025

Modified:
   xsp/trunk/debian/changelog
   xsp/trunk/debian/mono-xsp.init
   xsp/trunk/debian/mono-xsp.postinst
   xsp/trunk/debian/mono-xsp.postrm
Log:
New preprelease and some fixes starting the xsp daemon


Modified: xsp/trunk/debian/changelog
===================================================================
--- xsp/trunk/debian/changelog	2004-06-16 18:37:57 UTC (rev 1024)
+++ xsp/trunk/debian/changelog	2004-06-16 19:04:53 UTC (rev 1025)
@@ -1,11 +1,11 @@
 xsp (0.14-7) unstable; urgency=low
 	
-  * NOT RELEASED
   * Rewrited README.Debian files	
   * Added more docs to packages 
   * dlls of asp.net-examples should be in a bin/ directory, inside asp
   * Added manpages of {package}-update.conf
-  * Added debconf dependency to mono-xsp and mono-server	
+  * Added debconf dependency to mono-xsp and mono-server
+  * Fixed a bug in init scripts and removed obsolote stuff	
 
  -- Debian Mono Group <pkg-mono-group@lists.alioth.debian.org>  Mon, 14 Jun 2004 21:41:43 -0600
 	

Modified: xsp/trunk/debian/mono-xsp.init
===================================================================
--- xsp/trunk/debian/mono-xsp.init	2004-06-16 18:37:57 UTC (rev 1024)
+++ xsp/trunk/debian/mono-xsp.init	2004-06-16 19:04:53 UTC (rev 1025)
@@ -19,24 +19,11 @@
 test -x $DAEMON || exit 0
 
 should_start() {
-    if [ -e $DEFAULT ]; then
-        . $DEFAULT
-        if [ "$start_boot" != "true" ]; then
-            echo "$NAME not started as requested"
-            return 1
-        fi
-    fi
-
-    if [ ! -x $DAEMON ]; then
-        echo "$NAME is not executable, not starting"
-        return 1
-    fi
-
-    if [ ! -e $VIRTUALFILE ]; then
-	echo "You dont have $VIRTUALFILE "
-	echo "To have it, you need to install at least one package for xsp (like asp.net-examples)"	
+    if [ ! -e $VIRTUALFILE -o `cat $VIRTUALFILE | wc -l` = "2" ]; then
+	echo "You have an incomplete $VIRTUALFILE"
+	echo "To fix it, you need to install at least one package for xsp (like asp.net-examples)"	
 	return 1
-    fi
+    fi 
     
     if [ -f /var/run/$NAME ]; then
 	# Are we really running xsp?

Modified: xsp/trunk/debian/mono-xsp.postinst
===================================================================
--- xsp/trunk/debian/mono-xsp.postinst	2004-06-16 18:37:57 UTC (rev 1024)
+++ xsp/trunk/debian/mono-xsp.postinst	2004-06-16 19:04:53 UTC (rev 1025)
@@ -44,10 +44,11 @@
 	    return 1
         fi
     fi
-    
-    if [ ! -e $VIRTUALFILE ]; then
+
+    if [ ! -e $VIRTUALFILE -o `cat $VIRTUALFILE | wc -l` = "2" ]; then
+	echo "mono-xsp: Not started, you need asp.net-examples/monodoc-http or an ASP.NET application"
 	return 1
-    fi
+    fi 
     
     if [ -f /var/run/$NAME ]; then
 	# Are we really running xsp?
@@ -68,14 +69,16 @@
 
 case "$1" in
     configure)
+	autostart="true"
 	db_get xsp/xsp_autostart || true
 	if [ "$RET" = "true" ]; then	    
 	    activate_xsp
 	    if [ -x "/etc/init.d/mono-xsp" ]; then
-		update-rc.d mono-xsp defaults >/dev/null
+		update-rc.d mono-xsp defaults > /dev/null 2>&1 || true
 	    fi
-
 	else
+	    autostart="false"
+	    update-rc.d -f mono-xsp remove > /dev/null 2>&1  || true
 	    deactivate_xsp
 	fi
 
@@ -92,11 +95,13 @@
 
 	mono-xsp-update.conf
 	if [ "$RET" = "true" ]; then
-	    if should_start ; then
+	    if should_start -a $autostart = "true" ; then
 		echo "Starting $DESC: $NAME "
 		/etc/init.d/mono-xsp start > /dev/null 2>&1 || true
 	    fi
 	fi
+
+	rm -Rf $tempfile
 	;;
     
     *)

Modified: xsp/trunk/debian/mono-xsp.postrm
===================================================================
--- xsp/trunk/debian/mono-xsp.postrm	2004-06-16 18:37:57 UTC (rev 1024)
+++ xsp/trunk/debian/mono-xsp.postrm	2004-06-16 19:04:53 UTC (rev 1025)
@@ -9,7 +9,7 @@
 	. /usr/share/debconf/confmodule
         db_purge
 	#update-rc.d
-	update-rc.d -f mono-xsp remove >/dev/null
+	update-rc.d -f mono-xsp remove > /dev/null 2>&1
 	
 	;;
     esac