[Pkg-mono-svn-commits] rev 1060 - xsp/trunk/debian
Pablo Fischer
pabl0-guest@haydn.debian.org
Fri, 18 Jun 2004 08:48:57 -0600
Author: pabl0-guest
Date: 2004-06-18 08:48:55 -0600 (Fri, 18 Jun 2004)
New Revision: 1060
Added:
xsp/trunk/debian/mono-apache-server.README.Debian
xsp/trunk/debian/mono-apache-server.config
xsp/trunk/debian/mono-apache-server.default
xsp/trunk/debian/mono-apache-server.dirs
xsp/trunk/debian/mono-apache-server.docs
xsp/trunk/debian/mono-apache-server.files
xsp/trunk/debian/mono-apache-server.links
xsp/trunk/debian/mono-apache-server.manpages
xsp/trunk/debian/mono-apache-server.postinst
xsp/trunk/debian/mono-apache-server.postrm
xsp/trunk/debian/mono-apache-server.templates
Removed:
xsp/trunk/debian/mono-server.README.Debian
xsp/trunk/debian/mono-server.config
xsp/trunk/debian/mono-server.default
xsp/trunk/debian/mono-server.dirs
xsp/trunk/debian/mono-server.docs
xsp/trunk/debian/mono-server.files
xsp/trunk/debian/mono-server.links
xsp/trunk/debian/mono-server.manpages
xsp/trunk/debian/mono-server.postinst
xsp/trunk/debian/mono-server.postrm
xsp/trunk/debian/mono-server.templates
Modified:
xsp/trunk/debian/changelog
xsp/trunk/debian/control
xsp/trunk/debian/mono-server-update.conf
xsp/trunk/debian/mono-server.substvars
xsp/trunk/debian/mono-xsp.substvars
xsp/trunk/debian/rules
Log:
Renamed mono-server to mono-apache-server
Modified: xsp/trunk/debian/changelog
===================================================================
--- xsp/trunk/debian/changelog 2004-06-18 14:32:45 UTC (rev 1059)
+++ xsp/trunk/debian/changelog 2004-06-18 14:48:55 UTC (rev 1060)
@@ -2,6 +2,7 @@
* NOT RELEASED YET
* patched index.aspx, links.
+ * Renamed mono-server to mono-apache-server.
-- Debian Mono Group <pkg-mono-group@lists.alioth.debian.org> Wed, 16 Jun 2004 14:02:21 -0600
Modified: xsp/trunk/debian/control
===================================================================
--- xsp/trunk/debian/control 2004-06-18 14:32:45 UTC (rev 1059)
+++ xsp/trunk/debian/control 2004-06-18 14:48:55 UTC (rev 1060)
@@ -7,7 +7,7 @@
Package: mono-xsp
Architecture: all
-Depends: ${shlibs:Depends}, ${net:Depends}, mono-mcs (>> 0.95), debconf (>= 0.5) | debconf-2.0
+Depends: ${shlibs:Depends}, ${net:Depends}, mono-mcs (>> 0.96), 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.
@@ -22,9 +22,10 @@
Sample set of .aspx pages to test the XSP server or the mod_mono Apache
module.
-Package: mono-server
+Package: mono-apache-server
Architecture: all
-Depends: ${shlibs:Depends}, ${net:Depends}, libapache-mod-mono (>= 0.10), mono-mcs (>> 0.95), debconf (>= 0.5) | debconf-2.0
+Replaces: mono-server
+Depends: ${shlibs:Depends}, ${net:Depends}, libapache-mod-mono (>= 0.10), mono-mcs (>> 0.96), 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
Copied: xsp/trunk/debian/mono-apache-server.README.Debian (from rev 1058, xsp/trunk/debian/mono-server.README.Debian)
Copied: xsp/trunk/debian/mono-apache-server.config (from rev 1058, xsp/trunk/debian/mono-server.config)
Copied: xsp/trunk/debian/mono-apache-server.default (from rev 1058, xsp/trunk/debian/mono-server.default)
Copied: xsp/trunk/debian/mono-apache-server.dirs (from rev 1058, xsp/trunk/debian/mono-server.dirs)
Copied: xsp/trunk/debian/mono-apache-server.docs (from rev 1058, xsp/trunk/debian/mono-server.docs)
Copied: xsp/trunk/debian/mono-apache-server.files (from rev 1058, xsp/trunk/debian/mono-server.files)
Copied: xsp/trunk/debian/mono-apache-server.links (from rev 1058, xsp/trunk/debian/mono-server.links)
Copied: xsp/trunk/debian/mono-apache-server.manpages (from rev 1058, xsp/trunk/debian/mono-server.manpages)
Copied: xsp/trunk/debian/mono-apache-server.postinst (from rev 1058, xsp/trunk/debian/mono-server.postinst)
===================================================================
--- xsp/trunk/debian/mono-server.postinst 2004-06-18 11:07:21 UTC (rev 1058)
+++ xsp/trunk/debian/mono-apache-server.postinst 2004-06-18 14:48:55 UTC (rev 1060)
@@ -0,0 +1,58 @@
+#! /bin/sh
+
+set -e
+
+. /usr/share/debconf/confmodule
+db_version 2.0
+
+tempfile=`/bin/tempfile`
+modmono_default="/etc/default/mono-apache-server"
+
+restart_apache_on() {
+ sed s/start_apache=false/start_apache=true/g $modmono_default > $tempfile
+ cp -f $tempfile $modmono_default
+ rm -Rf $tempfile
+}
+
+restart_apache_off() {
+ sed s/start_apache=true/start_apache=false/g $modmono_default > $tempfile
+ cp -f $tempfile $modmono_default
+ rm -Rf $tempfile
+}
+
+daemon_turn_off() {
+ if [ -x "/etc/init.d/mono-server" ]; then
+ update-rc.d -f mono-server remove >/dev/null
+ fi
+}
+
+case "$1" in
+ configure)
+ db_get monoserver/monoserver_restartapache || true
+ daemon_turn_off
+ if [ "$RET" = "true" ]; then
+ restart_apache_on
+ else
+ restart_apache_off
+ fi
+
+ mono-server-update.conf
+
+ ;;
+
+ *)
+ echo "postinst failed \`$1'" >&2
+ exit 0
+ ;;
+esac
+
+exit 0
+
+
+
+
+
+
+
+
+
Copied: xsp/trunk/debian/mono-apache-server.postrm (from rev 1058, xsp/trunk/debian/mono-server.postrm)
Copied: xsp/trunk/debian/mono-apache-server.templates (from rev 1058, xsp/trunk/debian/mono-server.templates)
Modified: xsp/trunk/debian/mono-server-update.conf
===================================================================
--- xsp/trunk/debian/mono-server-update.conf 2004-06-18 14:32:45 UTC (rev 1059)
+++ xsp/trunk/debian/mono-server-update.conf 2004-06-18 14:48:55 UTC (rev 1060)
@@ -54,7 +54,7 @@
$daemon = "/etc/init.d/apache";
$daemon_pid = "/var/run/apache.pid";
$applications = "";
-$default_file = "/etc/default/mono-server";
+$default_file = "/etc/default/mono-apache-server";
$libs = "";
my $restart = "yes";
Deleted: xsp/trunk/debian/mono-server.README.Debian
===================================================================
--- xsp/trunk/debian/mono-server.README.Debian 2004-06-18 14:32:45 UTC (rev 1059)
+++ xsp/trunk/debian/mono-server.README.Debian 2004-06-18 14:48:55 UTC (rev 1060)
@@ -1,48 +0,0 @@
-mod-mono-server for Debian
---------------
-
-The mono-server package creates a socket in /tmp, so that mod_mono (in Apache) can be started
-without errors.
-
-So, to run mod_mono you SHOULD need this packages, and viceversa.
-
-When mod_mono is installed it will create a link to a file (/etc/mono-server/mono-server-hosts.conf)..
-
-This file will be managed my mono-server, with the update and admin scripts.
-
-The mono-server-update.conf will create this file and also a webapp file needed by mod_mono. The
-debian.webapp is needed to setup the applications and *hosts.conf is needed to create those Alias and
-permissions.
-
-When you run mono-server-update.conf it will read config files in /etc/mono-server and create these
-two files.
-
-For example, we have monodoc-http, so we have:
-
-/etc/mono-server <- Mono Server Config Dir
-/etc/mono-server/conf.d <- Mono Server VirtualHosts Config Directories
-/etc/mono-server/conf.d/monodoc <- MonoDoc Config Files for Mono Server
-
-Every file is marked by a number, an underscore and the alias name, for example:
-
-/etc/mono-server/conf.d/monodoc/10_monodochttp
-
-If you want to install a new virtualhost for Mono Server, you just need to apt-get it, and if
-Mono Server is running it should be started normally, if it's the first virtualhost and you configured
-mono-server to be started automatically it will start mono-server by default.
-
-In new versions (like this one), mod-mono-server doesn't needs to be executed as a daemon, cause mod_mono
-will call it.
-
-The only 'daemon' issue that you can find is that mono-server-update.conf can start (if was running) apache,
-but you can turn it off with dpkg-reconfigure mono-server.
-
-If you want to create your own applications using the advantages that mono-server has, you can use the
-mono-server-admin.conf script.
-
-ALSO, YOU SHOULD NOT EDIT mono-server-hosts.conf file, cause when mono-server-update.conf is called it
-will overwrite this file.
-
-Happy Hacking
-
- -- Pablo Fischer <pablo@pablo.com.mx>, Mon, 15 Mar 2004 18:52:30 -0600
Deleted: xsp/trunk/debian/mono-server.config
===================================================================
--- xsp/trunk/debian/mono-server.config 2004-06-18 14:32:45 UTC (rev 1059)
+++ xsp/trunk/debian/mono-server.config 2004-06-18 14:48:55 UTC (rev 1060)
@@ -1,35 +0,0 @@
-#!/bin/sh -e
-
-. /usr/share/debconf/confmodule
-db_version 2.0
-db_capb backup
-db_title ModMono Server
-
-STATE=1
-while [ "$STATE" != 0 -a "$STATE" != 2 ]; do
- case "$STATE" in
- 1)
- db_input medium monoserver/monoserver_restartapache || true
- if db_go; then
- db_get monoserver/monoserver_restartapache || true
- if [ "$RET" = "true" ]; then
- STATE=2
- else
- db_set monoserver/monoserver_restartapache false || true
- STATE=2
- fi
- else
- STATE=0
- fi
- ;;
- esac
-done
-
-if [ "$STATE" = 0 ]; then
- exit 1
-fi
-
-
-
-
-
Deleted: xsp/trunk/debian/mono-server.default
===================================================================
--- xsp/trunk/debian/mono-server.default 2004-06-18 14:32:45 UTC (rev 1059)
+++ xsp/trunk/debian/mono-server.default 2004-06-18 14:48:55 UTC (rev 1060)
@@ -1,7 +0,0 @@
-# Defaults for mono-server
-
-# Should mono-server start apache?
-start_apache=true
-
-
-
Deleted: xsp/trunk/debian/mono-server.dirs
===================================================================
--- xsp/trunk/debian/mono-server.dirs 2004-06-18 14:32:45 UTC (rev 1059)
+++ xsp/trunk/debian/mono-server.dirs 2004-06-18 14:48:55 UTC (rev 1060)
@@ -1,6 +0,0 @@
-usr/bin
-etc/mono-server
-etc/mono-server/conf.d
-usr/share/dotnet/bin
-usr/share/dotnet/monoserver
-
Deleted: xsp/trunk/debian/mono-server.docs
===================================================================
--- xsp/trunk/debian/mono-server.docs 2004-06-18 14:32:45 UTC (rev 1059)
+++ xsp/trunk/debian/mono-server.docs 2004-06-18 14:48:55 UTC (rev 1060)
@@ -1,4 +0,0 @@
-debian/MAINTAINERS
-NEWS
-README
-AUTHORS
Deleted: xsp/trunk/debian/mono-server.files
===================================================================
--- xsp/trunk/debian/mono-server.files 2004-06-18 14:32:45 UTC (rev 1059)
+++ xsp/trunk/debian/mono-server.files 2004-06-18 14:48:55 UTC (rev 1060)
@@ -1 +0,0 @@
-usr/bin/mod-mono-server.exe
Deleted: xsp/trunk/debian/mono-server.links
===================================================================
--- xsp/trunk/debian/mono-server.links 2004-06-18 14:32:45 UTC (rev 1059)
+++ xsp/trunk/debian/mono-server.links 2004-06-18 14:48:55 UTC (rev 1060)
@@ -1,3 +0,0 @@
-/usr/share/dotnet/monoserver/mono-server-update.conf /usr/sbin/mono-server-update.conf
-/usr/share/dotnet/monoserver/mono-server-admin.conf /usr/sbin/mono-server-admin.conf
-
Deleted: xsp/trunk/debian/mono-server.manpages
===================================================================
--- xsp/trunk/debian/mono-server.manpages 2004-06-18 14:32:45 UTC (rev 1059)
+++ xsp/trunk/debian/mono-server.manpages 2004-06-18 14:48:55 UTC (rev 1060)
@@ -1,4 +0,0 @@
-debian/mono-server-admin.conf.8
-debian/mono-server-update.conf.8
-doc/mod-mono-server.1
-
Deleted: xsp/trunk/debian/mono-server.postinst
===================================================================
--- xsp/trunk/debian/mono-server.postinst 2004-06-18 14:32:45 UTC (rev 1059)
+++ xsp/trunk/debian/mono-server.postinst 2004-06-18 14:48:55 UTC (rev 1060)
@@ -1,58 +0,0 @@
-#! /bin/sh
-
-set -e
-
-. /usr/share/debconf/confmodule
-db_version 2.0
-
-tempfile=`/bin/tempfile`
-modmono_default="/etc/default/mono-server"
-
-restart_apache_on() {
- sed s/start_apache=false/start_apache=true/g $modmono_default > $tempfile
- cp -f $tempfile $modmono_default
- rm -Rf $tempfile
-}
-
-restart_apache_off() {
- sed s/start_apache=true/start_apache=false/g $modmono_default > $tempfile
- cp -f $tempfile $modmono_default
- rm -Rf $tempfile
-}
-
-daemon_turn_off() {
- if [ -x "/etc/init.d/mono-server" ]; then
- update-rc.d -f mono-server remove >/dev/null
- fi
-}
-
-case "$1" in
- configure)
- db_get monoserver/monoserver_restartapache || true
- daemon_turn_off
- if [ "$RET" = "true" ]; then
- restart_apache_on
- else
- restart_apache_off
- fi
-
- mono-server-update.conf
-
- ;;
-
- *)
- echo "postinst failed \`$1'" >&2
- exit 0
- ;;
-esac
-
-exit 0
-
-
-
-
-
-
-
-
-
Deleted: xsp/trunk/debian/mono-server.postrm
===================================================================
--- xsp/trunk/debian/mono-server.postrm 2004-06-18 14:32:45 UTC (rev 1059)
+++ xsp/trunk/debian/mono-server.postrm 2004-06-18 14:48:55 UTC (rev 1060)
@@ -1,12 +0,0 @@
-#!/bin/sh -e
-
-monoserverconfd="/etc/mono-server/conf.d/"
-
-case "$1" in
- purge)
- rm -Rf "$monoserverconfd/*"
- . /usr/share/debconf/confmodule
- db_purge
- ;;
- esac
-exit 0
Modified: xsp/trunk/debian/mono-server.substvars
===================================================================
--- xsp/trunk/debian/mono-server.substvars 2004-06-18 14:32:45 UTC (rev 1059)
+++ xsp/trunk/debian/mono-server.substvars 2004-06-18 14:48:55 UTC (rev 1060)
@@ -1 +1,2 @@
misc:Depends=debconf (>= 0.5) | debconf-2.0
+net:Depends=mono-jit (>= 0.95) | mono-mint (>= 0.95)
Deleted: xsp/trunk/debian/mono-server.templates
===================================================================
--- xsp/trunk/debian/mono-server.templates 2004-06-18 14:32:45 UTC (rev 1059)
+++ xsp/trunk/debian/mono-server.templates 2004-06-18 14:48:55 UTC (rev 1060)
@@ -1,10 +0,0 @@
-Template: monoserver/monoserver_restartapache
-Type: boolean
-Default: true
-Description: Let mono-server restart Apache?
- The debian version of mono-server includes a mono-server-update.conf
- that creates a configuration file for apache to start the ASP.NET applications,
- and mono-server-update.conf can restart apache if there's a new configuration file
- (/etc/mono-server/mono-server-hosts.conf). Would you like to restart apache if
- there's a new mono-server-hosts.conf file?
-
Modified: xsp/trunk/debian/mono-xsp.substvars
===================================================================
--- xsp/trunk/debian/mono-xsp.substvars 2004-06-18 14:32:45 UTC (rev 1059)
+++ xsp/trunk/debian/mono-xsp.substvars 2004-06-18 14:48:55 UTC (rev 1060)
@@ -1 +1,2 @@
misc:Depends=debconf (>= 0.5) | debconf-2.0
+net:Depends=mono-jit (>= 0.95) | mono-mint (>= 0.95)
Modified: xsp/trunk/debian/rules
===================================================================
--- xsp/trunk/debian/rules 2004-06-18 14:32:45 UTC (rev 1059)
+++ xsp/trunk/debian/rules 2004-06-18 14:48:55 UTC (rev 1060)
@@ -70,8 +70,8 @@
for x in debian/mono-xsp/usr/bin/*.exe ; do ln -sf cli-wrapper $${x%.exe} ; done
mv debian/mono-xsp/usr/bin/*.exe debian/mono-xsp/usr/share/dotnet/bin
# Now, for mono-server
- for x in debian/mono-server/usr/bin/*.exe ; do ln -sf cli-wrapper $${x%.exe} ; done
- mv debian/mono-server/usr/bin/*.exe debian/mono-server/usr/share/dotnet/bin
+ for x in debian/mono-apache-server/usr/bin/*.exe ; do ln -sf cli-wrapper $${x%.exe} ; done
+ mv debian/mono-apache-server/usr/bin/*.exe debian/mono-apache-server/usr/share/dotnet/bin
binary-arch: build install
# We have nothing to do by default.
@@ -98,8 +98,8 @@
cp $(CURDIR)/debian/mono-xsp-admin.conf debian/mono-xsp/usr/share/dotnet/xsp/
# cp $(CURDIR)/debian/mono-server-reader.conf $(CURDIR)/debian/mono-server/usr/share/dotnet/monoserver/
- cp $(CURDIR)/debian/mono-server-admin.conf $(CURDIR)/debian/mono-server/usr/share/dotnet/monoserver/
- cp $(CURDIR)/debian/mono-server-update.conf $(CURDIR)/debian/mono-server/usr/share/dotnet/monoserver/
+ cp $(CURDIR)/debian/mono-server-admin.conf $(CURDIR)/debian/mono-apache-server/usr/share/dotnet/monoserver/
+ cp $(CURDIR)/debian/mono-server-update.conf $(CURDIR)/debian/mono-apache-server/usr/share/dotnet/monoserver/
chmod +x $(CURDIR)/debian/mono-server/usr/share/dotnet/monoserver/*.conf
chmod +x $(CURDIR)/debian/mono-xsp/usr/share/dotnet/xsp/*.conf