[Pkg-mono-svn-commits] [xsp] 03/10: Remove support for 2.0 profile

Jo Shields directhex at moszumanska.debian.org
Mon Nov 30 15:25:19 UTC 2015


This is an automated email from the git hooks/post-receive script.

directhex pushed a commit to annotated tag debian/4.2-1
in repository xsp.

commit 6269b9180d3ec15cca753789f1117646929d5fa8
Author: Jo Shields <directhex at apebox.org>
Date:   Mon Nov 30 13:18:18 2015 +0000

    Remove support for 2.0 profile
---
 ...examples.hostxsp2 => asp.net-examples.hostxsp4} |   0
 debian/control                                     |  47 +--
 debian/dh-xsp.install                              |   2 -
 debian/dh_installxsp                               |  29 +-
 debian/fastcgi-mono-server2.exe.config             |   4 -
 debian/mono-apache-server.links                    |   4 +-
 debian/mono-apache-server2.README.Debian           |  53 ---
 debian/mono-apache-server2.config                  |  62 ----
 debian/mono-apache-server2.dirs                    |   1 -
 debian/mono-apache-server2.docs                    |   3 -
 debian/mono-apache-server2.install                 |   5 -
 debian/mono-apache-server2.manpages                |   4 -
 debian/mono-apache-server2.postinst                |  54 ---
 debian/mono-apache-server2.postrm                  |  13 -
 debian/mono-apache-server2.templates               |  21 --
 debian/mono-apache-server4.config                  |  27 +-
 debian/mono-apache-server4.templates               |  19 +-
 debian/mono-fastcgi-server2.README.Debian          |  25 --
 debian/mono-fastcgi-server2.docs                   |   3 -
 debian/mono-fastcgi-server2.install                |   5 -
 debian/mono-fastcgi-server2.links                  |   1 -
 debian/mono-fastcgi-server2.manpages               |   1 -
 debian/mono-server2-admin                          | 203 ------------
 debian/mono-server2-update                         | 364 ---------------------
 debian/mono-xsp2-admin                             | 173 ----------
 debian/mono-xsp2-base.install                      |   3 -
 debian/mono-xsp2-update                            | 225 -------------
 debian/mono-xsp2.README.Debian                     |  45 ---
 debian/mono-xsp2.config                            | 106 ------
 debian/mono-xsp2.dirs                              |   1 -
 debian/mono-xsp2.docs                              |   3 -
 debian/mono-xsp2.init                              | 102 ------
 debian/mono-xsp2.install                           |  11 -
 debian/mono-xsp2.manpages                          |   5 -
 debian/mono-xsp2.postinst                          | 122 -------
 debian/mono-xsp2.postrm                            |  14 -
 debian/mono-xsp2.preinst                           |  21 --
 debian/mono-xsp2.prerm                             |  39 ---
 debian/mono-xsp2.templates                         |  34 --
 debian/mono-xsp4.config                            |  27 +-
 debian/mono-xsp4.templates                         |  19 +-
 debian/po/POTFILES.in                              |   2 -
 debian/postinst-monoxsp2                           |   8 -
 debian/postrm-monoxsp2                             |   8 -
 debian/rules                                       |  32 +-
 45 files changed, 96 insertions(+), 1854 deletions(-)

diff --git a/debian/asp.net-examples.hostxsp2 b/debian/asp.net-examples.hostxsp4
similarity index 100%
rename from debian/asp.net-examples.hostxsp2
rename to debian/asp.net-examples.hostxsp4
diff --git a/debian/control b/debian/control
index a48cd66..7b68a62 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,6 @@ Build-Depends: debhelper (>= 7.0.50~),
  autotools-dev, 
  cli-common-dev (>= 0.8~),
  mono-devel (>= 3),
- mono-gmcs,
  monodoc-base (>= 3),
  libnunit-cil-dev
 Standards-Version: 3.9.1
@@ -26,14 +25,6 @@ Description: debhelper add-on to handle ASP.NET sites
  command, which allows ASP.NET sites to be automatically configured on 
  installation.
 
-Package: mono-xsp2-base
-Architecture: all
-Depends: ${misc:Depends}, ${cli:Depends}, mono-devel, mono-gmcs, libmono-system-web2.0-cil (>= ${mono-abi-comp-version})
-Description: base libraries for XSP 2.0
- This is the core libraries needed to install the XSP2 application,
- either through the standalone XSP version (mono-xsp2) or the Apache module
- (mono-apache-server2).
-
 Package: mono-xsp4-base
 Architecture: all
 Depends: ${misc:Depends}, ${cli:Depends}, mono-devel, libmono-system-web4.0-cil (>= ${mono-abi-comp-version})
@@ -52,16 +43,6 @@ Description: simple web server to run ASP.NET 4.0 applications
  This is the standalone ASP.NET web server. If you want to run ASP.NET
  applications with Apache, look at mono-apache-server.
 
-Package: mono-xsp2
-Architecture: all
-Depends: ${misc:Depends}, ${cli:Depends}, mono-xsp2-base (= ${source:Version}), procps
-Description: simple web server to run ASP.NET 2.0 applications
- XSP is a simple web server written in C# that can be used to run your 
- ASP.NET 1.1 and 2.0 applications. 
- .
- This is the standalone ASP.NET web server. If you want to run ASP.NET
- applications with Apache, look at mono-apache-server2.
-
 Package: mono-xsp
 Architecture: all
 Depends: mono-xsp4 (= ${source:Version}), ${misc:Depends}
@@ -75,7 +56,7 @@ Description: simple web server to run ASP.NET applications - default version
 
 Package: asp.net-examples
 Architecture: all
-Depends: ${misc:Depends}, ${cli:Depends}, ${cli:XspServer2}
+Depends: ${misc:Depends}, ${cli:Depends}, ${cli:XspServer4}
 Replaces: asp.net2-examples
 Conflicts: asp.net2-examples
 Description: demo pages for ASP.NET infrastructure
@@ -92,18 +73,6 @@ Description: ASP.NET 4.5 backend for mod_mono Apache module
  .
  This package requires you to install libapache2-mod-mono for Apache 2.0.
 
-Package: mono-apache-server2
-Architecture: all
-Conflicts: mono-server
-Replaces: mono-server
-Depends: ${misc:Depends}, ${cli:Depends}, mono-xsp2-base (= ${source:Version}), perl
-Description: ASP.NET 2.0 backend for mod_mono2 Apache module
- mono-apache-server contains the backend for mod_mono. It lets you run ASP.NET
- web applications via Apache. mod_mono will call mono-apache-server to parse
- and compile the aspx code.
- .
- This package requires you to install libapache2-mod-mono for Apache 2.0.
-
 Package: mono-apache-server
 Architecture: all
 Conflicts: mono-server, mono-apache-server1
@@ -152,20 +121,6 @@ Description: ASP.NET 4.0 backend for FastCGI webservers
  This package requires you to install any FastCGI webserver, such as
  Lighttpd or Apache (see libapache2-mod-fcgid).
 
-Package: mono-fastcgi-server2
-Architecture: all
-Conflicts: mono-server
-Replaces: mono-server
-Depends: libfpm-helper0 (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}, ${cli:Depends}, mono-xsp2-base (= ${source:Version}), perl
-Description: ASP.NET 2.0 backend for FastCGI webservers
- mono-fastcgi-server contains the backend for FastCGI. It lets you run
- ASP.NET web applications via HTTP servers such as Lighttpd or Apache.
- The FastCGI webserver should be configured to run fastcgi-mono-server to
- parse and compile the aspx code.
- .
- This package requires you to install any FastCGI webserver, such as
- Lighttpd or Apache (see libapache2-mod-fcgid).
-
 Package: mono-fastcgi-server
 Architecture: all
 Conflicts: mono-server
diff --git a/debian/dh-xsp.install b/debian/dh-xsp.install
index d94e1d6..41ff66b 100644
--- a/debian/dh-xsp.install
+++ b/debian/dh-xsp.install
@@ -1,6 +1,4 @@
 debian/dh_installxsp /usr/bin
 debian/postrm-monoxsp4 /usr/share/debhelper/autoscripts
-debian/postrm-monoxsp2 /usr/share/debhelper/autoscripts
 debian/postinst-monoxsp4 /usr/share/debhelper/autoscripts
-debian/postinst-monoxsp2 /usr/share/debhelper/autoscripts
 debian/xsp.pm /usr/share/perl5/Debian/Debhelper/Sequence
