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

[Jo Shields]

The following commit has been merged in the master branch:
commit 2de6042b08127e0f11fc2d078ee548e46db264e8
Author: Jo Shields <directhex at apebox.org>
Date:   Sat Apr 2 15:40:07 2011 +0100

    Add a conflicts, since we want to force removal of asp.net2-examples

diff --git a/debian/control b/debian/control
index fc75049..695b553 100644
--- a/debian/control
+++ b/debian/control
@@ -75,6 +75,7 @@ Package: asp.net-examples
 Architecture: all
 Depends: ${misc:Depends}, ${cli:Depends}, ${cli:XspServer2}
 Replaces: asp.net2-examples
+Conflicts: asp.net2-examples
 Description: demo pages for ASP.NET infrastructure
  Sample set of .aspx pages to test the XSP server or the mod_mono Apache
  module.

-- 
xsp