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

[Mirco Bauer]

Author: meebey-guest
Date: 2007-05-07 15:10:39 +0000 (Mon, 07 May 2007)
New Revision: 3113

Modified:
   xsp/trunk/debian/changelog
   xsp/trunk/debian/mono-server-update.conf
   xsp/trunk/debian/mono-server2-update.conf
Log:
- fixes



Modified: xsp/trunk/debian/changelog
===================================================================
--- xsp/trunk/debian/changelog	2007-05-06 14:53:39 UTC (rev 3112)
+++ xsp/trunk/debian/changelog	2007-05-07 15:10:39 UTC (rev 3113)
@@ -1,8 +1,11 @@
-xsp (1.2.1-3~pre2) unstable; urgency=low
+xsp (1.2.1-3~pre3) unstable; urgency=low
 
   * Mirco 'meebey' Bauer
     + debian/mono-xsp2.preinst:
       - Fixed check for mono-xsp2 init.d script.
+    + mono-server(2)-update:
+      - Add "default" alias to all Mono* directives.
+        (this makes ASP.NET 1.1 and 2.0 actually work)
   * Dylan R. E. Moonfire
     + debian/*.postrm
       - Made the confmodule loading optional (Closes: #416636, #416893,

Modified: xsp/trunk/debian/mono-server-update.conf
===================================================================
--- xsp/trunk/debian/mono-server-update.conf	2007-05-06 14:53:39 UTC (rev 3112)
+++ xsp/trunk/debian/mono-server-update.conf	2007-05-07 15:10:39 UTC (rev 3113)
@@ -203,10 +203,10 @@
     close(TEMPHOST);
 
     if($libs) {
-	$content =~ s/MonoPath .*/MonoPath $libs/gi;
+	$content =~ s/MonoPath .*/MonoPath default $libs/gi;
     }
     else {
-	$content =~ s/MonoPath//gi;
+	$content =~ s/MonoPath default//gi;
     }
     
     open(TEMPHOST, "> $monoserver_hostfile.tmp");
@@ -219,11 +219,11 @@
 
     print TEMPHOST "# Default configuration, don't edit it!\n";
     print TEMPHOST "<IfModule mod_mono.c>\n";
-    print TEMPHOST "  MonoUnixSocket /tmp/.mod_mono_server\n";    
+    print TEMPHOST "  MonoUnixSocket default /tmp/.mod_mono_server\n";
     print TEMPHOST "  MonoServerPath default /usr/lib/mono/1.0/mod-mono-server.exe\n";
     print TEMPHOST "  AddType application/x-asp-net .aspx .ashx .asmx .ascx .asax .config .ascx\n";
-    print TEMPHOST "  MonoApplicationsConfigDir /etc/mono-server\n";
-    print TEMPHOST "  MonoPath \n";
+    print TEMPHOST "  MonoApplicationsConfigDir default /etc/mono-server\n";
+    print TEMPHOST "  MonoPath default \n";
 
     close(TEMPHOST);
 

Modified: xsp/trunk/debian/mono-server2-update.conf
===================================================================
--- xsp/trunk/debian/mono-server2-update.conf	2007-05-06 14:53:39 UTC (rev 3112)
+++ xsp/trunk/debian/mono-server2-update.conf	2007-05-07 15:10:39 UTC (rev 3113)
@@ -203,10 +203,10 @@
     close(TEMPHOST);
 
     if($libs) {
-	$content =~ s/MonoPath .*/MonoPath $libs/gi;
+	$content =~ s/MonoPath .*/MonoPath default $libs/gi;
     }
     else {
-	$content =~ s/MonoPath//gi;
+	$content =~ s/MonoPath default//gi;
     }
     
     open(TEMPHOST, "> $monoserver2_hostfile.tmp");
@@ -219,11 +219,11 @@
 
     print TEMPHOST "# Default configuration, don't edit it!\n";
     print TEMPHOST "<IfModule mod_mono.c>\n";
-    print TEMPHOST "  MonoUnixSocket /tmp/.mod_mono_server2\n";    
+    print TEMPHOST "  MonoUnixSocket default /tmp/.mod_mono_server2\n";    
     print TEMPHOST "  MonoServerPath default /usr/lib/mono/2.0/mod-mono-server2.exe\n";
     print TEMPHOST "  AddType application/x-asp-net .aspx .ashx .asmx .ascx .asax .config .ascx\n";
-    print TEMPHOST "  MonoApplicationsConfigDir /etc/mono-server2\n";
-    print TEMPHOST "  MonoPath \n";
+    print TEMPHOST "  MonoApplicationsConfigDir default /etc/mono-server2\n";
+    print TEMPHOST "  MonoPath default \n";
 
     close(TEMPHOST);