diff --git a/debian/dh_installxsp b/debian/dh_installxsp
index 6afb627..c49be19 100755
--- a/debian/dh_installxsp
+++ b/debian/dh_installxsp
@@ -17,13 +17,11 @@ B<dh_installxsp> [S<B<debhelper options>>] [B<--name=>I<name>] [B<-V >I<version(
 =head1 DESCRIPTION
 
 dh_installxsp is a debhelper program that will install host
-configuration files in /etc/xsp2/conf.d and /etc/mono-server2/conf.d
-(for XSP 2) or /etc/xsp4/conf.d and /etc/mono-server4/conf.d (for XSP
-4). So, if xsp 2 (or xsp 4) is install or will be installed, when xsp
+configuration files in /etc/xsp4/conf.d and /etc/mono-server4/conf.d 
+(for XSP 4). So, if xsp 4 is installed or will be installed, when xsp
 starts it automatically starts the daemon with the host file.
 
-The files debian/package.hostxsp2 are installed for XSP 2 while
-debian/package.hostxsp4 are used for XSP 4.
+The files debian/package.hostxsp4 are used for XSP 4.
 
 In the debian/rules file, dh_installxsp needs to be called before
 dh_installdeb to make sure the files are properly marked as conffiles
@@ -36,14 +34,14 @@ need to be marked as conffiles.
 
 =item B<--name=>I<name>
 
-Look for files named debian/package.hostxsp{2,4} and install them as
-/etc/xsp{2,4}/conf.d/package/hostfile.
+Look for files named debian/package.hostxsp4 and install them as
+/etc/xsp4/conf.d/package/hostfile.
 
 =item B<-V >I<version(s)>
 
-Installs the files for XSP 2.0 (B<-V 2>), XSP 4.0 (B<-V 4>), or both (B<-V
-2,4>). If this version is not specified (or just B<-V> is given), this
-only installed files for XSP 4, not XSP 2.
+Installs the files for XSP 4.0 (B<-V 4>). If this version is not 
+specified (or just B<-V> is given), this only installed files for 
+XSP 4.
 
 =back
 
@@ -53,11 +51,7 @@ only installed files for XSP 4, not XSP 2.
 init();
 
 # Figure out what versions we want to install
-my ($install_xsp_2, $install_xsp_4) = (0, 0);
-$install_xsp_2 = 1 if ($dh{V_FLAG_SET} && $dh{V_FLAG} =~ /2/);
-$install_xsp_4 = 1 if ($dh{V_FLAG_SET} && $dh{V_FLAG} =~ /4/);
-$install_xsp_4 = 1 if !$install_xsp_2 && !$install_xsp_4;
-$install_xsp_4 = 1 unless $dh{V_FLAG_SET};
+my ($install_xsp_4) = (1);
 
 my $depname="cli:XspServer";
 
@@ -66,13 +60,12 @@ my $depname="cli:XspServer";
 # pass.
 foreach my $package (@{$dh{DOPACKAGES}})
 {
-    # Configure for both XSP 2 and/or XSP 4
-    process_xsp($package, "2") if $install_xsp_2;
+    # Configure for XSP 4
     process_xsp($package, "4") if $install_xsp_4;
 }
 
 # This handles the installation of the actual files. This assumes that
-# $version has "2" or "4" (or "5" at some point) and that determines
+# $version has "4" (or "5" at some point) and that determines
 # the path being installed into.
 sub process_xsp
 {
diff --git a/debian/fastcgi-mono-server2.exe.config b/debian/fastcgi-mono-server2.exe.config
deleted file mode 100644
index 4824239..0000000
--- a/debian/fastcgi-mono-server2.exe.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-	<dllmap dll="fpm_helper" target="libfpm_helper.so.0"/>
-</configuration>
diff --git a/debian/mono-apache-server.links b/debian/mono-apache-server.links
index 39b7c6c..008ffb3 100644
--- a/debian/mono-apache-server.links
+++ b/debian/mono-apache-server.links
@@ -1,4 +1,4 @@
 usr/bin/mod-mono-server4 usr/bin/mod-mono-server
-usr/sbin/mono-server2-admin usr/sbin/mono-server-admin
-usr/sbin/mono-server2-update usr/sbin/mono-server-update
+usr/sbin/mono-server4-admin usr/sbin/mono-server-admin
+usr/sbin/mono-server4-update usr/sbin/mono-server-update
 usr/share/man/man1/mod-mono-server4.1.gz usr/share/man/man1/mod-mono-server.1.gz
diff --git a/debian/mono-apache-server2.README.Debian b/debian/mono-apache-server2.README.Debian
deleted file mode 100644
index 72f0fb2..0000000
--- a/debian/mono-apache-server2.README.Debian
+++ /dev/null
@@ -1,53 +0,0 @@
-mono-apache-server2 for Debian
---------------------------
-
-mod-mono-server2 is a backend server2 that allows you to run ASP.NET web
-applications in conjunction with Apache and the mod_mono Apache module. 
-In Debian, mod-mono-server2 is provided in the package mono-apache-server2.
-
-mod-mono-server2 creates a socket in /tmp, and mod_mono communicates with
-mod-mono-server2 through that socket. Apache will pass the HTTP request via
-mod_mono to mod-mono-server2, and mod-mono-server2 will pass the result back
-to Apache via mod_mono.
-
-So you need this package to run mod_mono, and vice versa.
-
-When mod_mono is installed, it will create a link to
-/etc/mono-server2/mono-server2-hosts.conf. This file contains the configuration
-for mod_mono. Among other things, it makes sure that aspx pages are handled
-by mono_mono, and it defines all your ASP.NET web applications and the mappings
-between URIs and the file system.
-
-However, you should NOT EDIT THIS FILE by hand. Instead, you can manage the
-mono-server2-hosts.conf file with the administration scripts provided by
-mod-mono-server2. The administration scripts work on a directory structure in
-/etc/mono-server2 -- this is what it looks like:
-
-/etc/mono-server2                <- The root of the configuration structure
-/etc/mono-server2/conf.d         <- VirtualHosts Config Directories
-/etc/mono-server2/conf.d/monodoc <- MonoDoc Config Files
-
-To create an ASP.NET virtual host, you create a new directory under conf.d,
-such as the monodoc example above. Then, you place configuration files for
-that virtual host in the directory. Every file is marked by a number, an
-underscore, and the alias name for that ASP.NET application. For example:
-
-/etc/mono-server2/conf.d/monodoc/10_monodochttp
-
-You then need to run mono-server2-update, which will read the directory
-structure and rebuild the mono-server2-hosts.conf file. mod-mono-server2 will
-automatically detect the changes in the file, and adjust its configuration
-accordingly. The mono-server2-update script will also create a
-debian.webapp file, which is needed for the ASP.NET applications.
-
-Packages that wish to install ASP.NET web applications can just follow the
-above procedure. If mod-mono-server2 is running, the application will be
-automatically activated.
-
-You don't need to start mod-mono-server2. If it's not running when a request
-comes in, mod_mono will start it (unless you have disabled mod_mono). Note
-that mono-server2-update can start Apache.
-
-Happy Hacking!
-
- -- Pablo Fischer <pablo at pablo.com.mx>, Wed Mar  2 11:08:17 2005
diff --git a/debian/mono-apache-server2.config b/debian/mono-apache-server2.config
deleted file mode 100644
index 6034ddf..0000000
--- a/debian/mono-apache-server2.config
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/bash -e
-
-. /usr/share/debconf/confmodule
-db_version 2.0
-db_capb backup
-db_title ModMono Server
-
-# XSP1
-if [ -d /etc/mono-server/conf.d ] && [ "`ls /etc/mono-server/conf.d/ | grep -v ^asp.net-examples$ | grep -v ^monodoc-http$ | wc -l`" -gt 0 ]; then
-	set +e
-	db_fget monoserver4/monoserver1_upgrade_warning seen
-	seenflag=$?
-	set -e
-
-	case $seenflag in
-	0)
-		if [ "$RET" = false ]; then
-			db_input high monoserver2/monoserver1_upgrade_warning || true
-		fi
-		;;
-	10)
-		db_input high monoserver2/monoserver1_upgrade_warning || true
-		;;
-	*)
-		echo "db_fget exited with $seenflag" >&2
-                exit $err
-		;;
-	esac
-	db_fset monoserver2/monoserver1_upgrade_warning seen true || true
-	db_go || true
-fi
-
-# get existing values
-modmono_default="/etc/default/mono-apache-server2"
-if [ -e $modmono_default ]; then
-	. $modmono_default || true
-	db_set monoserver2/monoserver2_restartapache "$start_apache"
-fi
-
-STATE=1
-while [ "$STATE"  != 0 -a "$STATE" != 2 ]; do
-    case "$STATE" in
-	1) 
-	    db_input medium monoserver2/monoserver2_restartapache || true
-	    if db_go; then
-		db_get monoserver2/monoserver2_restartapache || true
-		if [ "$RET" = "true" ]; then
-		    STATE=2
-		else
-		    db_set  monoserver2/monoserver2_restartapache false || true
-		    STATE=2
-		fi
-	    else
-		STATE=0
-	    fi
-	    ;;
-	esac
-done
-
-if [ "$STATE" = 0 ]; then
-    exit 1
-fi
diff --git a/debian/mono-apache-server2.dirs b/debian/mono-apache-server2.dirs
deleted file mode 100644
index c441df7..0000000
--- a/debian/mono-apache-server2.dirs
+++ /dev/null
@@ -1 +0,0 @@
-/etc/mono-server2/conf.d/
diff --git a/debian/mono-apache-server2.docs b/debian/mono-apache-server2.docs
deleted file mode 100644
index eb9b151..0000000
--- a/debian/mono-apache-server2.docs
+++ /dev/null
@@ -1,3 +0,0 @@
-NEWS
-README
-AUTHORS
diff --git a/debian/mono-apache-server2.install b/debian/mono-apache-server2.install
deleted file mode 100644
index ec52cd9..0000000
--- a/debian/mono-apache-server2.install
+++ /dev/null
@@ -1,5 +0,0 @@
-debian/tmp/usr/lib/mono/2.0/mod-mono-server2.exe
-debian/tmp/usr/lib/mono/gac/mod-mono-server2
-debian/tmp/usr/bin/mod-mono-server2
-debian/mono-server2-admin	/usr/sbin/
-debian/mono-server2-update	/usr/sbin/
diff --git a/debian/mono-apache-server2.manpages b/debian/mono-apache-server2.manpages
deleted file mode 100644
index fd9c05d..0000000
--- a/debian/mono-apache-server2.manpages
+++ /dev/null
@@ -1,4 +0,0 @@
-debian/mono-server2-admin.8
-debian/mono-server2-update.8
-debian/update-mono-server2.8
-debian/tmp/usr/share/man/man1/mod-mono-server2.1
diff --git a/debian/mono-apache-server2.postinst b/debian/mono-apache-server2.postinst
deleted file mode 100644
index bc2015d..0000000
--- a/debian/mono-apache-server2.postinst
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/sh
-set -e
-
-. /usr/share/debconf/confmodule
-db_version 2.0
-
-modmono_default="/etc/default/mono-apache-server2"
-
-# create file if it doesn't exist
-if [ ! -e $modmono_default ]; then
-	cat > $modmono_default <<-END
-	# Defaults for mono-apache-server2
-
-	# Should mono-apache-server2 start apache?
-	start_apache=false
-	END
-fi
-
-restart_apache_on() {
-    sed s/start_apache=false/start_apache=true/g $modmono_default > $tempfile
-    cp $tempfile $modmono_default
-}
-
-restart_apache_off() {
-    sed s/start_apache=true/start_apache=false/g $modmono_default > $tempfile
-    cp $tempfile $modmono_default
-}
-
-daemon_turn_off() {
-    if [ -x /etc/init.d/mono-server2 ]; then
-	update-rc.d -f mono-server2 remove > /dev/null
-    fi
-}
-
-case "$1" in
-    configure)
-	tempfile=$(/bin/tempfile)
-	
-	db_get monoserver2/monoserver2_restartapache || true
-	daemon_turn_off
-	if [ "$RET" = "true" ]; then
-	    restart_apache_on
-	else
-	    restart_apache_off
-	fi
-
-	mono-server2-update
-	rm $tempfile
-	;;
-esac
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/mono-apache-server2.postrm b/debian/mono-apache-server2.postrm
deleted file mode 100644
index 051edfe..0000000
--- a/debian/mono-apache-server2.postrm
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-set -e
-
-if [ "$1" = "purge" ]; then
-	rm -f /etc/mono-server2/debian.webapp
-	rm -f /etc/mono-server2/mono-server2-hosts.conf
-	# remove default file created in postinst
-	rm -f /etc/default/mono-apache-server2
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/mono-apache-server2.templates b/debian/mono-apache-server2.templates
deleted file mode 100644
index 7f41a0d..0000000
--- a/debian/mono-apache-server2.templates
+++ /dev/null
@@ -1,21 +0,0 @@
-Template: monoserver2/monoserver2_restartapache
-Type: boolean
-Default: true
-_Description: Let mono-apache-server2 restart Apache?
- The Debian version of mono-apache-server2 includes a
- mono-server2-update script that creates a configuration file for
- Apache to start the ASP.NET applications, and mono-server2-update can
- restart Apache if there's a new configuration file
- (/etc/mono-server2/mono-server2-hosts.conf). If this is true, then
- Apache will be restarted when there is a new mono-server2-hosts.conf file.
-
-Template: monoserver2/monoserver1_upgrade_warning
-Type: note
-_Description: ASP.NET 1.0 support removed
- You appear to have some ASP.NET 1.0 sites configured in /etc/mono-server1.
- Support for the 1.0 profile has been removed from Mono 2.8 and above, and
- you are no longer able to serve ASP.NET 1.0 sites. You must reconfigure
- XSP to serve these sites using either 2.0 or 4.0 profiles, assuming your
- application is compatible. Please see mono-server2-admin(8) or
- mono-server4-admin(8) to see how to regenerate a configuration for use
- with 2.0 or 4.0 profiles.
diff --git a/debian/mono-apache-server4.config b/debian/mono-apache-server4.config
index f926890..5257c49 100644
--- a/debian/mono-apache-server4.config
+++ b/debian/mono-apache-server4.config
@@ -8,7 +8,7 @@ db_title ModMono Server
 # XSP1
 if [ -d /etc/mono-server/conf.d ] && [ "`ls /etc/mono-server/conf.d/ | grep -v ^asp.net-examples$ | grep -v ^monodoc-http$ | wc -l`" -gt 0 ]; then
 	set +e
