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

Jo Shields directhex at apebox.org
Mon Mar 28 07:59:41 UTC 2011


The following commit has been merged in the master branch:
commit 16c8c5320ca83fa6648b1fafb3b2799e01abd15d
Author: Jo Shields <directhex at apebox.org>
Date:   Sun Mar 27 19:30:50 2011 +0100

    Unify ASP.NET examples under a single package, hosted by XSP 4

diff --git a/debian/asp.net-examples.README.Debian b/debian/asp.net-examples.README.Debian
index e5e2912..4a79a7e 100644
--- a/debian/asp.net-examples.README.Debian
+++ b/debian/asp.net-examples.README.Debian
@@ -2,12 +2,12 @@ asp.net-examples for Debian
 ----------------------------
 
 This package contains example ASP.NET applications. The examples are
-installed in /usr/share/asp.net-demos/asp/
+installed in /usr/share/asp.net-demos/.
 
-If you are using the standalone XSP server, you can access the examples at
+If you are using the standalone XSP4 server, you can access the examples at
 http://localhost:8080/samples
 
 If you are using mod_mono to run ASP.NET applications via Apache, you can
 access the examples at http://localhost/samples
 
- -- Fabian Fagerholm <fabbe at paniq.net>, Fri,  6 Aug 2004 12:00:12 +0300
+ -- Jo Shields <directhex at apebox.org>, Sun, 27 Mar 2011 19:28:29 +0100
diff --git a/debian/asp.net-examples.hostxsp1 b/debian/asp.net-examples.hostxsp4
similarity index 82%
rename from debian/asp.net-examples.hostxsp1
rename to debian/asp.net-examples.hostxsp4
index 4ccc726..ff4def8 100644
--- a/debian/asp.net-examples.hostxsp1
+++ b/debian/asp.net-examples.hostxsp4
@@ -2,4 +2,4 @@
 # for the aspnet-examples virtualhost
 path = /usr/share/asp.net-demos
 alias = /samples
-libs = /usr/lib/mono/1.0
+libs = /usr/lib/mono/4.0
diff --git a/debian/asp.net2-examples.README.Debian b/debian/asp.net2-examples.README.Debian
deleted file mode 100644
index 4334c03..0000000
--- a/debian/asp.net2-examples.README.Debian
+++ /dev/null
@@ -1,16 +0,0 @@
-asp.net-examples for Debian
-----------------------------
-
-This package contains example ASP.NET 2.0 applications. The examples are
-installed in /usr/share/asp.net2-demos/.
-
-If you are using the standalone XSP2 server, you can access the examples at
-http://localhost:8080/samples
-
-If you are using mod_mono to run ASP.NET applications via Apache, you can
-access the examples at http://localhost/samples
-
-Be sure to make sure xsp2 is running instead of xsp or you will
-encounter errors.
-
- -- Dylan R. E. Moonfire <debian at mfgames.com>, Thu, 21 Jul 2005 11:49:29 -0500
diff --git a/debian/asp.net2-examples.hostxsp2 b/debian/asp.net2-examples.hostxsp2
deleted file mode 100644
index bf31b0f..0000000
--- a/debian/asp.net2-examples.hostxsp2
+++ /dev/null
@@ -1,5 +0,0 @@
-# This is the configuration file
-# for the aspnet-examples virtualhost
-path = /usr/share/asp.net2-demos
-alias = /samples
-libs = /usr/lib/mono/2.0
diff --git a/debian/asp.net2-examples.install b/debian/asp.net2-examples.install
deleted file mode 100644
index 27734b6..0000000
--- a/debian/asp.net2-examples.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/share/asp.net2-demos
diff --git a/debian/control b/debian/control
index 9b37568..16800a3 100644
--- a/debian/control
+++ b/debian/control
@@ -65,17 +65,11 @@ Description: simple web server to run ASP.NET applications - default version
 
 Package: asp.net-examples
 Architecture: all
-Depends: ${misc:Depends}, ${cli:Depends}, ${cli:XspServer1}
-Description: demo pages for ASP.NET 1.1 infrastructure
+Depends: ${misc:Depends}, ${cli:Depends}, ${cli:XspServer4}
+Replaces: 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. This does not include the ASP.NET 2.0 examples.
-
-Package: asp.net2-examples
-Architecture: all
-Depends: ${misc:Depends}, ${cli:Depends}, ${cli:XspServer2}
-Description: demo pages for ASP.NET 1.1 and 2.0 infrastructure
- Sample set of .aspx pages to test the XSP server or the mod_mono Apache
- module. This is for the xsp2 and includes the 2.0 modules.
+ module.
 
 Package: mono-apache-server1
 Architecture: all

-- 
xsp



More information about the Pkg-mono-svn-commits mailing list