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

[Pablo Fischer]

Author: pabl0-guest
Date: 2004-06-14 23:30:28 -0600 (Mon, 14 Jun 2004)
New Revision: 1012

Modified:
   xsp/trunk/debian/control
   xsp/trunk/debian/mono-xsp.init
   xsp/trunk/debian/mono-xsp.postinst
Log:
Removed obsolete stuff and added debconf as a dependency (lintian says!!)



Modified: xsp/trunk/debian/control
===================================================================
--- xsp/trunk/debian/control	2004-06-15 05:22:10 UTC (rev 1011)
+++ xsp/trunk/debian/control	2004-06-15 05:30:28 UTC (rev 1012)
@@ -3,11 +3,11 @@
 Priority: optional
 Maintainer: Debian Mono group <pkg-mono-group@lists.alioth.debian.org>
 Standards-Version: 3.6.0
-Build-Depends: debhelper (>= 3), mono-mcs | c-sharp-compiler, libmono-dev
+Build-Depends: debhelper (>= 3), mono-mcs | c-sharp-compiler, libmono-dev, mono-utils (>> 0.95)
 
 Package: mono-xsp
 Architecture: all
-Depends: ${shlibs:Depends}, mono-jit (>= 0.95), mono-mcs (>= 0.95)
+Depends: ${shlibs:Depends}, ${net:Depends}, mono-mcs (>> 0.95), debconf (>= 0.5) | debconf-2.0
 Description: simple web server to run ASP.NET applications
  XSP is a simple web server written in C# that can be used to run your 
  ASP.NET applications. 
@@ -24,7 +24,7 @@
 
 Package: mono-server
 Architecture: all
-Depends: ${shlibs:Depends}, mono-jit (>= 0.95), libapache-mod-mono (>= 0.10), mono-mcs (>= 0.95)
+Depends: ${shlibs:Depends}, ${net:Depends}, libapache-mod-mono (>= 0.10), mono-mcs (>> 0.95), debconf (>= 0.5) | debconf-2.0
 Description: The mod-mono server
  It contains the mod-mono-server, a wrapper for mod_mono that let apache 
  users to run ASP.NET applications, so mod_mono call mod-mono-server to 

Modified: xsp/trunk/debian/mono-xsp.init
===================================================================
--- xsp/trunk/debian/mono-xsp.init	2004-06-15 05:22:10 UTC (rev 1011)
+++ xsp/trunk/debian/mono-xsp.init	2004-06-15 05:30:28 UTC (rev 1012)
@@ -14,7 +14,7 @@
 DESC="XSP WebServer"
 DEFAULT=/etc/default/$NAME
 CFGDIR=/etc/xsp
-VIRTUALFILE=$CFGDIR/mono-xsp-hosts.conf
+VIRTUALFILE=$CFGDIR/debian.webapp
 
 test -x $DAEMON || exit 0
 

Modified: xsp/trunk/debian/mono-xsp.postinst
===================================================================
--- xsp/trunk/debian/mono-xsp.postinst	2004-06-15 05:22:10 UTC (rev 1011)
+++ xsp/trunk/debian/mono-xsp.postinst	2004-06-15 05:30:28 UTC (rev 1012)
@@ -10,8 +10,7 @@
 NAME=mono-xsp
 DESC="XSP WebServer"
 CFGDIR=/etc/xsp
-VIRTUALFILE=$CFGDIR/mono-xsp-hosts.conf
-virtual_dirs=`mono-xsp-reader.conf`
+VIRTUALFILE=$CFGDIR/debian.webapp
 
 activate_xsp() {
     sed s/start_boot=false/start_boot=true/g $xsp_default > $tempfile
@@ -50,14 +49,6 @@
 	return 1
     fi
     
-    if [[ $virtual_dirs = *Sorry* ]]; then
-	return 1
-    fi
-    
-    if [[ -z $virtual_dirs ]]; then
-	return 1
-    fi
-
     if [ -f /var/run/$NAME ]; then
 	# Are we really running xsp?
 	xsp_pid=`cat /var/run/$NAME`