-	db_fget monoserver2/monoserver1_upgrade_warning seen
+	db_fget monoserver4/monoserver1_upgrade_warning seen
 	seenflag=$?
 	set -e
 
@@ -30,6 +30,31 @@ if [ -d /etc/mono-server/conf.d ] && [ "`ls /etc/mono-server/conf.d/ | grep -v ^
 	db_go || true
 fi
 
+# XSP2
+if [ -d /etc/mono-server2/conf.d ] && [ "`ls /etc/mono-server2/conf.d/ | grep -v ^asp.net-examples$ | grep -v ^monodoc-http$ | wc -l`" -gt 0 ]; then
+	set +e
+	db_fget monoserver4/monoserver2_upgrade_warning seen
+	seenflag=$?
+	set -e
+
+	case $seenflag in
+	0)
+		if [ "$RET" = false ]; then
+			db_input high monoserver4/monoserver2_upgrade_warning || true
+		fi
+		;;
+	10)
+		db_input high monoserver4/monoserver2_upgrade_warning || true
+		;;
+	*)
+		echo "db_fget exited with $seenflag" >&2
+                exit $err
+		;;
+	esac
+	db_fset monoserver4/monoserver2_upgrade_warning seen true || true
+	db_go || true
+fi
+
 # get existing values
 modmono_default="/etc/default/mono-apache-server4"
 if [ -e $modmono_default ]; then
diff --git a/debian/mono-apache-server4.templates b/debian/mono-apache-server4.templates
index 2ac5f84..5ef229e 100644
--- a/debian/mono-apache-server4.templates
+++ b/debian/mono-apache-server4.templates
@@ -12,11 +12,20 @@ _Description: Let mono-apache-server4 restart Apache?
 Template: monoserver4/monoserver1_upgrade_warning
 Type: note
 _Description: ASP.NET 1.0 support removed
- You appear to have some ASP.NET 1.0 sites configured in /etc/mono-server1.
+ You appear to have some ASP.NET 1.0 sites configured in /etc/mono-server.
  Support for the 1.0 profile has been removed from Mono 2.8 and above, and
  you are no longer able to serve ASP.NET 1.0 sites. You must reconfigure
- XSP to serve these sites using either 2.0 or 4.0 profiles, assuming your
- application is compatible. Please see mono-server2-admin(8) or
- mono-server4-admin(8) to see how to regenerate a configuration for use
- with 2.0 or 4.0 profiles.
+ XSP to serve these sites using the 4.0 profile, assuming your application
+ is compatible. Please see mono-server4-admin(8) to see how to regenerate
+ a configuration for use with the 4.0 profile.
+
+Template: monoserver4/monoserver2_upgrade_warning
+Type: note
+_Description: ASP.NET 2.0 support removed
+ You appear to have some ASP.NET 2.0 sites configured in /etc/mono-server.
+ Support for the 1.0 profile has been removed from Mono 4.0 and above, and
+ you are no longer able to serve ASP.NET 2.0 sites. You must reconfigure
+ XSP to serve these sites using the 4.0 profile, assuming your application
+ is compatible. Please see mono-server4-admin(8) to see how to regenerate
+ a configuration for use with the 4.0 profile.
 
