[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 faec1a1922d22f65b6d787a031195757530a09aa
Author: Jo Shields <directhex at apebox.org>
Date:   Sun Mar 27 12:55:05 2011 +0100

    Port dh_installxsp to handle XSP 2 and 4, not 1 and 2

diff --git a/debian/dh_installxsp b/debian/dh_installxsp
index e285a97..6afb627 100755
--- a/debian/dh_installxsp
+++ b/debian/dh_installxsp
@@ -17,13 +17,13 @@ B<dh_installxsp> [S<B<debhelper options>>] [B<--name=>I<name>] [B<-V >I<version(
 =head1 DESCRIPTION
 
 dh_installxsp is a debhelper program that will install host
-configuration files in /etc/xsp/conf.d and /etc/mono-server/conf.d
-(for XSP) or /etc/xsp2/conf.d and /etc/mono-server2/conf.d (for XSP
-2). So, if xsp (or xsp 2) is install or will be installed, when xsp
+configuration files in /etc/xsp2/conf.d and /etc/mono-server2/conf.d
+(for XSP 2) or /etc/xsp4/conf.d and /etc/mono-server4/conf.d (for XSP
+4). So, if xsp 2 (or xsp 4) is install or will be installed, when xsp
 starts it automatically starts the daemon with the host file.
 
-The files debian/package.hostxsp are installed for XSP while
-debian/package.hostxsp2 are used for XSP 2.
+The files debian/package.hostxsp2 are installed for XSP 2 while
+debian/package.hostxsp4 are used for XSP 4.
 
 In the debian/rules file, dh_installxsp needs to be called before
 dh_installdeb to make sure the files are properly marked as conffiles
@@ -36,14 +36,14 @@ need to be marked as conffiles.
 
 =item B<--name=>I<name>
 
-Look for files named debian/package.hostxsp and install them as
-/etc/xsp/conf.d/package/hostfile.
+Look for files named debian/package.hostxsp{2,4} and install them as
+/etc/xsp{2,4}/conf.d/package/hostfile.
 
 =item B<-V >I<version(s)>
 
-Installs the files for XSP (B<-V 1>), XSP 2.0 (B<-V 2>), or both (B<-V
-1,2>). If this version is not specified (or just B<-V> is given), this
-only installed files for XSP, not XSP 2.
+Installs the files for XSP 2.0 (B<-V 2>), XSP 4.0 (B<-V 4>), or both (B<-V
+2,4>). If this version is not specified (or just B<-V> is given), this
+only installed files for XSP 4, not XSP 2.
 
 =back
 
@@ -53,11 +53,11 @@ only installed files for XSP, not XSP 2.
 init();
 
 # Figure out what versions we want to install
-my ($install_xsp_1, $install_xsp_2) = (0, 0);
-$install_xsp_1 = 1 if ($dh{V_FLAG_SET} && $dh{V_FLAG} =~ /1/);
+my ($install_xsp_2, $install_xsp_4) = (0, 0);
 $install_xsp_2 = 1 if ($dh{V_FLAG_SET} && $dh{V_FLAG} =~ /2/);
-$install_xsp_1 = 1 if !$install_xsp_1 && !$install_xsp_2;
-$install_xsp_1 = 1 unless $dh{V_FLAG_SET};
+$install_xsp_4 = 1 if ($dh{V_FLAG_SET} && $dh{V_FLAG} =~ /4/);
+$install_xsp_4 = 1 if !$install_xsp_2 && !$install_xsp_4;
+$install_xsp_4 = 1 unless $dh{V_FLAG_SET};
 
 my $depname="cli:XspServer";
 
@@ -66,13 +66,13 @@ my $depname="cli:XspServer";
 # pass.
 foreach my $package (@{$dh{DOPACKAGES}})
 {
-    # Configure for both XSP and/or XSP 2
-    process_xsp($package, "1") if $install_xsp_1;
+    # Configure for both XSP 2 and/or XSP 4
     process_xsp($package, "2") if $install_xsp_2;
+    process_xsp($package, "4") if $install_xsp_4;
 }
 
 # This handles the installation of the actual files. This assumes that
-# $version has "" or "2" (or "3" at some point) and that determines
+# $version has "2" or "4" (or "5" at some point) and that determines
 # the path being installed into.
 sub process_xsp
 {
@@ -90,7 +90,7 @@ sub process_xsp
 	# Delete it for idempotency
 	delsubstvar($package, $depname);
 	addsubstvar($package, $depname,
-		    "mono-xsp$version | mono-apache-server$version");
+		    "mono-xsp$version | mono-apache-server$version | mono-fastcgi-server$version");
 
 	# Check for the installation directory
 	for my $d1 (("xsp$version", "mono-server$version"))
@@ -140,6 +140,7 @@ This program is a part of mono-utils.
 
 Originally written by Pablo Fischer <pablo at pablo.com.mx>. Modified by
 Dylan R. E. Moonfire <debian at mfgames.com> to handle XSP and XSP 2
-installation.
+installation. Modified by Jo Shields <directhex at apebox.org> to drop XSP
+and add XSP 4.
 
 =cut

-- 
xsp