[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 9e2a65ae0fbf1fe2b7549ed565091e99a43ee6cf
Author: Jo Shields <directhex at apebox.org>
Date:   Sun Mar 27 21:26:41 2011 +0100

    Move XSP4 features into a new mono-xsp4-base package, and rename mono-xsp-base to dh-xsp since it only contains dh_installxsp.

diff --git a/debian/control b/debian/control
index 4155e38..b78f81c 100644
--- a/debian/control
+++ b/debian/control
@@ -14,10 +14,11 @@ Homepage: http://www.mono-project.com/ASP.NET
 Vcs-Git: git://git.debian.org/git/pkg-mono/packages/xsp.git
 Vcs-Browser: http://git.debian.org/?p=pkg-mono/packages/xsp.git
 
-Package: mono-xsp-base
+Package: dh-xsp
 Architecture: all
-Depends: ${misc:Depends}, ${cli:Depends}, mono-devel, mono-1.0-devel, libmono-system-web1.0-cil (>= ${mono-abi-comp-version})
-Conflicts: mono-utils (<= 1.1.9.2-1)
+Depends: ${misc:Depends}
+Conflicts: mono-utils (<= 1.1.9.2-1), mono-xsp-base
+Replaces: mono-xsp-base
 Description: base libraries for XSP 1.1
  This is the core libraries needed to install the XSP application,
  either through the standalone XSP version (mono-xsp) or the Apache module
@@ -31,6 +32,14 @@ Description: base libraries for XSP 2.0
  either through the standalone XSP version (mono-xsp2) or the Apache module
  (mono-apache-server2).
 
+Package: mono-xsp4-base
+Architecture: all
+Depends: ${misc:Depends}, ${cli:Depends}, mono-devel, libmono-system-web4.0-cil (>= ${mono-abi-comp-version})
+Description: base libraries for XSP 4.0
+ This is the core libraries needed to install the XSP4 application,
+ either through the standalone XSP version (mono-xsp4) or the Apache module
+ (mono-apache-server4).
+
 Package: mono-xsp1
 Architecture: all
 Depends: ${misc:Depends}, ${cli:Depends}, mono-xsp-base (= ${source:Version}), procps
diff --git a/debian/mono-xsp-base.install b/debian/dh-xsp.install
similarity index 67%
rename from debian/mono-xsp-base.install
rename to debian/dh-xsp.install
index 93f87ef..3cb7efc 100644
--- a/debian/mono-xsp-base.install
+++ b/debian/dh-xsp.install
@@ -1,6 +1,3 @@
-debian/tmp/usr/lib/mono/1.0/Mono.WebServer.dll
-debian/tmp/usr/lib/mono/gac/Mono.WebServer
-debian/tmp/usr/lib/pkgconfig/xsp.pc
 debian/dh_installxsp /usr/bin
 debian/postrm-monoxsp1 /usr/share/debhelper/autoscripts
 debian/postrm-monoxsp2 /usr/share/debhelper/autoscripts
diff --git a/debian/mono-xsp-base.manpages b/debian/dh-xsp.manpages
similarity index 100%
rename from debian/mono-xsp-base.manpages
rename to debian/dh-xsp.manpages
diff --git a/debian/mono-xsp4-base.install b/debian/mono-xsp4-base.install
new file mode 100644
index 0000000..5c7412f
--- /dev/null
+++ b/debian/mono-xsp4-base.install
@@ -0,0 +1,3 @@
+debian/tmp/usr/lib/mono/4.0/Mono.WebServer4.dll
+debian/tmp/usr/lib/mono/gac/Mono.WebServer4
+debian/tmp/usr/lib/pkgconfig/xsp-4.pc

-- 
xsp