diff --git a/debian/mono-fastcgi-server2.README.Debian b/debian/mono-fastcgi-server2.README.Debian
deleted file mode 100644
index 89a2fe6..0000000
--- a/debian/mono-fastcgi-server2.README.Debian
+++ /dev/null
@@ -1,25 +0,0 @@
-mono-fastcgi-server2 for Debian
---------------------------
-
-mod-fastcgi-server2 is a backend server that allows you to run ASP.NET web
-applications in conjunction with the FastCGI server of your choice, such as
-Lighttpd. In Debian, fastcgi-mono-server2 is provided in the package
-mono-fastcgi-server2.
-
-fastcgi-mono-server2 creates a socket in /tmp, and FastCGI communicates with
-fastcgi-mono-server2 through that socket, in CGI format, using FastCGI records.
-
-So you need this package to use ASP.NET via FastCGI.
-
-In most cases, configuration of ASP.NET sites is handled via your HTTP server's
-configuration, rather than via fastcgi-mono-server2 itself. Therefore, no
-configuration files or examples have been included. Please see this link for
-general information on interaction between FastCGI and Mono:
-
-http://www.mono-project.com/FastCGI
-
-Please see this one for examples on configuration for Lighttpd:
-
-http://www.mono-project.com/FastCGI_Lighttpd
-
- -- Jo Shields <directhex at apebox.org>, Thu Jul  3 10:05:17 2008
diff --git a/debian/mono-fastcgi-server2.docs b/debian/mono-fastcgi-server2.docs
deleted file mode 100644
index eb9b151..0000000
--- a/debian/mono-fastcgi-server2.docs
+++ /dev/null
@@ -1,3 +0,0 @@
-NEWS
-README
-AUTHORS
diff --git a/debian/mono-fastcgi-server2.install b/debian/mono-fastcgi-server2.install
deleted file mode 100644
index 9175f68..0000000
--- a/debian/mono-fastcgi-server2.install
+++ /dev/null
@@ -1,5 +0,0 @@
-debian/tmp/usr/lib/mono/2.0/fastcgi-mono-server2.exe
-debian/tmp/usr/lib/mono/gac/fastcgi-mono-server2
-debian/tmp/usr/bin/fastcgi-mono-server2
-debian/fastcgi-mono-server2.exe.config			/usr/lib/mono/gac/fastcgi-mono-server2/3.8.0.0__0738eb9f132ed756/
-
diff --git a/debian/mono-fastcgi-server2.links b/debian/mono-fastcgi-server2.links
deleted file mode 100644
index 535ca29..0000000
--- a/debian/mono-fastcgi-server2.links
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/mono/gac/fastcgi-mono-server2/3.8.0.0__0738eb9f132ed756/fastcgi-mono-server2.exe.config	usr/lib/mono/2.0/fastcgi-mono-server2.exe.config
diff --git a/debian/mono-fastcgi-server2.manpages b/debian/mono-fastcgi-server2.manpages
deleted file mode 100644
index 7d773c5..0000000
--- a/debian/mono-fastcgi-server2.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/share/man/man1/fastcgi-mono-server2.1
diff --git a/debian/mono-server2-admin b/debian/mono-server2-admin
deleted file mode 100755
index 9064b07..0000000
--- a/debian/mono-server2-admin
+++ /dev/null
@@ -1,203 +0,0 @@
-#!/usr/bin/perl
-# mono-server22 hosts file creator
-#
-# With this script the user can create a host file in one step, 
-# these hosts file are installed in /etc/mono-server22/conf.d/package and 
-# then used in a 'big' host file (/etc/mono-server22/mono-server2*-hosts.conf) 
-# that will be used by mono-server22
-#
-# Under GPL, please read: 
-# http://www.gnu.org/copyleft/gpl.html
-#
-# Written by: Pablo Fischer
-
-=head1 NAME
-
-mono-server2-admin - mono-server2 hosts file creator, hosts file is part of the debianized mod_mono package
-    
-=head1 SYNOPSIS
-    
-mono-server2-admin.conf [action] [args]
-
-=head2 OPTIONS
-
-  Actions:
-    
-    add        Use 'add' if you want to create an application and want mono-server2 scripts to manage it
-    del        If you want to remove an application
-
-  Args:
-
-    --path     The path where you have your aspx files, MUST EXISTS!, required only with add action
-    --app      The name of your application
-    --libs     If you have dlls outside your path, you must use this!
-    --port     Needed if you are running multiple virtual hosts in different ports in Apache 
-    --vhost    If you want to add asp.net support to a virtualhost you must use this. Example: foobar.com
-
-=head1 DESCRIPTION
-
- mono-server2-admin.conf is a perl tool to adminstrate your ASP.NET webapps that will be executed with 
- mod_mono.
-
- When you try to add an application, admin.conf will verify that your path exists, if it is, it will 
- add a directory inside /etc/xsp/conf.d with the name of your app, and also as a file with the 
- filename format: 10_appname. This file will have the information (path, app).
-
- So, when mono-xsp-update.conf is executed it will read those dirs and create a debian.webapp in
- /etc/xsp that the xsp daemon will read, also with a mono-server2-hosts.conf that will have your 
- directory settings with apache directives. Apache will read mono-server2-hosts.conf!
-
-=head1 AUTHOR
-
- Pablo Fischer <pablo at pablo.com.mx>
-
-=cut 
-
-use strict;
-
-my (%OPT);
-
-#Initializes vars
-$OPT{'port'} = "80";
-$OPT{'vhost'} = "*";
-
-my $confd_directory = "/etc/mono-server2/conf.d";
-
-#Read the opts
-foreach my $opt (@ARGV) {
-    if($opt =~ /^add/) {
-	$OPT{'action'} = "add";
-    }
-    
-    elsif($opt =~ /^del/) {
-	$OPT{'action'} = "del";
-    }	
-
-    elsif($opt =~ /--path/) {
-	$OPT{'path'} = $opt;
-    }    
-
-    elsif($opt =~ /--app/) {
-	$OPT{'app'} = $opt;
-    }   
-
-    elsif($opt =~ /--libs/) {
-	$OPT{'libs'} = $opt;
-    }
-
-    elsif($opt =~ /--port/) {
-	$OPT{'port'} = $opt;
-    }
-
-    elsif($opt =~ /--vhost/) {
-	$OPT{'vhost'} = $opt;
-    }
-}
-
-#clean strange chars, like ':', commas, etc.. I don't like those chars
-sub clean_opts() {
-    foreach my $key (keys %OPT) {	
-	next unless $key ne "action";
-	my $value = $OPT{$key};
-	$OPT{$key} = (split("=", $OPT{$key}))[1];
-	if($key ne "path" && $key ne "libs") {
-	    $OPT{$key} =~ s|/*||;
-	}
-	$OPT{$key} =~ s{/$}{}; 
-	$OPT{$key} =~ s|:*||;
-    }
-}
-
-#We have the path, app, name and the action?
-sub verify_neededopts() {
-    if($OPT{'action'} ne "add" && $OPT{'action'} ne "del") {
-	&help;
-	exit;
-    }
-
-    if(!$OPT{'path'} && $OPT{'action'} eq "add") {
-	print "I need the path of your asp.net application\n";
-	exit;
-    }
-
-    if(!$OPT{'app'}) {
-	print "You should declare the application name!\n";
-	exit;
-    }
-}
-
-#Add the Host file and directory    
-sub add_host() {
-    if( ! -d $OPT{'path'} ) {
-	print "$OPT{'path'} does not exists!\n";
-	exit;
-    }
-    #But what if the conf.d package directory already exists?
-    if ( -d "$confd_directory/$OPT{'app'}") {
-	print "Sorry but $confd_directory/$OPT{'app'} already exist, you might change your application name\n";
-	exit;
-    }
-    
-    #Ok, create the conf.d package directory
-    system("mkdir $confd_directory/$OPT{'app'}");
-    #And create the file
-    system("touch $confd_directory/$OPT{'app'}/10_$OPT{'app'}");
-    
-    open(PACKAGEFILE, "> $confd_directory/$OPT{'app'}/10_$OPT{'app'}");
-    print PACKAGEFILE "This is the configuration file \n";
-    print PACKAGEFILE "for the $OPT{'app'} virtualhost\n";
-    print PACKAGEFILE "path = $OPT{'path'}\n";
-    print PACKAGEFILE "alias = /$OPT{'app'}\n";
-    if($OPT{'libs'}) {
-	print PACKAGEFILE "libs = $OPT{'libs'}\n";
-    }
-    if($OPT{'vhost'}) {
-	print PACKAGEFILE "vhost = $OPT{'vhost'}\n";
-    } else {
-	print PACKAGEFILE "vhost = localhost\n";
-    }
-    if($OPT{'port'}) {
-	print PACKAGEFILE "port = $OPT{'port'}\n";
-    } else {
-	print PACKAGEFILE "port = 80\n";
-    }
-    close(PACKAGEFILE);
-    
-    system("/usr/sbin/mono-server2-update.conf");
-    print "done!\n";
-}
-
-#Remove the host directory
-sub del_host() {
-    
-    system("rm -Rf $confd_directory/$OPT{'app'}");
-    system("/usr/sbin/mono-server2-update.conf");
-    
-    print "done!\n";
-}
-    
-sub help() {
-    print "This script let the user to create a application host file in one step \n";
-    print "for mono-server2 (/etc/mono-server2/conf.d/application\n\n";
-    print "Use:\n";
-    print " mono-server2-admin.conf [action] --path=/real/path --app=/applicationame\n\n";
-    print "Where:\n";
-    print " action:\n";
-    print " add                   Creates an application\n";
-    print " del                   Delete an application (the directory /etc/mono-server2/conf.d/application\n";
-    print " --path=/real/path     A real and true path where you have your ASP.NET applicatio running\n";
-    print " --app=/application    The name of the application\n";
-    print " --libs=/libs          If you have your libs out of path\n";
-    print " --vhost=vhost         The VirtualHost you have in your apache config, Default: localhost\n";
-    print " --port=port           The port of your virtualhost. Default: 80\n";
-}
-
-&clean_opts;
-&verify_neededopts;
-
-if($OPT{'action'} eq "add") {
-    &add_host;
-}
-elsif($OPT{'action'} eq "del") {
-    &del_host;
-}
diff --git a/debian/mono-server2-update b/debian/mono-server2-update
deleted file mode 100755
index f4202b4..0000000
--- a/debian/mono-server2-update
+++ /dev/null
@@ -1,364 +0,0 @@
-#!/usr/bin/perl -w
-# Automatic mono-server2 file generator
-#
-# With this script the user can update the host files 
-# that are installed in /etc/mono-server2/conf.d/package and create a 
-# 'big' host file (/etc/mono-server2/mono-server2*-hosts.conf) that will be used
-# by mono-server2 to setup the virtual hosts needed by 
-# the user.
-#
-# Under GPL, please read: 
-# http://www.gnu.org/copyleft/gpl.html
-#
-# Written by: Pablo Fischer
-
-=head1 NAME
-
-mono-server2-update - creates .webapp and .host file for mod_mono and mono-server2
-
-=head1 SYNOPSIS
-
-mono-server2-update
-
-=head1 DESCRIPTION
-
- mono-server2-update is a perl tool to update/create a .webapp and a .host file in 
- /etc/mono-server2.
-
- These two files are needed by mod_mono (apache), they setup the alias, directory permissions, 
- and ASP.NET applications.
-
- Both files are created with other host configuration files that are in /etc/mono-server2/conf.d
-
- For more information read the README.Debian of this package (/usr/share/doc/mono-server2/README.Debian).
-
-=head1 AUTHOR
-
- Pablo Fischer <pablo at pablo.com.mx>
-
-=cut
-
-use strict; 
-use Digest::MD5;
-
-#Main vars..
-my ($monoserver2_dir, $monoserver2_confd, $monoserver2_hostfile, $monoserver2_webapp,
-    $daemon, $daemon_pid, $default_file,
-    $applications, $libs, $daemon2, $daemon2_pid);
-
-#Setup main vars
-$monoserver2_dir = "/etc/mono-server2";
-$monoserver2_confd = "$monoserver2_dir/conf.d";
-$monoserver2_webapp = "$monoserver2_dir/debian.webapp";
-$monoserver2_hostfile = "$monoserver2_dir/mono-server2-hosts.conf";
-$daemon = "/etc/init.d/apache";
-$daemon_pid = "/var/run/apache.pid";
-$daemon2 = "/etc/init.d/apache2";
-$daemon2_pid = "/var/run/apache2.pid";
-$applications = "";
-$default_file = "/etc/default/mono-apache-server2";
-$libs = "";
-
-my $restart = "yes";
-my $first_file = "yes";
-my ($orig_md5, $new_md5);
-
-#Check write access to $monoserver2_hostfile
-if( ( -e "$monoserver2_hostfile" && ! -w "$monoserver2_hostfile" ) || ! -w "$monoserver2_dir" ) {
-    print "mono-xsp-update requires write access to $monoserver2_hostfile or 
-be executed by root\n" ; 
-    exit 1 ;
-}
-
-#Read the default file
-&read_default_file;
-#Orig md5
-$orig_md5 = &get_md5;
-#Read directory..
-&read_dir;
-if(-f "$monoserver2_hostfile.tmp") {
-    #Prepare the application string
-    $applications =~ s/,$//;
-    #and the libs..
-    $libs = "/usr/lib/mono/2.0:/usr/lib:$libs"; 
-    $libs =~ s/:$//;
-    #sed the $monoserver2_hostfile to replace the Applications
-#    &replace_applications;
-    #Replace the MONOPATH
-    &replace_monopath;
-    &write_tempdefault_end;
-    #cp the temp file to the original one..    
-    system("cp -f $monoserver2_hostfile.tmp $monoserver2_hostfile");    
-    #rm the temp
-    system("rm -Rf $monoserver2_hostfile.tmp");
-    #Final md5
-    $new_md5 = &get_md5;
-    #Equal?
-    if(("$new_md5" ne "$orig_md5") && ($restart eq "yes")) {
-	if(( -f $daemon ) && ( -f $daemon_pid )) {
-	    system("$daemon reload");
-	    system("$daemon restart");
-	}
-	if(( -f $daemon2 ) && ( -f $daemon2_pid )) {
-	    system("$daemon2 reload");
-	    system("$daemon2 restart");
-	}
-    }
-}
-
-sub get_md5 {
-    if( -e $monoserver2_hostfile ) {
-	open(HOSTFILE, $monoserver2_hostfile);
-	binmode(HOSTFILE);
-	return Digest::MD5->new->addfile(*HOSTFILE)->hexdigest;
-	
-    }
-    else {
-	return "";
-    }
-}
-
-sub read_default_file {
-    
-    if(-e $default_file) {
-	open(DEFAULT_FILE, "$default_file");
-	while(my $line = <DEFAULT_FILE>) {
-	    if($line =~ /start_apache/i) {
-		if($line =~ /true/i) {
-		    $restart = "yes";
-		}
-		else {
-		    $restart = "no";
-		}
-	    }
-	}
-	close(DEFAULT_FILE);
-    }
-}
-
-
-sub read_dir {
-    opendir(DIR, $monoserver2_confd);
-    my @host_dirs = sort (grep { -d "$monoserver2_confd/$_" } readdir(DIR));
-    closedir(DIR);
-
-    #to verify that the cfg file is new.. we should create a new one
-    system("rm -Rf $monoserver2_hostfile");
-    system("touch $monoserver2_hostfile");
-    #also to the debian.webapp
-    system("rm -Rf $monoserver2_webapp");
-    system("touch $monoserver2_webapp");
-
-    #How many dirs?
-    if($#host_dirs ne "0") {
-	#Write default content
-	&write_tempdefault_start;
-	foreach my $dir (@host_dirs) {
-	    if(($dir ne "..") && ($dir ne ".")) {
-		#Ok, in the dir.. we have more files, so read them
-		opendir(DIR, "$monoserver2_confd/$dir");
-		my @host_files = sort (readdir(DIR));
-		closedir(DIR);
-		#Is it empty?		
-		if($#host_files ne "0") {
-		    #So, read it..
-		    foreach my $hostfile (@host_files) {
-			#Just remember.. we don't like directories inside directories!
-			if(($hostfile ne "..") && ($hostfile ne ".")) {
-			    $hostfile = "$monoserver2_confd/$dir/$hostfile";
-			    write_tempxsphostfile($hostfile);
-			}
-		    }
-		}
-	    }
-	}
-    }
-}
-
-sub replace_applications {
-    local $/;
-
-    open(TEMPHOST, "$monoserver2_hostfile.tmp");
-    my $content = <TEMPHOST>;
-    close(TEMPHOST);
-
-    if($applications) {
-	$content =~ s/MonoApplications .*/MonoApplications $applications/gi;
-    }
-    else {
-	$content =~ s/MonoApplications//gi;
-    }
-    
-    open(TEMPHOST, "> $monoserver2_hostfile.tmp");
-    print TEMPHOST $content;
-    close(TEMPHOST);
-}
-
-   
-sub replace_monopath {
-    local $/;
-
-    open(TEMPHOST, "$monoserver2_hostfile.tmp");
-    my $content = <TEMPHOST>;
-    close(TEMPHOST);
-
-    if($libs) {
-	$content =~ s/MonoPath .*/MonoPath default $libs/gi;
-    }
-    else {
-	$content =~ s/MonoPath default//gi;
-    }
-    
-    open(TEMPHOST, "> $monoserver2_hostfile.tmp");
-    print TEMPHOST $content;
-    close(TEMPHOST);
-}
-
-sub write_tempdefault_start {
-    open(TEMPHOST, ">> $monoserver2_hostfile.tmp");
-
-    print TEMPHOST "# Default configuration, don't edit it!\n";
-    print TEMPHOST "<IfModule mod_mono.c>\n";
-    print TEMPHOST "  MonoUnixSocket default /tmp/.mod_mono_server2\n";    
-    print TEMPHOST "  MonoServerPath default /usr/bin/mod-mono-server2\n";
-    print TEMPHOST "  AddType application/x-asp-net .aspx .ashx .asmx .ascx .asax .config .ascx\n";
-    print TEMPHOST "  MonoApplicationsConfigDir default /etc/mono-server2\n";
-    print TEMPHOST "  MonoPath default \n";
-
-    close(TEMPHOST);
-
-    open(TEMPWEBAPP, ">> $monoserver2_webapp");
-    print TEMPWEBAPP "<apps>\n";
-    close(TEMPWEBAPP);
-    
-}
-
-sub write_tempdefault_end {
-    open(TEMPHOST, ">> $monoserver2_hostfile.tmp");
-    print TEMPHOST "</IfModule>\n";
-    close(TEMPHOST);
-
-    #Now the debian.webapp
-    open(TEMPWEBAPP, ">> $monoserver2_webapp");
-    print TEMPWEBAPP "</apps>\n";
-    close(TEMPWEBAPP);
-
-}   
-
-
-sub write_tempxsphostfile {
-    my $hostfile = shift;
-
-    #Write the content to a temp file..
-    open(TEMPHOST, ">> $monoserver2_hostfile.tmp");
-    open(TEMPWEBAPP, ">> $monoserver2_webapp");
-
-    #And open the hostfile..
-    open(HOSTFILE, "$hostfile");
-    #Read it..
-    my @content_hostfile = <HOSTFILE>;
-    #Close it..
-    close(HOSTFILE);
-    #Write the header to the monoserver2_hostfile
-    
-    my ($path, $alias, $vhost, $port, $name);
-
-    $vhost = "localhost";
-    $port = "80";
-    foreach my $line (@content_hostfile) {	
-	if($line =~ /path/i) {
-	    #Ok, the directory exists?
-	    my $dir = (split /\=/, $line)[1];
-	    #Remove blank spaces
-	    $dir =~ tr/\ //d;
-	    #remove that \n
-	    $dir =~ s/\n//;
- 	    if ( ! -d "$dir" ) {
-		$dir = "";
-		last;
- 	    }
-	    else {
-		$path = $dir;
-	    }
-	}
-
-	if($line =~ /alias/i) {
-	    $alias = (split /\=/, $line)[1];
-	    #Blank Spaces
-	    $alias =~ tr/\ //d;
-	    #New lines..
-	    $alias =~ s/\n//;
-	    #The name
-	    $name = $alias;
-	    $name =~ s|/*||;
-	}
-
-	if($line =~ /lib/i) {
-	    $libs = (split /\=/, $line)[1];
-	    #Blank spaces
-	    $libs =~ tr/\ //d;
-	    #New lines..
-	    $libs =~ s/\n//;
-	    #And remove the last and first ':'..
-	    $libs =~ s/:$//;
-        }    
-
-	if($line =~ /vhost/i) {
-	    $vhost = (split /\=/, $line)[1];
-	    #Blank spaces
-	    $vhost =~ tr/\ //d;
-	    #New lines..
-	    $vhost =~ s/\n//;
-	    #And remove the last and first ':'..
-	    $vhost =~ s/:$//;
-        }   
-
-	if($line =~ /port/i) {
-	    $port = (split /\=/, $line)[1];
-	    #Blank spaces
-	    $port =~ tr/\ //d;
-	    #New lines..
-	    $port =~ s/\n//;
-	    #And remove the last and first ':'..
-	    $port =~ s/:$//;
-        }  
-
-	if($line =~ /name/i) {
-	    $name = (split /\=/, $line)[1];
-	    #Blank spaces
-	    $name =~ tr/\ //d;
-	    #New lines..
-	    $name =~ s/\n//;
-	    #And remove the last and first ':'..
-	    $name =~ s/:$//;
-        }  
-	
-    }	
-    
-    if($path) {
-	$applications = "$applications$alias:$path,";
-	$libs = "$libs:";
-
-	print TEMPWEBAPP "  <web-application>\n";
-	print TEMPWEBAPP "    <name>$name</name>\n";
-	print TEMPWEBAPP "    <vpath>$alias</vpath>\n";       
-	print TEMPWEBAPP "    <path>$path</path>\n";
-	print TEMPWEBAPP "    <vhost>$vhost</vhost>\n";
-	print TEMPWEBAPP "    <port>$port</port>\n";
-	print TEMPWEBAPP "  </web-application>\n";
-
-	print TEMPHOST "# start $hostfile\n";
-	print TEMPHOST "     Alias $alias \"$path\"\n";
-	print TEMPHOST "     AddMonoApplications default \"$alias:$path\"\n";
-	print TEMPHOST "       <Directory $path>\n";
-	print TEMPHOST "         SetHandler mono\n";
-	print TEMPHOST "           <IfModule mod_dir.c>\n";
-	print TEMPHOST "              DirectoryIndex index.aspx\n";
-	print TEMPHOST "           </IfModule>\n";
-	print TEMPHOST "       </Directory>\n";
-	print TEMPHOST "# end $hostfile\n";
-	
-    }
-    close(TEMPHOST);
-    close(TEMPWEBAPP);
-}  
diff --git a/debian/mono-xsp2-admin b/debian/mono-xsp2-admin
deleted file mode 100755
index e990b93..0000000
--- a/debian/mono-xsp2-admin
+++ /dev/null
@@ -1,173 +0,0 @@
-#!/usr/bin/perl
-# mono-xsp2 hosts file creator
-#
-# With this script the user can create a host file in one step, 
-# these hosts file are installed in /etc/xsp2/conf.d/package and 
-# then used in a 'big' host file (/etc/xsp2/mono-server*-hosts.conf) 
-# that will be used by XSP2
-#
-# Under GPL, please read: 
-# http://www.gnu.org/copyleft/gpl.html
-#
-# Written by: Pablo Fischer
-
-=head1 NAME
-
-mono-xsp2-admin.conf - mono-xsp2 hosts file creator
-    
-=head1 SYNOPSIS
-    
-mono-xsp2-admin.conf [action] [args]
-
-=head2 OPTIONS
-
-  Actions:
-    
-    add        Use 'add' if you want to create an application and want mono-xsp2 scripts to manage it
-    del        If you want to remove an application
-
-  Args:
-
-    --path     The path where you have your aspx files, MUST EXISTS!, required only with add action
-    --app      The name of your application
-
-=head1 DESCRIPTION
-
- mono-xsp2-admin.conf is a perl tool to adminstrate your ASP.NET webapps that will be executed with 
- xsp2.
-
- When you try to add an application, admin.conf will verify that your path exists, if it is, it will 
- add a directory inside /etc/xsp2/conf.d with the name of your app, and also as a file with the 
- filename format: 10_appname. This file will have the information (path, app).
-
- So, when mono-xsp2-update.conf is executed it will read those dirs and create a debian.webapp in
- /etc/xsp2 that the xsp2 daemon will read.
-
-=head1 AUTHOR
-
- Pablo Fischer <pablo at pablo.com.mx>
-
-=cut 
-
-use strict;
-
-my (%OPT);
-
-my $confd_directory = "/etc/xsp2/conf.d";
-
-#Read the opts
-foreach my $opt (@ARGV) {
-    if($opt =~ /^add/) {
-	$OPT{'action'} = "add";
-    }
-    
-    elsif($opt =~ /^del/) {
-	$OPT{'action'} = "del";
-    }	
-
-    elsif($opt =~ /--path/) {
-	$OPT{'path'} = $opt;
-    }    
-
-    elsif($opt =~ /--app/) {
-	$OPT{'app'} = $opt;
-    }   
-}
-
-
-#clean strange chars, like ':', commas, etc.. I don't like those chars
-sub clean_opts() {
-    foreach my $key (keys %OPT) {	
-	next unless $key ne "action";
-	my $value = $OPT{$key};
-	$OPT{$key} = (split("=", $OPT{$key}))[1];
-	if($key ne "path") {
-	    $OPT{$key} =~ s|/*||;
-	}
-	$OPT{$key} =~ s{/$}{}; 
-			$OPT{$key} =~ s|:*||;
-		    }
-    }
-
-#We have the path, app, name and the action?
-    sub verify_neededopts() {
-	if($OPT{'action'} ne "add" && $OPT{'action'} ne "del") {
-	    &help;
-	    exit;
-	}
-
-	if(!$OPT{'path'}) {
-	    print "I need the path of your asp.net application\n";
-	    exit;
-	}
-
-	if(!$OPT{'app'}) {
-	    print "You should declare the application name!\n";
-	    exit;
-	}
-    }
-
-#Add the Host file and directory    
-    sub add_host() {
-	if( ! -d $OPT{'path'} ) {
-	    print "$OPT{'path'} does not exists!\n";
-	    exit;
-	}
-	#But what if the conf.d package directory already exists?
-	if ( -d "$confd_directory/$OPT{'app'}") {
-	    print "Sorry but $confd_directory/$OPT{'app'} already exist, you might change your application name\n";
-	    exit;
-	}
-	
-	#Ok, create the conf.d package directory
-	system("mkdir $confd_directory/$OPT{'app'}");
-	#And create the file
-	system("touch $confd_directory/$OPT{'app'}/10_$OPT{'app'}");
-	
-	open(PACKAGEFILE, "> $confd_directory/$OPT{'app'}/10_$OPT{'app'}");
-	print PACKAGEFILE "This is the configuration file \n";
-	print PACKAGEFILE "for the $OPT{'app'} virtualhost\n";
-	print PACKAGEFILE "path = $OPT{'path'}\n";
-	print PACKAGEFILE "alias = /$OPT{'app'}\n";
-	close(PACKAGEFILE);
-	
-	system("/usr/sbin/mono-xsp2-update.conf");
-	print "done!\n";
-    }
-
-#Remove the host directory
-    sub del_host() {
-	
-	system("rm -Rf $confd_directory/$OPT{'app'}");
-	system("/usr/sbin/mono-xsp2-update.conf");
-	
-	print "done!\n";
-    }
-    
-    sub help() {
-	print "This script let the user to create a application host file in one step \n";
-	print "for XSP2 (/etc/xsp2/conf.d/application\n\n";
-	print "Use:\n";
-	print " mono-xsp2-admin.conf [action] --path=/real/path --app=/applicationame\n\n";
-	print "Where:\n";
-	print " action:\n";
-	print " add                   Creates an application\n";
-	print " del                   Delete an application (the directory /etc/mono-server/conf.d/application\n";
-	print " --path=/real/path     A real and true path where you have your ASP.NET applicatio running\n";
-	print " --app=/application    The name of the application\n";
-    }
-
-    &clean_opts;
-    &verify_neededopts;
-
-    if($OPT{'action'} eq"add") {
-	&add_host;
-    }
-    elsif($OPT{'action'} eq "del") {
-	&del_host;
-    }
-
-    
-
-
-
diff --git a/debian/mono-xsp2-base.install b/debian/mono-xsp2-base.install
deleted file mode 100644
index 26f093b..0000000
--- a/debian/mono-xsp2-base.install
+++ /dev/null
@@ -1,3 +0,0 @@
-debian/tmp/usr/lib/mono/2.0/Mono.WebServer2.dll
-debian/tmp/usr/lib/mono/gac/Mono.WebServer2/0.2*
-debian/tmp/usr/lib/pkgconfig/xsp-2.pc
diff --git a/debian/mono-xsp2-update b/debian/mono-xsp2-update
deleted file mode 100755
index 52e3f2c..0000000
--- a/debian/mono-xsp2-update
+++ /dev/null
@@ -1,225 +0,0 @@
-#!/usr/bin/perl -w
-# Automatic mono-server file generator
-#
-# With this script the user can update the host files 
-# that are installed in /etc/mono-server/conf.d/package and create a 
-# 'big' host file (/etc/mono-server/mono-server*-hosts.conf) that will be used
-# by mono-server to setup the virtual hosts needed by 
-# the user.
-#
-# Under GPL, please read: 
-# http://www.gnu.org/copyleft/gpl.html
-#
-# Written by: Pablo Fischer
-
-=head1 NAME
-
-mono-xsp2-update.conf - creates .webapp needed by xsp2
-
-=head1 SYNOPSIS
-
-mono-xsp2-update.conf
-
-=head1 DESCRIPTION
-
- mono-xsp2-update.conf is a perl tool to update/create a .webapp in /etc/xsp2
-
- This file is needed by xsp2 cause it has all each ASP.NET application with a path and alias, needed 
- by xsp2 to setup these applications.
-
- The .webapp is created with other host configuration files that are in /etc/xsp2/conf.d
-
- For more information read the README.Debian of this package (/usr/share/doc/mono-xsp2/README.Debian).
-
-=head1 AUTHOR
-
- Pablo Fischer <pablo at pablo.com.mx>
-
-=cut
-
-use strict; 
-use Digest::MD5;
-
-#Main vars..
-my ($monoxsp2_dir, $monoxsp2_confd, $monoxsp2_hostfile, $monoxsp2_webapp,
-    $daemon, $daemon_pid, $default_file,
-    $applications, $libs);
-
-#Setup main vars
-$monoxsp2_dir = "/etc/xsp2";
-$monoxsp2_confd = "$monoxsp2_dir/conf.d";
-$monoxsp2_webapp = "$monoxsp2_dir/debian.webapp";
-$daemon = "/etc/init.d/mono-xsp2";
-$daemon_pid = "/var/run/mono-xsp2.pid";
-$applications = "";
-$default_file = "/etc/default/mono-xsp2";
-
-my $restart = "yes";
-my $first_file = "yes";
-my ($orig_md5, $new_md5);
-
-#Check write access to $monoxsp2_hostfile
-if( ( -e "$monoxsp2_webapp" && ! -w "$monoxsp2_webapp" ) || ! -w "$monoxsp2_dir" ) {
-    print "mono-xsp2-update.conf requires write access to $monoxsp2_webapp or 
-be executed by root\n" ; 
-    exit 1 ;
-}
-
-#Read the default file
-&read_default_file;
-#Orig md5
-$orig_md5 = &get_md5;
-#Read directory..
-&read_dir;
-#The tail
-&write_tempdefault_end;
-#Prepare the application string
-$applications =~ s/,$//;
-#Final md5
-$new_md5 = &get_md5;
-#Equal?
-if(("$new_md5" ne "$orig_md5") && ($restart eq "yes")) {
-    if(( -f $daemon ) && ( -f $daemon_pid )) {
-	system("$daemon restart");
-    }
-}
-
-
-sub get_md5 {
-    if( -e $monoxsp2_webapp ) {
-	open(WEBAPP, $monoxsp2_webapp);
-	binmode(WEBAPP);
-	return Digest::MD5->new->addfile(*WEBAPP)->hexdigest;
-	
-    }
-    else {
-	return "";
-    }
-}
-
-sub read_default_file {
-    
-    if(-e $default_file) {
-	open(DEFAULT_FILE, "$default_file");
-	while(my $line = <DEFAULT_FILE>) {
-	    if($line =~ /start_boot/i) {
-		if($line =~ /true/i) {
-		    $restart = "yes";
-		}
-		else {
-		    $restart = "no";
-		}
-	    }
-	}
-	close(DEFAULT_FILE);
-    }
-}
-
-
-sub read_dir {
-    opendir(DIR, $monoxsp2_confd);
-    my @host_dirs = sort (grep { -d "$monoxsp2_confd/$_" } readdir(DIR));
-    closedir(DIR);
-
-    system("rm -Rf $monoxsp2_webapp");
-    system("touch $monoxsp2_webapp");
-
-    #How many dirs?
-    if($#host_dirs ne "0") {
-	#The head
-	&write_tempdefault_start;
-	foreach my $dir (@host_dirs) {
-	    if(($dir ne "..") && ($dir ne ".")) {
-		#Ok, in the dir.. we have more files, so read them
-		opendir(DIR, "$monoxsp2_confd/$dir");
-		my @host_files = sort (readdir(DIR));
-		closedir(DIR);
-		#Is it empty?		
-		if($#host_files ne "0") {
-		    #So, read it..
-		    foreach my $hostfile (@host_files) {
-			#Just remember.. we don't like directories inside directories!
-			if(($hostfile ne "..") && ($hostfile ne ".")) {
-			    $hostfile = "$monoxsp2_confd/$dir/$hostfile";
-			    write_tempxsp2hostfile($hostfile);
-			}
-		    }
-		}
-	    }
-	}
-    }
-}
-
-sub write_tempdefault_start {
-
-    open(TEMPWEBAPP, ">> $monoxsp2_webapp");
-    print TEMPWEBAPP "<apps>\n";
-    close(TEMPWEBAPP);
-    
-}
-
-
-sub write_tempdefault_end {
-
-    open(TEMPWEBAPP, ">> $monoxsp2_webapp");
-    print TEMPWEBAPP "</apps>\n";
-    close(TEMPWEBAPP);
-
-}  
-
-sub write_tempxsp2hostfile {
-    my $hostfile = shift;
-
-    #Write the content to a temp file..
-    open(TEMPWEBAPP, ">> $monoxsp2_webapp");
-    #And open the hostfile..
-    open(HOSTFILE, "$hostfile");
-    #Read it..
-    my @content_hostfile = <HOSTFILE>;
-    #Close it..
-    close(HOSTFILE);
-    #Write the header to the monoxsp2_hostfile
-    
-    my ($path, $alias, $name);
-
-    foreach my $line (@content_hostfile) {	
-	if($line =~ /path/i) {
-	    #Ok, the directory exists?
-	    my $dir = (split /\=/, $line)[1];
-	    #Remove blank spaces
-	    $dir =~ tr/\ //d;
-	    #remove that \n
-	    $dir =~ s/\n//;
- 	    if ( ! -d "$dir" ) {
-		$dir = "";
-		last;
- 	    }
-	    else {
-		$path = $dir;
-	    }
-	}
-
-	if($line =~ /alias/i) {
-	    $alias = (split /\=/, $line)[1];
-	    #Blank Spaces
-	    $alias =~ tr/\ //d;
-	    #New lines..
-	    $alias =~ s/\n//;
-	    #The name
-	    $name = $alias;
-	    $name =~ s|/*||;
-	}	
-    }	
-    
-    if($path) {
-	$applications = "$applications$alias:$path,";
-	$libs = "$libs:";
-
-	print TEMPWEBAPP "  <web-application>\n";
-	print TEMPWEBAPP "    <name>$name</name>\n";
-	print TEMPWEBAPP "    <vpath>$alias</vpath>\n";       
-	print TEMPWEBAPP "    <path>$path</path>\n";
-	print TEMPWEBAPP "  </web-application>\n";
-    }
-    close(TEMPWEBAPP);
-}  
diff --git a/debian/mono-xsp2.README.Debian b/debian/mono-xsp2.README.Debian
deleted file mode 100644
index 7e05a37..0000000
--- a/debian/mono-xsp2.README.Debian
+++ /dev/null
@@ -1,45 +0,0 @@
-xsp2 for Debian
---------------
-
-The mono-xsp2 package contains a standalone WebServer to run ASP.NET, developed
-by the Mono hackers, it should run in port 8080 or 8081, the scripts detects which port
-to use.
-
-For example, if you have a mail proxy (or http proxy) using 8080 it should run in 8081.
-
-To change the port, you need to kill your http/mail proxy or move them to other port, and then
-reconfigure xsp2 as root:
-
-# dpkg-reconfigure mono-xsp2
-
-The way that xsp2 manage the /alias (virtual hosts) is like exim does. We have a directory in 
-/etc called xsp2, inside it we have a conf.d directory, were we have directories for each 
-'virtualhost'.
-
-For example, we have monodoc-http, so we have:
-
-/etc/xsp2 		<- Mono XSP 2 Config Dir
-/etc/xsp2/conf.d 	<- Mono XSP 2 VirtualHosts Config Directories
-/etc/xsp2/conf.d/monodoc <- MonoDoc Config Files for XSP 2
-
-Every file is marked by a number, an underscore and the alias name, for example:
-
-/etc/xsp2/conf.d/monodoc/10_monodochttp
-
-If you want to install a new virtualhost to XSP 2, you just need to apt-get it, and if 
-XSP 2 is running it should be started normally, if it's the first virtualhost and you configured
-mono-xsp2 to be started automatically it will start xsp2 by default.
-
-If you configured mono-xsp2 to NOT be started automatically, you should start mono-xsp2 manually:
-
-/etc/init.d/mono-xsp2 start
-
-Also, if you are installing YOUR OWN VirtualHost, you should use mono-xsp2-admin (and also the manpage)
-
-NOTE: In some cases you can find that /etc/mono-server|/etc/xsp2 exists with other virtualhosts and you  
-don't have mono-server|mono-xsp2 installed, don't get in panic, some virtualhosts installs host configuration 
-files in both server (xsp2 and mono-server).
-
-Happy Hacking
-
- -- Pablo Fischer <pablo at pablo.com.mx>, Mon, 15 Mar 2004 18:52:30 -0600
diff --git a/debian/mono-xsp2.config b/debian/mono-xsp2.config
deleted file mode 100644
index ce19434..0000000
--- a/debian/mono-xsp2.config
+++ /dev/null
@@ -1,106 +0,0 @@
-#!/bin/bash -e
-
-# Initialization
-. /usr/share/debconf/confmodule
-db_version 2.0
-db_capb backup
-db_title XSP2 WebServer
-
-# XSP1
-if [ -d /etc/xsp/conf.d ] && [ "`ls /etc/xsp/conf.d/ | grep -v ^asp.net-examples$ | grep -v ^monodoc-http$ | wc -l`" -gt 0 ]; then
-	set +e
-	db_fget xsp4/xsp1_upgrade_warning seen
-	seenflag=$?
-	set -e
-
-	case $seenflag in
-	0)
-		if [ "$RET" = false ]; then
-			db_input high xsp2/xsp1_upgrade_warning || true
-		fi
-		;;
-	10)
-		db_input high xsp2/xsp1_upgrade_warning || true
-		;;
-	*)
-		echo "db_fget exited with $seenflag" >&2
-                exit $err
-		;;
-	esac
-	db_fset xsp2/xsp1_upgrade_warning seen true || true
-	db_go || true
-fi
-
-# get existing values
-xsp2_default="/etc/default/mono-xsp2"
-if [ -e $xsp2_default ]; then
-	. $xsp2_default || true
-	db_set xsp2/xsp2_autostart "$start_boot"
-	db_set xsp2/xsp2_bind      "$address"
-	db_set xsp2/xsp2_port      "$port"
-fi
-
-# Autostart
-STATE=1
-while [ "$STATE"  != 0 -a "$STATE" != 2 ]; do
-    case "$STATE" in
-	1) 
-	    db_input medium xsp2/xsp2_autostart || true
-	    if db_go; then
-		db_get xsp2/xsp2_autostart || true
-		if [ "$RET" = "true" ]; then
-		    STATE=2
-		else
-		    db_set  xsp2/xsp2_autostart false || true
-		    STATE=2
-		fi
-	    else
-		STATE=0
-	    fi
-	    ;;
-	esac
-done
-
-if [ "$STATE" = 0 ]; then
-    exit 1
-fi
-
-# Bind
-STATE=1
-while [ "$STATE"  != 0 -a "$STATE" != 2 ]; do
-    case "$STATE" in
-	1) 
-	    db_input medium xsp2/xsp2_bind || true
-	    if db_go; then
-		db_get xsp2/xsp2_bind || true
-		STATE=2
-	    else
-		STATE=0
-	    fi
-	    ;;
-	esac
-done
-
-if [ "$STATE" = 0 ]; then
-    exit 1
-fi
-
-# Port
-STATE=1
-while [ "$STATE"  != 0 -a "$STATE" != 2 ]; do
-    case "$STATE" in
-	1) 
-	    db_input medium xsp2/xsp2_port || true
-	    if db_go; then
-		db_get xsp2/xsp2_port || true
-		STATE=2
-	    else
-		STATE=0
-	    fi
-	    ;;
-	esac
-done
-
-if [ "$STATE" = 0 ]; then
-    exit 1
-fi
diff --git a/debian/mono-xsp2.dirs b/debian/mono-xsp2.dirs
deleted file mode 100644
index 367bf08..0000000
--- a/debian/mono-xsp2.dirs
+++ /dev/null
@@ -1 +0,0 @@
-/etc/xsp2/conf.d
diff --git a/debian/mono-xsp2.docs b/debian/mono-xsp2.docs
deleted file mode 100644
index eb9b151..0000000
--- a/debian/mono-xsp2.docs
+++ /dev/null
@@ -1,3 +0,0 @@
-NEWS
-README
-AUTHORS
diff --git a/debian/mono-xsp2.init b/debian/mono-xsp2.init
deleted file mode 100755
index aee7983..0000000
--- a/debian/mono-xsp2.init
+++ /dev/null
@@ -1,102 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides:          mono-xsp2
-# Required-Start:    $remote_fs
-# Required-Stop:     $remote_fs
-# Should-Start:      
-# Should-Stop:
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Mono XSP2
-# Description:       Debian init script for Mono XSP2.
-### END INIT INFO
-#
-# Written by Pablo Fischer <pablo at pablo.com.mx>
-#            Dylan R. E. Moonfire <debian at mfgames.com>
-# Modified for Debian GNU/Linux
-#
-# Version:	@(#)mono-xsp2 pablo at pablo.com.mx
-#
-
-# Variables
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=/usr/bin/xsp2
-NAME=mono-xsp2
-DESC="XSP 2.0 WebServer"
-DEFAULT=/etc/default/$NAME
-CFGDIR=/etc/xsp2
-VIRTUALFILE=$CFGDIR/debian.webapp
-MONO_SHARED_DIR=/var/run/$NAME
-start_boot=false
-
-# Use LSB
-. /lib/lsb/init-functions
-
-# If we don't have the basics, don't bother
-test -x $DAEMON || exit 0
-test -f $DEFAULT && . $DEFAULT	
-
-if [ "x$start_boot" != "xtrue" ] ; then
-    exit 0
-fi
-
-if [ ! -e $MONO_SHARED_DIR ]; then
-	mkdir $MONO_SHARED_DIR   
-	chown $user:$group $MONO_SHARED_DIR
-fi
-                
-should_start() {
-    if [ ! -e $VIRTUALFILE -o `cat $VIRTUALFILE | wc -l` = "2" ]; then
-	log_action_msg "You have an incomplete $VIRTUALFILE"
-	log_action_msg "To fix it, you need to install at least one package for xsp2 (like asp.net-examples)"	
-	return 1
-    fi 
-    
-    if [ -f /var/run/$NAME.pid ]; then
-	# Are we really running xsp2?
-	xsp2_pid=`cat /var/run/$NAME.pid`
-	xsp2_ps=`ps -p $xsp2_pid | wc -l`
-	if [ "$xsp2_ps" != "1" ]; then
-	    log_action_msg "Sorry, there is already a xsp2 running, stop it first"
-	    return 1		
-	fi
-    fi
-    
-    return 0
-	
-}
-
-case "$1" in
-    start)
-	if should_start ; then
-	    log_daemon_msg "Starting $DESC" "$NAME"
-	    export MONO_SHARED_DIR
-	    start-stop-daemon --start --background --make-pidfile \
-		--quiet --pidfile /var/run/$NAME.pid \
-		--user $user --group $group --chuid $user \
-		--exec $DAEMON -- \
-		--port $port --address $address --appconfigdir \
-		$CFGDIR --nonstop
-	    log_end_msg $?
-	fi
-	;;
-    stop)
-	log_daemon_msg "Stopping $DESC" "$NAME"
-        for i in $(ps aux | grep -v grep | grep 'xsp2.exe' | cut -c 10-15)
-        do
-                kill $i > /dev/null 2>&1
-        done
-	log_end_msg $?
-	;;
-    restart|force-reload)
-	$0 stop
-	$0 start
-	;;
-    *)
-	N=/etc/init.d/$NAME
-	echo "Usage: $N {start|stop|restart|force-reload}" >&2
-	exit 1
-	;;
-esac
-
-exit 0
diff --git a/debian/mono-xsp2.install b/debian/mono-xsp2.install
deleted file mode 100644
index 2bd737b..0000000
--- a/debian/mono-xsp2.install
+++ /dev/null
@@ -1,11 +0,0 @@
-debian/tmp/usr/bin/asp-state2
-debian/tmp/usr/bin/dbsessmgr2
-debian/tmp/usr/bin/xsp2
-debian/tmp/usr/lib/xsp/2.0/asp-state2.exe
-debian/tmp/usr/lib/xsp/2.0/asp-state2.exe.config
-debian/tmp/usr/lib/xsp/2.0/dbsessmgr2.exe
-debian/tmp/usr/lib/xsp/2.0/dbsessmgr2.exe.config
-debian/tmp/usr/lib/mono/2.0/xsp2.exe
-debian/tmp/usr/lib/mono/gac/xsp2
-debian/mono-xsp2-update	/usr/sbin/
-debian/mono-xsp2-admin	/usr/sbin/
diff --git a/debian/mono-xsp2.manpages b/debian/mono-xsp2.manpages
deleted file mode 100644
index 12a9463..0000000
--- a/debian/mono-xsp2.manpages
+++ /dev/null
@@ -1,5 +0,0 @@
-debian/tmp/usr/share/man/man1/xsp2.1
-debian/tmp/usr/share/man/man1/dbsessmgr2.1
-debian/tmp/usr/share/man/man1/asp-state2.1
-debian/mono-xsp2-update.8
-debian/mono-xsp2-admin.8
diff --git a/debian/mono-xsp2.postinst b/debian/mono-xsp2.postinst
deleted file mode 100644
index 118cc1c..0000000
--- a/debian/mono-xsp2.postinst
+++ /dev/null
@@ -1,122 +0,0 @@
-#!/bin/bash
-set -e
-
-. /usr/share/debconf/confmodule
-db_version 2.0
-
-xsp2_default="/etc/default/mono-xsp2"
-NAME=mono-xsp2
-DESC="XSP 2 WebServer"
-CFGDIR=/etc/xsp2
-VIRTUALFILE=$CFGDIR/debian.webapp
-
-# create file if it doesn't exist
-if [ ! -e $xsp2_default ]; then
-	cat > $xsp2_default <<-END
-	# Defaults for mono-xsp2, official version
-	# sourced by /etc/init.d/mono-xsp2
-	
-	# Should we start it?
-	start_boot=true
-	
-	# User and group by default
-	user=www-data
-	group=www-data
-	
-	# Default port
-	port=8081
-	address=0.0.0.0
-	
-	# Directory for config files
-	config_files=/etc/xsp2
-	END
-fi
-
-update_port() {
-    db_get xsp2/xsp2_port || true
-    R=$RET
-    echo "Using Mono XSP 2 port: $R"
-    sed "s/port=.*/port=$R/g" $xsp2_default > $tempfile
-    cp -f $tempfile $xsp2_default
-}
-
-update_bind() {
-    db_get xsp2/xsp2_bind || true
-    R=$RET
-    echo "Binding Mono XSP 2 address: $R"
-    sed "s/address=.*/address=$R/g" $xsp2_default > $tempfile
-    cp -f $tempfile $xsp2_default
-}
-
-should_start() {
-    if [ -e $xsp2_default ]; then
-	. $xsp2_default
-        if [ "$start_boot" != "true" ]; then
-	    return 1
-        fi
-    else
-        echo "mono-xsp2: Not started, you need a valid and complete $xsp2_default"
-        return 1
-    fi
-
-    if [ ! -e $VIRTUALFILE -o `cat $VIRTUALFILE | wc -l` = "2" ]; then
-	echo "mono-xsp2: Not started, you need asp.net-examples/monodoc-http or an ASP.NET application"
-	return 1
-    fi 
-    
-    if [ -f /var/run/$NAME.pid ]; then
-	# Are we really running xsp2?
-	xsp2_pid=`cat /var/run/$NAME.pid`
-	xsp2_ps=`ps -p $xsp2_pid | wc -l`
-	if [ "$xsp2_ps" != "2" ]; then
-	    return 0
-	else
-	    return 1
-	fi
-    else
-	return 1
-    fi
-    
-    return 1
-}
-
-case "$1" in
-    configure)
-	tempfile=$(/bin/tempfile)
-	
-	# Configure autostart, but don't prevent the init script
-	# from starting it manually.
-	autostart="true"
-	db_get xsp2/xsp2_autostart || true
-	if [ "$RET" = "true" ]; then	    
-	    if [ -x "/etc/init.d/mono-xsp2" ]; then
-		update-rc.d mono-xsp2 defaults > /dev/null 2>&1 || true
-	    fi
-	else
-	    update-rc.d -f mono-xsp2 remove > /dev/null 2>&1  || true
-	fi
-
-	# If default file exists, configure the port and address
-	if [ -f $xsp2_default ]; then
-	    update_port
-	    update_bind
-	fi
-
-	mono-xsp2-update
-	if [ "$RET" = "true" ]; then
-	    if should_start -a $autostart = "true" ; then
-		if which invoke-rc.d >/dev/null 2>&1; then
-		    invoke-rc.d mono-xsp2 start
-		else
-		    /etc/init.d/mono-xsp2 start
-		fi
-	    fi
-	fi
-
-	rm $tempfile
-	;;
-esac
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/mono-xsp2.postrm b/debian/mono-xsp2.postrm
deleted file mode 100644
index ebf3931..0000000
--- a/debian/mono-xsp2.postrm
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-set -e
-
-if [ "$1" = "purge" ]; then
-	rm -f /etc/xsp2/debian.webapp
-	# purge init.d script
-	update-rc.d -f mono-xsp2 remove > /dev/null 2>&1
-	# remove default file created in postinst
-	rm -f /etc/default/mono-xsp2
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/mono-xsp2.preinst b/debian/mono-xsp2.preinst
deleted file mode 100644
index 2cd1997..0000000
--- a/debian/mono-xsp2.preinst
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-set -e
-
-NAME=mono-xsp2
-DESC="XSP WebServer"
-
-case "$1" in
-   upgrade|install)
-	if [ -f /etc/init.d/mono-xsp2 ]; then
-	    if which invoke-rc.d > /dev/null 2>&1; then
-		invoke-rc.d mono-xsp2 stop
-	    else
-		/etc/init.d/mono-xsp2 stop
-	    fi
-	fi
-	;;
-esac
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/mono-xsp2.prerm b/debian/mono-xsp2.prerm
deleted file mode 100644
index 655d12d..0000000
--- a/debian/mono-xsp2.prerm
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-set -e
-
-NAME=mono-xsp2
-DESC="XSP WebServer"
-
-#0 : false
-#1 : true
-should_stop() {
-    if [ -f /var/run/$NAME.pid ]; then
-	# Are we really running xsp2?
-	xsp2_pid=`cat /var/run/$NAME.pid`
-	xsp2_ps=`ps -p $xsp2_pid | wc -l`
-	# Are there any process running by that pid?
-	if [ "$xsp2_ps" = "2" ]; then
-	    return 0
-	else
-	    return 1
-	fi
-    fi  
-    return 0
-}
-
-case "$1" in
-    remove)
-	# should we stop the server?
-	if should_stop ; then
-	    if which invoke-rc.d >/dev/null 2>&1; then
-		invoke-rc.d mono-xsp2 stop
-	    else
-		/etc/init.d/mono-xsp2 stop
-	    fi
-	fi
-	;;
-    esac
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/mono-xsp2.templates b/debian/mono-xsp2.templates
deleted file mode 100644
index 8d4ca35..0000000
--- a/debian/mono-xsp2.templates
+++ /dev/null
@@ -1,34 +0,0 @@
-Template: xsp2/xsp2_autostart
-Type: boolean
-Default: true
-_Description: Start on boot?
- If this is true, then XSP2 will automatically start when the computer
- is turned on.
-
-Template: xsp2/xsp2_bind
-Type: string
-Default: 0.0.0.0
-_Description: Bind to address:
- To function properly, XSP2 needs to be bound to an IP address. The
- default ("0.0.0.0") binds to all addresses of the server, but a
- specific port can be selected. To use XSP2 only locally, use
- "127.0.0.1" for the address.
-
-Template: xsp2/xsp2_port
-Type: string
-Default: 8082
-_Description: Bind to port:
- XSP is bound to a specific port on the server. Common values are 80,
- 8080, or 8081.
-
-Template: xsp2/xsp1_upgrade_warning
-Type: note
-_Description: ASP.NET 1.0 support removed
- You appear to have some ASP.NET 1.0 sites configured in /etc/mono-server1.
- Support for the 1.0 profile has been removed from Mono 2.8 and above, and
- you are no longer able to serve ASP.NET 1.0 sites. You must reconfigure
- XSP to serve these sites using either 2.0 or 4.0 profiles, assuming your
- application is compatible. Please see mono-xsp2-admin(8) or
- mono-xsp4-admin(8) to see how to regenerate a configuration for use
- with 2.0 or 4.0 profiles.
-
diff --git a/debian/mono-xsp4.config b/debian/mono-xsp4.config
index bb7e606..6df80f8 100755
--- a/debian/mono-xsp4.config
+++ b/debian/mono-xsp4.config
@@ -9,7 +9,7 @@ db_title XSP4 WebServer
 # XSP1
 if [ -d /etc/xsp/conf.d ] && [ "`ls /etc/xsp/conf.d/ | grep -v ^asp.net-examples$ | grep -v ^monodoc-http$ | wc -l`" -gt 0 ]; then
 	set +e
