[Pkg-mono-svn-commits] rev 4024 - mod-mono/trunk/debian

[Jo Shields]

Author: directhex-guest
Date: 2009-07-14 15:59:52 +0000 (Tue, 14 Jul 2009)
New Revision: 4024

Modified:
   mod-mono/trunk/debian/changelog
   mod-mono/trunk/debian/control
   mod-mono/trunk/debian/libapache2-mod-mono.conf
   mod-mono/trunk/debian/libapache2-mod-mono.config
   mod-mono/trunk/debian/libapache2-mod-mono.templates
Log:
  TRANSLATION SHIZZLE NOT READY YET

  * New upstream release
  * debian/rules:
    + Implement a get-orig-source rule
  * debian/control:
    + Bump standards version to latest version (No changes needed)
    + Alter dependencies for new mono-runtime package in Mono 2.4.
    + Alter dependencies to pull in the "default" ASP.NET version
      for preference, with explicit 2.0 or 1.1 as options
  * debian/libapache2-mod-mono.conf,
    debian/libapache2-mod-mono.config:
    + Update for new executable names
  * debian/libapache2-mod-mono.templates:
    + ASP.NET 2.0 is default now, and option names have changed


Modified: mod-mono/trunk/debian/changelog
===================================================================
--- mod-mono/trunk/debian/changelog	2009-07-13 00:12:39 UTC (rev 4023)
+++ mod-mono/trunk/debian/changelog	2009-07-14 15:59:52 UTC (rev 4024)
@@ -1,13 +1,22 @@
-mod-mono (2.4-1) UNRELEASED; urgency=low
+mod-mono (2.4.2-1) UNRELEASED; urgency=low
 
+  TRANSLATION SHIZZLE NOT READY YET
+
   * New upstream release
   * debian/rules:
     + Implement a get-orig-source rule
   * debian/control:
-    + Bump standards version to latest version
+    + Bump standards version to latest version (No changes needed)
     + Alter dependencies for new mono-runtime package in Mono 2.4.
+    + Alter dependencies to pull in the "default" ASP.NET version
+      for preference, with explicit 2.0 or 1.1 as options
+  * debian/libapache2-mod-mono.conf,
+    debian/libapache2-mod-mono.config:
+    + Update for new executable names
+  * debian/libapache2-mod-mono.templates:
+    + ASP.NET 2.0 is default now, and option names have changed
 
- -- Jo Shields <directhex at apebox.org>  Wed, 03 Jun 2009 11:30:52 +0100
+ -- Jo Shields <directhex at apebox.org>  Tue, 14 Jul 2009 15:21:23 +0100
 
 mod-mono (2.0-2) unstable; urgency=low
 

Modified: mod-mono/trunk/debian/control
===================================================================
--- mod-mono/trunk/debian/control	2009-07-13 00:12:39 UTC (rev 4023)
+++ mod-mono/trunk/debian/control	2009-07-14 15:59:52 UTC (rev 4024)
@@ -7,12 +7,12 @@
 Maintainer: Debian Mono Group <pkg-mono-group at lists.alioth.debian.org>
 Uploaders: Dylan R. E. Moonfire <debian at mfgames.com>, Mirco Bauer <meebey at debian.org>, Jo Shields <directhex at apebox.org>
 Build-Depends: debhelper (>= 4.1.16), apache2-threaded-dev (>= 2.2), libmono-dev, po-debconf
-Standards-Version: 3.8.1
+Standards-Version: 3.8.2
 
 Package: libapache2-mod-mono
 Architecture: any
 Section: web
-Depends: ${shlibs:Depends}, debconf (>= 1.2.0), apache2.2-common, mono-runtime (>= 2.4), mono-apache-server (>= ${current-version}) | mono-apache-server2 (>= ${current-version}), mono-apache-server (<< ${next-version}) | mono-apache-server2 (<< ${next-version})
+Depends: ${shlibs:Depends}, debconf (>= 1.2.0), apache2.2-common, mono-runtime (>= 2.4), mono-apache-server (>= ${current-version}) | mono-apache-server2 (>= ${current-version}) | mono-apache-server1 (>= ${current-version}), mono-apache-server (<< ${next-version}) | mono-apache-server2 (<< ${next-version}) | mono-apache-server1 (<< ${next-version})
 Description: Apache module for running ASP.NET applications on Mono
  The mod_mono module for Apache allows ASP.NET web applications to be
  run with the Mono .NET implementation.

Modified: mod-mono/trunk/debian/libapache2-mod-mono.conf
===================================================================
--- mod-mono/trunk/debian/libapache2-mod-mono.conf	2009-07-13 00:12:39 UTC (rev 4023)
+++ mod-mono/trunk/debian/libapache2-mod-mono.conf	2009-07-14 15:59:52 UTC (rev 4024)
@@ -9,4 +9,4 @@
 # If you want to use ASP.NET 2.0 (via mono-apache-server2), use:
 # Include /etc/mono-server2/mono-server2-hosts.conf
 
-Include /etc/mono-server/mono-server-hosts.conf
+Include /etc/mono-server2/mono-server2-hosts.conf

Modified: mod-mono/trunk/debian/libapache2-mod-mono.config
===================================================================
--- mod-mono/trunk/debian/libapache2-mod-mono.config	2009-07-13 00:12:39 UTC (rev 4023)
+++ mod-mono/trunk/debian/libapache2-mod-mono.config	2009-07-14 15:59:52 UTC (rev 4024)
@@ -11,11 +11,11 @@
 USE_MONO_SERVER=none
 
 if [ -x /usr/bin/mod-mono-server ]; then
-    USE_MONO_SERVER=mod-mono-server
+    USE_MONO_SERVER=mod-mono-server1
 fi
 
 if [ -x /usr/bin/mod-mono-server2 ]; then
-    if [ -x /usr/bin/mod-mono-server ]; then
+    if [ -x /usr/bin/mod-mono-server1 ]; then
 	USE_MONO_SERVER=ask
     else
 	USE_MONO_SERVER=mod-mono-server2
@@ -59,7 +59,7 @@
 case "$USE_MONO_SERVER" in
     none)
 	# Can't find anything
-	echo "Either mono-apache-server or mono-apache-server2 needs "
+	echo "Either mono-apache-server1 or mono-apache-server2 needs "
 	echo "to be installed."
 	exit 1
 	;;

Modified: mod-mono/trunk/debian/libapache2-mod-mono.templates
===================================================================
--- mod-mono/trunk/debian/libapache2-mod-mono.templates	2009-07-13 00:12:39 UTC (rev 4023)
+++ mod-mono/trunk/debian/libapache2-mod-mono.templates	2009-07-14 15:59:52 UTC (rev 4024)
@@ -9,9 +9,10 @@
 
 Template: libapache2-mod-mono/mono-server
 Type: select
-Choices: mod-mono-server, mod-mono-server2
+Choices: mod-mono-server1, mod-mono-server2
+Default: mod-mono-server2
 _Description: Mono server to use:
  The libapache2-mod-mono module can be used with one of two different
  Mono ASP.NET backends:
-  - mod-mono-server : implements ASP.NET 1.1 features;
+  - mod-mono-server1: implements ASP.NET 1.1 features;
   - mod-mono-server2: implements ASP.NET 2.0 features.