[Pkg-mono-svn-commits] rev 1402 - in xsp/trunk/debian: . patches
Pablo Fischer
pabl0-guest@haydn.debian.org
Thu, 16 Sep 2004 12:19:16 -0600
Author: pabl0-guest
Date: 2004-09-16 12:18:55 -0600 (Thu, 16 Sep 2004)
New Revision: 1402
Added:
xsp/trunk/debian/patches/
xsp/trunk/debian/patches/xsp-apache2.diff
Log:
some new patches
Added: xsp/trunk/debian/patches/xsp-apache2.diff
===================================================================
--- xsp/trunk/debian/patches/xsp-apache2.diff 2004-08-28 18:26:54 UTC (rev 1401)
+++ xsp/trunk/debian/patches/xsp-apache2.diff 2004-09-16 18:18:55 UTC (rev 1402)
@@ -0,0 +1,360 @@
+Index: control
+===================================================================
+--- control (revision 1400)
++++ control (working copy)
+@@ -13,12 +13,12 @@
+ XSP is a simple web server written in C# that can be used to run your
+ ASP.NET applications.
+ .
+- The package also includes the mod-mono-server applications that works
+- as backend for mod_mono_unix.
++ This is the standalone ASP.NET web server. If you want to run ASP.NET
++ applications with Apache, look at mono-apache-server.
+
+ Package: asp.net-examples
+ Architecture: all
+-Depends: ${shlibs:Depends}, mono-xsp | mono-apache-server
++Depends: ${shlibs:Depends}, mono-xsp | libapache-mod-mono (>> 1.0) | libapache2-mod-mono (>> 1.0)
+ Description: demo pages for ASP.NET infrastructure
+ Sample set of .aspx pages to test the XSP server or the mod_mono Apache
+ module.
+@@ -28,10 +28,10 @@
+ Conflicts: mono-server
+ Replaces: mono-server
+ Depends: ${shlibs:Depends}, ${net:Depends}, libapache-mod-mono (>> 1.0) | libapache2-mod-mono (>> 1.0), mono-mcs (>> 1.0), debconf (>= 1.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
+- parse/compile the aspx code.
+-
+-
+-
++Description: backend for mod_mono 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 libapache-mono-mono for Apache 1.3 or
++ libapache2-mod-mono for Apache 2.0.
+Index: index.aspx
+===================================================================
+--- index.aspx (revision 1400)
++++ index.aspx (working copy)
+@@ -6,7 +6,7 @@
+ </head>
+ <body>
+ <h1>Welcome to Mono XSP!</h1>
+-<a href="http://www.go-mono.com"><img src="mono.png" alt="http://www.go-mono.com"></a>
++<a href="http://www.mono-project.com"><img src="mono.png" alt="http://www.mono-project.com"></a>
+ <p>Here are some ASP.NET examples:</p>
+ <%
+ DirectoryInfo dir = new DirectoryInfo (Path.GetDirectoryName (Request.PhysicalPath));
+@@ -31,4 +31,3 @@
+ <hr />
+ <small>Generated: <%= DateTime.Now %></small>
+ </html>
+-
+Index: asp.net-examples.dirs
+===================================================================
+--- asp.net-examples.dirs (revision 1400)
++++ asp.net-examples.dirs (working copy)
+@@ -2,5 +2,3 @@
+ usr/share/asp.net-demos/asp
+ usr/share/asp.net-demos/asp/bin
+ usr/share/dotnet/lib
+-
+-
+Index: mono-apache-server.links
+===================================================================
+--- mono-apache-server.links (revision 1400)
++++ mono-apache-server.links (working copy)
+@@ -1,5 +1,3 @@
+ /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
+ /usr/share/dotnet/monoserver/mono-server-update.conf /usr/sbin/update-mono-server.conf
+-
+-
+Index: mono-xsp.dirs
+===================================================================
+--- mono-xsp.dirs (revision 1400)
++++ mono-xsp.dirs (working copy)
+@@ -4,4 +4,3 @@
+ usr/share/dotnet/bin
+ usr/share/dotnet/xsp
+ var/run/mono-xsp
+-
+Index: mono-apache-server.manpages
+===================================================================
+--- mono-apache-server.manpages (revision 1400)
++++ mono-apache-server.manpages (working copy)
+@@ -2,4 +2,3 @@
+ debian/mono-server-update.conf.8
+ debian/update-mono-server.conf.8
+ doc/mod-mono-server.1
+-
+Index: changelog
+===================================================================
+--- changelog (revision 1400)
++++ changelog (working copy)
+@@ -1,3 +1,21 @@
++xsp (1.0.1-1.1) unstable; urgency=low
++
++ * README.Debian: rewrote this, incorporating all the currently relevant info.
++ * asp.net-examples.README.Debian: improved wording.
++ * mono-apache-server.README.Debian: rewrote this, incorporating relevant
++ info.
++ * asp.net-examples.dirs: cleaned up.
++ * debian/TODO: cleaned up.
++ * debian/control:
++ - Improved wording of package descriptions.
++ - Updated dependencies to reflect existence of libapache2-mod-mono.
++ * debian/copyright: updated location of Mono web site.
++ * Updated index.aspx to reflect new Mono web site, plus cleanup.
++ * Removed some old maintainer scripts that are no longer in use.
++ * Lots of one-line cleanups.
++
++ -- Fabian Fagerholm <fabbe@paniq.net> Sat, 28 Aug 2004 17:25:16 +0300
++
+ xsp (1.0.1-1) unstable; urgency=low
+
+ * NEW upstream release
+Index: mono-apache-server.dirs
+===================================================================
+--- mono-apache-server.dirs (revision 1400)
++++ mono-apache-server.dirs (working copy)
+@@ -3,4 +3,3 @@
+ etc/mono-server/conf.d
+ usr/share/dotnet/bin
+ usr/share/dotnet/monoserver
+-
+Index: mono-xsp.links
+===================================================================
+--- mono-xsp.links (revision 1400)
++++ mono-xsp.links (working copy)
+@@ -1,4 +1,3 @@
+ /usr/share/dotnet/xsp/mono-xsp-update.conf /usr/sbin/mono-xsp-update.conf
+ /usr/share/dotnet/xsp/mono-xsp-admin.conf /usr/sbin/mono-xsp-admin.conf
+ /usr/share/dotnet/xsp/mono-xsp-update.conf /usr/sbin/update-mono-xsp.conf
+-
+Index: asp.net-examples.README.Debian
+===================================================================
+--- asp.net-examples.README.Debian (revision 1400)
++++ asp.net-examples.README.Debian (working copy)
+@@ -1,18 +1,13 @@
+ asp.net-examples for Debian
+---------------
++----------------------------
+
+-This package contains the asp.net samples, the directory where
+-these files are installed are:
++This package contains example ASP.NET applications. The examples are
++installed in /usr/share/asp.net-demos/asp/
+
+-/usr/share/asp.net-demos/asp/
+-
+-To access with xsp:
+-
++If you are using the standalone XSP server, you can access the examples at
+ http://localhost:8080/samples
+
++If you are using mod_mono to run ASP.NET applications via Apache, you can
++access the examples at http://localhost/samples
+
+-To access via mono-server (Apache)
+-
+-http://localhost/samples
+-
+- -- Pablo Fischer <pablo@pablo.com.mx>, Mon, 15 Mar 2004 18:52:30 -0600
++ -- Fabian Fagerholm <fabbe@paniq.net>, Fri, 6 Aug 2004 12:00:12 +0300
+Index: TODO
+===================================================================
+--- TODO (revision 1400)
++++ TODO (working copy)
+@@ -1,26 +1,15 @@
+-200-06-14:
+
+-* No bugs
++TODO for xsp
++------------
+
+-2004-02-28
+-
+-* Ask in #debian-mono for people that want to test the packages
+-* Ask teo or Edd to check it (it runs VERY good in my computer) and upload it :)
+-
+-
+-2004-02-18
+-
+-* Mono-Server works great with libapache
+-* Mono-XSP works great!
+-* Both packages has their dameons
+-
+-TO FIX:
+-
+-* Check the daemons of both packages and write a function to check if the daemon is already running (a new function, the last was fucked)
+-* Review the asp.net-examples package, the postinst and prerm, when I do: dpkg-reconfigure asp.net-examples it removes ALL the lines of the virtual.conf file, and is strange cause I'm just using echo >> (to add at the end of a file)
+-
+-Night :)
+-
+-2004-02-17
+-
+-* Ask Edd why we need a asp.net-examples-server package if we are going to use mod-mono-server or xsp instead
++* Look for beta testers.
++* Add a way for regular users to activate XSP applications without having
++ to gain root access. Of course, users' web apps must be completely isolated
++ in every way.
++* Check the daemons of both packages and write a function to check if the
++ daemon is already running (a new function, the last was fucked).
++* Review the asp.net-examples package, the postinst and prerm, when I do:
++ dpkg-reconfigure asp.net-examples it removes ALL the lines of the
++ virtual.conf file, and is strange cause I'm just using echo >> (to add at
++ the end of a file)
++* Add more items to this list :)
+Index: mono-apache-server.README.Debian
+===================================================================
+--- mono-apache-server.README.Debian (revision 1400)
++++ mono-apache-server.README.Debian (working copy)
+@@ -1,48 +1,54 @@
+ mono-apache-server for Debian
+---------------
++--------------------------
+
+-The mono-apache-server package creates a socket in /tmp, so that mod_mono (in Apache) can be started
+-without errors.
++mod-mono-server is a backend server that allows you to run ASP.NET web
++applications in conjunction with Apache (1.3 or 2.0) and the mod_mono Apache
++module. In Debian, mod-mono-server is provided in the package
++mono-apache-server.
+
+-So, to run mod_mono you SHOULD need this packages, and viceversa.
++mod-mono-server creates a socket in /tmp, and mod_mono communicates with
++mod-mono-server through that socket. Apache will pass the HTTP request via
++mod_mono to mod-mono-server, and mod-mono-server will pass the result back
++to Apache via mod_mono.
+
+-When mod_mono is installed it will create a link to a file (/etc/mono-server/mono-server-hosts.conf)..
++So you need this package to run mod_mono, and vice versa.
+
+-This file will be managed my mono-server, with the update and admin scripts.
++When mod_mono is installed, it will create a link to
++/etc/mono-server/mono-server-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.
+
+-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.
++However, you should NOT EDIT THIS FILE by hand. Instead, you can manage the
++mono-server-hosts.conf file with the administration scripts provided by
++mod-mono-server. The administration scripts work on a directory structure in
++/etc/mono-server -- this is what it looks like:
+
+-When you run mono-server-update.conf it will read config files in /etc/mono-server and create these
+-two files.
++/etc/mono-server <- The root of the configuration structure
++/etc/mono-server/conf.d <- VirtualHosts Config Directories
++/etc/mono-server/conf.d/monodoc <- MonoDoc Config Files
+
+-For example, we have monodoc-http, so we have:
++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-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.
++You then need to run mono-server-update.conf, which will read the directory
++structure and rebuild the mono-server-hosts.conf file. mod-mono-server will
++automatically detect the changes in the file, and adjust its configuration
++accordingly. The mono-server-update.conf script will also create a
++debian.webapp file, which is needed for the ASP.NET applications.
+
+-In new versions (like this one), mod-mono-server doesn't needs to be executed as a daemon, cause mod_mono
+-will call it.
++Packages that wish to install ASP.NET web applications can just follow the
++above procedure. If mod-mono-server is running, the application will be
++automatically activated.
+
+-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.
++You don't need to start mod-mono-server. If it's not running when a request
++comes in, mod_mono will start it (unless you have disabled mod_mono). Note
++that mono-server-update.conf can start Apache.
+
+-If you want to create your own applications using the advantages that mono-apache-server has, you can use the
+-mono-server-admin.conf script.
++Happy Hacking!
+
+-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
++ -- Fabian Fagerholm <fabbe@paniq.net>, Fri, 6 Aug 2004 12:29:01 +0300
+Index: copyright
+===================================================================
+--- copyright (revision 1400)
++++ copyright (working copy)
+@@ -1,7 +1,7 @@
+ This package was debianized by Pablo Fischer pablo@pablo.com.mx on
+ Wed, 7 Jan 2004 12:49:46 -0600.
+
+-It was downloaded from http://www.go-mono.com/.
++It was downloaded from http://www.mono-project.com/.
+
+ Upstream authors:
+
+Index: README.Debian
+===================================================================
+--- README.Debian (revision 1400)
++++ README.Debian (working copy)
+@@ -1,23 +1,21 @@
+ xsp and mod-mono-server for Debian
+---------------
++-----------------------------------
+
+-The mono-xsp 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.
++This is the Mono XSP Web Application server for Debian. It is divided into
++three packages.
+
+-The mono-server package contains the mod-mono-server.exe exec, it needs to be in another
+-package (mono-server, not mono-xsp) cause we don't know if the end user doesn't like
+-Apache, or just want to test some asp.net tests. In few words, the mod-mono-server was
+-designed to be used as a 'backend' of the mod_mono module for apache (libapache-mod-mono)
++The mono-xsp package contains a standalone web server to run ASP.NET web
++applications. It should run on port 8080 or 8081. The package scripts
++automatically detect which port should be used.
+
+- -- Pablo Fischer <pablo@pablo.com.mx>, Wed, 25 Feb 2004 18:33:34 -0600
++The mono-apache-server package contains the mod-mono-server.exe executable.
++It is used as a back-end by the mod_mono module for Apache (libapache-mod-mono
++for Apache 1.3, or libapache2-mod-mono for Apache 2.0). It is packaged
++separately so that you can run ASP.NET web applications without having to
++install Apache. If that is what you want, use mono-xsp.
+
+-xsp for Debian
+---------------
++The asp.net-examples package includes some demos of ASP.NET applications. They
++can be used with either the standalone mono-xsp package, or the mod_mono Apache
++module.
+
+-The package components are the xsp server itself (package mono-xsp), the
+-mono_mod_server variant which works in combination with mod_mono_unix,
+-and the ASP.NET demos in the package asp.net-examples.
+-
+- -- Eduard Bloch <blade@debian.org>, Thu, 22 Jan 2004 23:16:13 +0100
+-
++ -- Fabian Fagerholm <fabbe@paniq.net>, Thu, 5 Aug 2004 13:29:12 +0300