-	db_fget xsp2/xsp1_upgrade_warning seen
+	db_fget xsp4/xsp1_upgrade_warning seen
 	seenflag=$?
 	set -e
 
@@ -31,6 +31,31 @@ if [ -d /etc/xsp/conf.d ] && [ "`ls /etc/xsp/conf.d/ | grep -v ^asp.net-examples
 	db_go || true
 fi
 
+# XSP2
+if [ -d /etc/xsp2/conf.d ] && [ "`ls /etc/xsp2/conf.d/ | grep -v ^asp.net-examples$ | grep -v ^monodoc-http$ | wc -l`" -gt 0 ]; then
+	set +e
+	db_fget xsp4/xsp2_upgrade_warning seen
+	seenflag=$?
+	set -e
+
+	case $seenflag in
+	0)
+		if [ "$RET" = false ]; then
+			db_input high xsp4/xsp2_upgrade_warning || true
+		fi
+		;;
+	10)
+		db_input high xsp4/xsp2_upgrade_warning || true
+		;;
+	*)
+		echo "db_fget exited with $seenflag" >&2
+                exit $err
+		;;
+	esac
+	db_fset xsp4/xsp2_upgrade_warning seen true || true
+	db_go || true
+fi
+
 # get existing values
 xsp4_default="/etc/default/mono-xsp4"
 if [ -e $xsp4_default ]; then
