[Pkg-mono-svn-commits] [SCM] xsp branch, master, updated. debian/2.6.5-3-42-g87885a0

[Jo Shields]

The following commit has been merged in the master branch:
commit 6b912dc39329e4b3323671c33ab7f787568e6ea3
Author: Jo Shields <directhex at apebox.org>
Date:   Sun Mar 27 20:23:49 2011 +0100

    Add symlinks to default versions of our apache mangling tools to the default versions package, mono-apache-server. Since the names of some commands are recycled from mono-apache-server1, add a Conflicts/Replaces

diff --git a/debian/control b/debian/control
index 168d11d..4155e38 100644
--- a/debian/control
+++ b/debian/control
@@ -95,8 +95,8 @@ Description: ASP.NET 2.0 backend for mod_mono2 Apache module
 
 Package: mono-apache-server
 Architecture: all
-Conflicts: mono-server
-Replaces: mono-server
+Conflicts: mono-server, mono-apache-server1
+Replaces: mono-server, mono-apache-server1
 Depends: mono-apache-server4 (= ${source:Version}), ${misc:Depends}
 Description: ASP.NET backend for mod_mono Apache module - default version
  mono-apache-server contains the backend for mod_mono. It lets you run ASP.NET
diff --git a/debian/mono-apache-server.links b/debian/mono-apache-server.links
index 315d63a..39b7c6c 100644
--- a/debian/mono-apache-server.links
+++ b/debian/mono-apache-server.links
@@ -1,2 +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/share/man/man1/mod-mono-server4.1.gz usr/share/man/man1/mod-mono-server.1.gz

-- 
xsp