diff --git a/debian/mono-xsp4.templates b/debian/mono-xsp4.templates
index c3777be..a53d36c 100644
--- a/debian/mono-xsp4.templates
+++ b/debian/mono-xsp4.templates
@@ -24,11 +24,20 @@ _Description: Bind to port:
 Template: xsp4/xsp1_upgrade_warning
 Type: note
 _Description: ASP.NET 1.0 support removed
- You appear to have some ASP.NET 1.0 sites configured in /etc/mono-server1.
+ You appear to have some ASP.NET 1.0 sites configured in /etc/mono-server.
  Support for the 1.0 profile has been removed from Mono 2.8 and above, and
  you are no longer able to serve ASP.NET 1.0 sites. You must reconfigure
- XSP to serve these sites using either 2.0 or 4.0 profiles, assuming your
- application is compatible. Please see mono-xsp2-admin(8) or
- mono-xsp4-admin(8) to see how to regenerate a configuration for use
- with 2.0 or 4.0 profiles.
+ XSP to serve these sites using the 4.0 profile, assuming your application
+ is compatible. Please see mono-xsp4-admin(8) to see how to regenerate a
+ configuration for use with the 4.0 profile.
+
+Template: xsp4/xsp2_upgrade_warning
+Type: note
+_Description: ASP.NET 2.0 support removed
+ You appear to have some ASP.NET 2.0 sites configured in /etc/mono-server2.
+ Support for the 2.0 profile has been removed from Mono 4.0 and above, and
+ you are no longer able to serve ASP.NET 2.0 sites. You must reconfigure
+ XSP to serve these sites using the 4.0 profile, assuming your application
+ is compatible. Please see mono-xsp4-admin(8) to see how to regenerate a
+ configuration for use with the 4.0 profile.
 
diff --git a/debian/po/POTFILES.in b/debian/po/POTFILES.in
index 4b7cd18..bfc2ee9 100644
--- a/debian/po/POTFILES.in
+++ b/debian/po/POTFILES.in
@@ -1,4 +1,2 @@
 [type: gettext/rfc822deb] mono-apache-server4.templates
-[type: gettext/rfc822deb] mono-apache-server2.templates
 [type: gettext/rfc822deb] mono-xsp4.templates
-[type: gettext/rfc822deb] mono-xsp2.templates
diff --git a/debian/postinst-monoxsp2 b/debian/postinst-monoxsp2
deleted file mode 100644
index a41b688..0000000
--- a/debian/postinst-monoxsp2
+++ /dev/null
@@ -1,8 +0,0 @@
-if [ "$1" = "configure" ]; then
-    if [ -x /usr/sbin/mono-xsp2-update ]; then
-	/usr/sbin/mono-xsp2-update || true
-    fi
-    if [ -x /usr/sbin/mono-server2-update ]; then
-	/usr/sbin/mono-server2-update || true
-    fi
-fi
diff --git a/debian/postrm-monoxsp2 b/debian/postrm-monoxsp2
deleted file mode 100644
index 3322976..0000000
--- a/debian/postrm-monoxsp2
+++ /dev/null
@@ -1,8 +0,0 @@
-if [ "$1" = "remove" ] || [ "$1" = "purge" ]; then
-    if [ -x /usr/sbin/mono-xsp2-update ]; then
-	/usr/sbin/mono-xsp2-update || true
-    fi
-    if [ -x /usr/sbin/mono-server2-update ]; then
-	/usr/sbin/mono-server2-update || true
-    fi
-fi
diff --git a/debian/rules b/debian/rules
index c5d9648..61b690c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
 #export DH_VERBOSE=1
 export MONO_SHARED_DIR=$(CURDIR)
 
-MONO_ABI_COMP_VERSION = 2.10.1
+MONO_ABI_COMP_VERSION = 3.2.8
 
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
@@ -25,31 +25,18 @@ override_dh_auto_build:
 		> $(CURDIR)/debian/mono-server4-admin.8
 	pod2man --section=8 $(CURDIR)/debian/mono-server4-update \
 		> $(CURDIR)/debian/mono-server4-update.8
-	pod2man --section=8 \
-		$(CURDIR)/debian/mono-server2-admin \
-		> $(CURDIR)/debian/mono-server2-admin.8
-	pod2man --section=8 $(CURDIR)/debian/mono-server2-update \
-		> $(CURDIR)/debian/mono-server2-update.8
 	pod2man --section=8 $(CURDIR)/debian/mono-xsp4-admin \
 		> $(CURDIR)/debian/mono-xsp4-admin.8
 	pod2man --section=8 $(CURDIR)/debian/mono-xsp4-update \
 		> $(CURDIR)/debian/mono-xsp4-update.8
-	pod2man --section=8 $(CURDIR)/debian/mono-xsp2-admin \
-		> $(CURDIR)/debian/mono-xsp2-admin.8
-	pod2man --section=8 $(CURDIR)/debian/mono-xsp2-update \
-		> $(CURDIR)/debian/mono-xsp2-update.8
 
 	pod2man --section=1 $(CURDIR)/debian/dh_installxsp \
 		> $(CURDIR)/debian/dh_installxsp.1
 
 	cp $(CURDIR)/debian/mono-server4-update.8 \
 		$(CURDIR)/debian/update-mono-server4.8
-	cp $(CURDIR)/debian/mono-server2-update.8 \
-		$(CURDIR)/debian/update-mono-server2.8
 	cp $(CURDIR)/debian/mono-xsp4-update.8 \
 		$(CURDIR)/debian/update-mono-xsp4.8
-	cp $(CURDIR)/debian/mono-xsp2-update.8 \
-		$(CURDIR)/debian/update-mono-xsp2.8
 
 	touch build-stamp
 
@@ -60,36 +47,21 @@ override_dh_clean:
 override_dh_installman:
 	# Make version three variants on the manpages
 	cat debian/tmp/usr/share/man/man1/xsp.1 \
-		| sed 's/xsp/xsp2/g' \
-		> debian/tmp/usr/share/man/man1/xsp2.1
-	cat debian/tmp/usr/share/man/man1/xsp.1 \
 		| sed 's/xsp/xsp4/g' \
 		> debian/tmp/usr/share/man/man1/xsp4.1
 	cat debian/tmp/usr/share/man/man1/dbsessmgr.1 \
-		| sed 's/dbsessmgr/dbsessmgr2/g' \
-		> debian/tmp/usr/share/man/man1/dbsessmgr2.1
-	cat debian/tmp/usr/share/man/man1/dbsessmgr.1 \
 		| sed 's/dbsessmgr/dbsessmgr4/g' \
 		> debian/tmp/usr/share/man/man1/dbsessmgr4.1
 	cat debian/tmp/usr/share/man/man1/asp-state.1 \
-		| sed 's/asp-state/asp-state2/g' \
-		> debian/tmp/usr/share/man/man1/asp-state2.1
-	cat debian/tmp/usr/share/man/man1/asp-state.1 \
 		| sed 's/asp-state/asp-state4/g' \
 		> debian/tmp/usr/share/man/man1/asp-state4.1
 	cat debian/tmp/usr/share/man/man1/mod-mono-server.1 \
-		| sed 's/mono-server/mono-server2/g' \
-		> debian/tmp/usr/share/man/man1/mod-mono-server2.1
-	cat debian/tmp/usr/share/man/man1/mod-mono-server.1 \
 		| sed 's/mono-server/mono-server4/g' \
 		> debian/tmp/usr/share/man/man1/mod-mono-server4.1
 	cat debian/tmp/usr/share/man/man1/fastcgi-mono-server.1 \
-		| sed 's/mono-server/mono-server2/g' \
-		> debian/tmp/usr/share/man/man1/fastcgi-mono-server2.1
-	cat debian/tmp/usr/share/man/man1/fastcgi-mono-server.1 \
 		| sed 's/mono-server/mono-server4/g' \
 		> debian/tmp/usr/share/man/man1/fastcgi-mono-server4.1
-	DH_AUTOSCRIPTDIR=$(CURDIR)/debian/ debian/dh_installxsp -i -V 2
+	DH_AUTOSCRIPTDIR=$(CURDIR)/debian/ debian/dh_installxsp -i -V 4
 	dh_installman
 
 override_dh_makeclilibs:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mono/packages/xsp.git



More information about the Pkg-mono-svn-commits mailing list