[Pkg-mono-svn-commits] rev 3594 - xsp/trunk/debian
Mirco Bauer
meebey at alioth.debian.org
Sun Feb 17 22:51:13 UTC 2008
Author: meebey
Date: 2008-02-17 22:51:11 +0000 (Sun, 17 Feb 2008)
New Revision: 3594
Added:
xsp/trunk/debian/mono-apache-server2.templates
Removed:
xsp/trunk/debian/mono-apache-server.postrm
xsp/trunk/debian/mono-apache-server2.postrm
Modified:
xsp/trunk/debian/TODO
xsp/trunk/debian/changelog
xsp/trunk/debian/control
xsp/trunk/debian/mono-apache-server.config
xsp/trunk/debian/mono-apache-server.default
xsp/trunk/debian/mono-apache-server.postinst
xsp/trunk/debian/mono-apache-server.templates
xsp/trunk/debian/mono-apache-server2.default
xsp/trunk/debian/mono-apache-server2.postinst
xsp/trunk/debian/mono-xsp.init
xsp/trunk/debian/mono-xsp.postinst
xsp/trunk/debian/mono-xsp.postrm
xsp/trunk/debian/mono-xsp.preinst
xsp/trunk/debian/mono-xsp.prerm
xsp/trunk/debian/mono-xsp2.init
xsp/trunk/debian/mono-xsp2.postinst
xsp/trunk/debian/mono-xsp2.postrm
xsp/trunk/debian/mono-xsp2.preinst
xsp/trunk/debian/mono-xsp2.prerm
xsp/trunk/debian/watch
Log:
lots of love goes to: xsp 1.2.5-2
Modified: xsp/trunk/debian/TODO
===================================================================
--- xsp/trunk/debian/TODO 2008-02-04 21:11:58 UTC (rev 3593)
+++ xsp/trunk/debian/TODO 2008-02-17 22:51:11 UTC (rev 3594)
@@ -1,4 +1,3 @@
-
TODO for xsp
------------
Modified: xsp/trunk/debian/changelog
===================================================================
--- xsp/trunk/debian/changelog 2008-02-04 21:11:58 UTC (rev 3593)
+++ xsp/trunk/debian/changelog 2008-02-17 22:51:11 UTC (rev 3594)
@@ -1,12 +1,36 @@
-xsp (1.2.5-2) unstable; urgency=low
+xsp (1.2.5-2) unstable; urgency=medium
- * NOT RELEASED YET
- * mono-server(2)-update:
+ * The "get sexy and ready for lenny" release
+ * New upstream release
+ * debian/mono-server(2)-update:
+ Use shell wrapper scripts (/usr/bin/mod-mono-server(2)) instead of
assemblies (/usr/lib/mono/{1,2}.0/mod-mono-server(2).exe), as that
required BINFMT.
+ * debian/control:
+ + Added libmono-system-web{1,2}.0-cil and libmono-security{1,2}.0-cil to
+ build dependencies, fixing FTBFS. Thus urgency set to medium.
+ (Closes: #458709)
+ + Added Homepage, Vcs-Browser and Vcs-Svn fields.
+ + Added ${misc:Depends} for automatic debconf dependecies.
+ * debian/mono-xsp(2).init:
+ + Create /var/run/mono-xsp automatically if it doesn't exist.
+ * debian/mono-apache-server(2).postinst:
+ + Removed, db_purge for debconf is automatically handled.
+ * debian/mono-xsp(2).postrm:
+ + Remove /etc/xsp2/debian.webapp when being purged.
+ (Closes: #454378, Closes: #454709)
+ * debian/mono-apache-server2.templates:
+ + Added missing debconf integration for mono-apache-server2.
+ * debian/*.preinst
+ debian/*.postinst
+ debian/*.prerm
+ debian/*.postrm:
+ + Fixed various error handling or rather hiding, and overkill usage of
+ "rm -Rf ..."
+ * debian/watch:
+ + Converted to version 3.
- -- Mirco Bauer <meebey at debian.org> Tue, 29 Jan 2008 18:37:59 +0100
+ -- Mirco Bauer <meebey at debian.org> Sun, 17 Feb 2008 23:46:34 +0100
xsp (1.2.5-1) unstable; urgency=low
Modified: xsp/trunk/debian/control
===================================================================
--- xsp/trunk/debian/control 2008-02-04 21:11:58 UTC (rev 3593)
+++ xsp/trunk/debian/control 2008-02-17 22:51:11 UTC (rev 3594)
@@ -2,14 +2,25 @@
Section: web
Priority: optional
Maintainer: Debian Mono Group <pkg-mono-group at lists.alioth.debian.org>
-Uploaders: Dylan R. E. Moonfire <debian at mfgames.com>
-Standards-Version: 3.7.2
-Build-Depends: debhelper (>= 5.0.0), po-debconf, dpatch
-Build-Depends-Indep: autotools-dev, mono-gmcs, mono-mcs, mono-gac, libmono-dev, cli-common-dev (>= 0.4.4)
+Uploaders: Dylan R. E. Moonfire <debian at mfgames.com>, Mirco Bauer <meebey at debian.org>
+Build-Depends: debhelper (>= 5.0.0), po-debconf, dpatch, autotools-dev
+Build-Depends-Indep: cli-common-dev (>= 0.5.4),
+ mono-gmcs,
+ mono-mcs,
+ mono-gac,
+ libmono-dev,
+ libmono-system-web1.0-cil,
+ libmono-system-web2.0-cil,
+ libmono-security1.0-cil,
+ libmono-security2.0-cil
+Standards-Version: 3.7.3
+Homepage: http://www.mono-project.com/ASP.NET
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-mono/xsp/trunk/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-mono/xsp/trunk/
Package: mono-xsp-base
Architecture: all
-Depends: ${cli:Depends}, mono-mcs, libmono-system-web1.0-cil (>= ${mono-abi-comp-version})
+Depends: ${misc:Depends}, ${cli:Depends}, mono-mcs, libmono-system-web1.0-cil (>= ${mono-abi-comp-version})
Conflicts: mono-utils (<= 1.1.9.2-1)
Description: base libraries for XSP 1.1
This is the core libraries needed to install the XSP application,
@@ -18,7 +29,7 @@
Package: mono-xsp2-base
Architecture: all
-Depends: ${cli:Depends}, mono-gmcs, libmono-system-web2.0-cil (>= ${mono-abi-comp-version})
+Depends: ${misc:Depends}, ${cli:Depends}, mono-gmcs, libmono-system-web2.0-cil (>= ${mono-abi-comp-version})
Description: base libraries for XSP 2.0
This is the core libraries needed to install the XSP2 application,
either through the standalone version (XSP2) or the Apache module
@@ -26,7 +37,7 @@
Package: mono-xsp
Architecture: all
-Depends: ${cli:Depends}, debconf (>= 1.2.0) | debconf-2.0, net-tools, mono-xsp-base (= ${source:Version}), procps
+Depends: ${misc:Depends}, ${cli:Depends}, net-tools, mono-xsp-base (= ${source:Version}), procps
Description: simple web server to run ASP.NET applications
XSP is a simple web server written in C# that can be used to run your
ASP.NET 1.1 applications.
@@ -36,7 +47,7 @@
Package: mono-xsp2
Architecture: all
-Depends: ${cli:Depends}, debconf (>= 1.2.0) | debconf-2.0, net-tools, mono-xsp2-base (= ${source:Version}), procps
+Depends: ${misc:Depends}, ${cli:Depends}, net-tools, mono-xsp2-base (= ${source:Version}), procps
Description: simple web server to run ASP.NET applications
XSP is a simple web server written in C# that can be used to run your
ASP.NET 1.1 and 2.0 applications.
@@ -46,14 +57,14 @@
Package: asp.net-examples
Architecture: all
-Depends: ${cli:Depends}, ${cli:XspServer}
+Depends: ${misc:Depends}, ${cli:Depends}, ${cli:XspServer}
Description: demo pages for ASP.NET 1.1 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: ${cli:Depends}, ${cli:XspServer2}
+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.
@@ -62,7 +73,7 @@
Architecture: all
Conflicts: mono-server
Replaces: mono-server
-Depends: ${cli:Depends}, debconf (>= 1.2.0) | debconf-2.0, net-tools, mono-xsp-base (= ${source:Version}), perl-modules
+Depends: ${misc:Depends}, ${cli:Depends}, net-tools, mono-xsp-base (= ${source:Version}), perl-modules
Description: backend for mod_mono Apache module
mono-apache-server contains the backend for mod_mono. It lets you run ASP.NET
web applications via Apache. mod_mono will call mono-apache-server to parse
@@ -75,7 +86,7 @@
Architecture: all
Conflicts: mono-server
Replaces: mono-server
-Depends: ${cli:Depends}, debconf (>= 1.2.0) | debconf-2.0, net-tools, mono-xsp2-base (= ${source:Version}), perl-modules
+Depends: ${misc:Depends}, ${cli:Depends}, net-tools, mono-xsp2-base (= ${source:Version}), perl-modules
Description: backend for mod_mono2 Apache module
mono-apache-server contains the backend for mod_mono. It lets you run ASP.NET
web applications via Apache. mod_mono will call mono-apache-server to parse
Property changes on: xsp/trunk/debian/mono-apache-server.config
___________________________________________________________________
Name: svn:executable
- *
Modified: xsp/trunk/debian/mono-apache-server.default
===================================================================
--- xsp/trunk/debian/mono-apache-server.default 2008-02-04 21:11:58 UTC (rev 3593)
+++ xsp/trunk/debian/mono-apache-server.default 2008-02-17 22:51:11 UTC (rev 3594)
@@ -1,7 +1,4 @@
-# Defaults for mono-server
+# Defaults for mono-apache-server
-# Should mono-server start apache?
+# Should mono-apache-server start apache?
start_apache=false
-
-
-
Modified: xsp/trunk/debian/mono-apache-server.postinst
===================================================================
--- xsp/trunk/debian/mono-apache-server.postinst 2008-02-04 21:11:58 UTC (rev 3593)
+++ xsp/trunk/debian/mono-apache-server.postinst 2008-02-17 22:51:11 UTC (rev 3594)
@@ -1,33 +1,31 @@
-#! /bin/sh
-
+#!/bin/sh
set -e
. /usr/share/debconf/confmodule
db_version 2.0
-tempfile=`/bin/tempfile`
modmono_default="/etc/default/mono-apache-server"
restart_apache_on() {
sed s/start_apache=false/start_apache=true/g $modmono_default > $tempfile
- cp -f $tempfile $modmono_default
- rm -Rf $tempfile
+ cp $tempfile $modmono_default
}
restart_apache_off() {
sed s/start_apache=true/start_apache=false/g $modmono_default > $tempfile
- cp -f $tempfile $modmono_default
- rm -Rf $tempfile
+ cp $tempfile $modmono_default
}
daemon_turn_off() {
- if [ -x "/etc/init.d/mono-server" ]; then
- update-rc.d -f mono-server remove >/dev/null
+ if [ -x /etc/init.d/mono-server ]; then
+ update-rc.d -f mono-server remove > /dev/null
fi
}
case "$1" in
configure)
+ tempfile=$(/bin/tempfile)
+
db_get monoserver/monoserver_restartapache || true
daemon_turn_off
if [ "$RET" = "true" ]; then
@@ -38,23 +36,10 @@
mono-server-update
+ rm $tempfile
;;
-
- *)
- echo "postinst failed \`$1'" >&2
- exit 0
- ;;
esac
#DEBHELPER#
exit 0
-
-
-
-
-
-
-
-
-
Property changes on: xsp/trunk/debian/mono-apache-server.postinst
___________________________________________________________________
Name: svn:executable
- *
Deleted: xsp/trunk/debian/mono-apache-server.postrm
===================================================================
--- xsp/trunk/debian/mono-apache-server.postrm 2008-02-04 21:11:58 UTC (rev 3593)
+++ xsp/trunk/debian/mono-apache-server.postrm 2008-02-17 22:51:11 UTC (rev 3594)
@@ -1,17 +0,0 @@
-#!/bin/bash -e
-
-monoserverconfd="/etc/mono-server/conf.d/"
-
-case "$1" in
- purge)
- rm -Rf "$monoserverconfd/*"
- if [ -f /usr/share/debconf/confmodule ]; then
- . /usr/share/debconf/confmodule
- db_purge
- fi
- ;;
- esac
-
-#DEBHELPER#
-
-exit 0
Modified: xsp/trunk/debian/mono-apache-server.templates
===================================================================
--- xsp/trunk/debian/mono-apache-server.templates 2008-02-04 21:11:58 UTC (rev 3593)
+++ xsp/trunk/debian/mono-apache-server.templates 2008-02-17 22:51:11 UTC (rev 3594)
@@ -3,7 +3,7 @@
Default: true
_Description: Let mono-apache-server restart Apache?
The debian version of mono-apache-server includes a
- mono-server-update.conf script that creates a configuration file for
- apache to start the ASP.NET applications, and mono-server-update.conf can
+ mono-server-update script that creates a configuration file for
+ apache to start the ASP.NET applications, and mono-server-update can
restart apache if there's a new configuration file
(/etc/mono-server/mono-server-hosts.conf). If this is true, then apache will be restarted when there is a new mono-server-hosts.conf file.
Modified: xsp/trunk/debian/mono-apache-server2.default
===================================================================
--- xsp/trunk/debian/mono-apache-server2.default 2008-02-04 21:11:58 UTC (rev 3593)
+++ xsp/trunk/debian/mono-apache-server2.default 2008-02-17 22:51:11 UTC (rev 3594)
@@ -1,4 +1,4 @@
-# Defaults for mono-server
+# Defaults for mono-apache-server2
-# Should mono-server2 start apache?
+# Should mono-apache-server2 start apache?
start_apache=false
Modified: xsp/trunk/debian/mono-apache-server2.postinst
===================================================================
--- xsp/trunk/debian/mono-apache-server2.postinst 2008-02-04 21:11:58 UTC (rev 3593)
+++ xsp/trunk/debian/mono-apache-server2.postinst 2008-02-17 22:51:11 UTC (rev 3594)
@@ -1,33 +1,31 @@
-#! /bin/sh
-
+#!/bin/sh
set -e
. /usr/share/debconf/confmodule
db_version 2.0
-tempfile=`/bin/tempfile`
modmono_default="/etc/default/mono-apache-server2"
restart_apache_on() {
sed s/start_apache=false/start_apache=true/g $modmono_default > $tempfile
- cp -f $tempfile $modmono_default
- rm -Rf $tempfile
+ cp $tempfile $modmono_default
}
restart_apache_off() {
sed s/start_apache=true/start_apache=false/g $modmono_default > $tempfile
- cp -f $tempfile $modmono_default
- rm -Rf $tempfile
+ cp $tempfile $modmono_default
}
daemon_turn_off() {
- if [ -x "/etc/init.d/mono-server2" ]; then
- update-rc.d -f mono-server2 remove >/dev/null
+ if [ -x /etc/init.d/mono-server2 ]; then
+ update-rc.d -f mono-server2 remove > /dev/null
fi
}
case "$1" in
configure)
+ tempfile=$(/bin/tempfile)
+
db_get monoserver2/monoserver2_restartapache || true
daemon_turn_off
if [ "$RET" = "true" ]; then
@@ -37,13 +35,8 @@
fi
mono-server2-update
-
+ rm $tempfile
;;
-
- *)
- echo "postinst failed \`$1'" >&2
- exit 0
- ;;
esac
#DEBHELPER#
Deleted: xsp/trunk/debian/mono-apache-server2.postrm
===================================================================
--- xsp/trunk/debian/mono-apache-server2.postrm 2008-02-04 21:11:58 UTC (rev 3593)
+++ xsp/trunk/debian/mono-apache-server2.postrm 2008-02-17 22:51:11 UTC (rev 3594)
@@ -1,17 +0,0 @@
-#!/bin/sh -e
-
-monoserver2confd="/etc/mono-server2/conf.d/"
-
-case "$1" in
- purge)
- rm -Rf "$monoserver2confd/*"
- if [ -f /usr/share/debconf/confmodule ]; then
- . /usr/share/debconf/confmodule
- db_purge
- fi
- ;;
- esac
-
-#DEBHELPER#
-
-exit 0
Copied: xsp/trunk/debian/mono-apache-server2.templates (from rev 3593, xsp/trunk/debian/mono-apache-server.templates)
===================================================================
--- xsp/trunk/debian/mono-apache-server2.templates (rev 0)
+++ xsp/trunk/debian/mono-apache-server2.templates 2008-02-17 22:51:11 UTC (rev 3594)
@@ -0,0 +1,9 @@
+Template: monoserver2/monoserver2_restartapache
+Type: boolean
+Default: true
+_Description: Let mono-apache-server2 restart Apache?
+ The debian version of mono-apache-server2 includes a
+ mono-server2-update script that creates a configuration file for
+ apache to start the ASP.NET applications, and mono-server2-update can
+ restart apache if there's a new configuration file
+ (/etc/mono-server2/mono-server2-hosts.conf). If this is true, then apache will be restarted when there is a new mono-server-hosts.conf file.
Modified: xsp/trunk/debian/mono-xsp.init
===================================================================
--- xsp/trunk/debian/mono-xsp.init 2008-02-04 21:11:58 UTC (rev 3593)
+++ xsp/trunk/debian/mono-xsp.init 2008-02-17 22:51:11 UTC (rev 3594)
@@ -35,6 +35,11 @@
test -x $DAEMON || exit 0
test -f $DEFAULT && . $DEFAULT
+if [ ! -e $MONO_SHARED_DIR ]; then
+ mkdir $MONO_SHARED_DIR
+ chown $user:$group $MONO_SHARED_DIR
+fi
+
should_start() {
if [ ! -e $VIRTUALFILE -o `cat $VIRTUALFILE | wc -l` = "2" ]; then
log_action_msg "You have an incomplete $VIRTUALFILE"
Modified: xsp/trunk/debian/mono-xsp.postinst
===================================================================
--- xsp/trunk/debian/mono-xsp.postinst 2008-02-04 21:11:58 UTC (rev 3593)
+++ xsp/trunk/debian/mono-xsp.postinst 2008-02-17 22:51:11 UTC (rev 3594)
@@ -1,11 +1,9 @@
-#! /bin/bash
-
+#!/bin/bash
set -e
. /usr/share/debconf/confmodule
db_version 2.0
-tempfile=`/bin/tempfile`
xsp_default="/etc/default/mono-xsp"
NAME=mono-xsp
DESC="XSP WebServer"
@@ -17,8 +15,7 @@
R=$RET
echo "Using Mono XSP port: $R"
sed "s/port=.*/port=$R/g" $xsp_default > $tempfile
- cp -f $tempfile $xsp_default
- rm -Rf $tempfile
+ cp $tempfile $xsp_default
}
update_bind() {
@@ -26,8 +23,7 @@
R=$RET
echo "Binding Mono XSP address: $R"
sed "s/address=.*/address=$R/g" $xsp_default > $tempfile
- cp -f $tempfile $xsp_default
- rm -Rf $tempfile
+ cp $tempfile $xsp_default
}
should_start() {
@@ -62,6 +58,8 @@
case "$1" in
configure)
+ tempfile=$(/bin/tempfile)
+
# Configure autostart, but don't prevent the init script
# from starting it manually.
autostart="true"
@@ -79,7 +77,7 @@
update_bind
# chmod the working directories
- chown -R www-data.www-data /var/run/mono-xsp
+ chown -R www-data:www-data /var/run/mono-xsp
mono-xsp-update
if [ "$RET" = "true" ]; then
if should_start -a $autostart = "true" ; then
@@ -91,24 +89,10 @@
fi
fi
- rm -Rf $tempfile
+ rm $tempfile
;;
-
- *)
- echo "postinst failed \`$1'" >&2
- exit 0
- ;;
esac
#DEBHELPER#
exit 0
-
-
-
-
-
-
-
-
-
Property changes on: xsp/trunk/debian/mono-xsp.postinst
___________________________________________________________________
Name: svn:executable
- *
Modified: xsp/trunk/debian/mono-xsp.postrm
===================================================================
--- xsp/trunk/debian/mono-xsp.postrm 2008-02-04 21:11:58 UTC (rev 3593)
+++ xsp/trunk/debian/mono-xsp.postrm 2008-02-17 22:51:11 UTC (rev 3594)
@@ -1,20 +1,11 @@
-#!/bin/sh -e
+#!/bin/sh
+set -e
-xspconfd="/etc/xsp/conf.d/"
-
-case "$1" in
- purge)
- rm -Rf "$xspconfd/*"
- #Purge debconf
- if [ -f /usr/share/debconf/confmodule ]; then
- . /usr/share/debconf/confmodule
- db_purge
- fi
+if [ "$1" = "purge" ]; then
+ rm -f /etc/xsp/debian.webapp
#update-rc.d
update-rc.d -f mono-xsp remove > /dev/null 2>&1
-
- ;;
-esac
+fi
#DEBHELPER#
Property changes on: xsp/trunk/debian/mono-xsp.postrm
___________________________________________________________________
Name: svn:executable
- *
Modified: xsp/trunk/debian/mono-xsp.preinst
===================================================================
--- xsp/trunk/debian/mono-xsp.preinst 2008-02-04 21:11:58 UTC (rev 3593)
+++ xsp/trunk/debian/mono-xsp.preinst 2008-02-17 22:51:11 UTC (rev 3594)
@@ -1,4 +1,5 @@
-#!/bin/sh -e
+#!/bin/sh
+set -e
NAME=mono-xsp
DESC="XSP WebServer"
Property changes on: xsp/trunk/debian/mono-xsp.preinst
___________________________________________________________________
Name: svn:executable
- *
Modified: xsp/trunk/debian/mono-xsp.prerm
===================================================================
--- xsp/trunk/debian/mono-xsp.prerm 2008-02-04 21:11:58 UTC (rev 3593)
+++ xsp/trunk/debian/mono-xsp.prerm 2008-02-17 22:51:11 UTC (rev 3594)
@@ -36,4 +36,3 @@
#DEBHELPER#
exit 0
-
Property changes on: xsp/trunk/debian/mono-xsp.prerm
___________________________________________________________________
Name: svn:executable
- *
Modified: xsp/trunk/debian/mono-xsp2.init
===================================================================
--- xsp/trunk/debian/mono-xsp2.init 2008-02-04 21:11:58 UTC (rev 3593)
+++ xsp/trunk/debian/mono-xsp2.init 2008-02-17 22:51:11 UTC (rev 3594)
@@ -35,6 +35,11 @@
test -x $DAEMON || exit 0
test -f $DEFAULT && . $DEFAULT
+if [ ! -e $MONO_SHARED_DIR ]; then
+ mkdir $MONO_SHARED_DIR
+ chown $user:$group $MONO_SHARED_DIR
+fi
+
should_start() {
if [ ! -e $VIRTUALFILE -o `cat $VIRTUALFILE | wc -l` = "2" ]; then
log_action_msg "You have an incomplete $VIRTUALFILE"
Property changes on: xsp/trunk/debian/mono-xsp2.init
___________________________________________________________________
Name: svn:executable
+ *
Modified: xsp/trunk/debian/mono-xsp2.postinst
===================================================================
--- xsp/trunk/debian/mono-xsp2.postinst 2008-02-04 21:11:58 UTC (rev 3593)
+++ xsp/trunk/debian/mono-xsp2.postinst 2008-02-17 22:51:11 UTC (rev 3594)
@@ -1,11 +1,9 @@
-#! /bin/bash
-
+#!/bin/bash
set -e
. /usr/share/debconf/confmodule
db_version 2.0
-tempfile=`/bin/tempfile`
xsp2_default="/etc/default/mono-xsp2"
NAME=mono-xsp2
DESC="XSP 2 WebServer"
@@ -18,7 +16,6 @@
echo "Using Mono XSP 2 port: $R"
sed "s/port=.*/port=$R/g" $xsp2_default > $tempfile
cp -f $tempfile $xsp2_default
- rm -Rf $tempfile
}
update_bind() {
@@ -27,7 +24,6 @@
echo "Binding Mono XSP 2 address: $R"
sed "s/address=.*/address=$R/g" $xsp2_default > $tempfile
cp -f $tempfile $xsp2_default
- rm -Rf $tempfile
}
should_start() {
@@ -57,11 +53,12 @@
fi
return 1
-
}
case "$1" in
configure)
+ tempfile=$(/bin/tempfile)
+
# Configure autostart, but don't prevent the init script
# from starting it manually.
autostart="true"
@@ -79,7 +76,7 @@
update_bind
# chmod the working directories
- chown -R www-data.www-data /var/run/mono-xsp2
+ chown -R www-data:www-data /var/run/mono-xsp2
mono-xsp2-update
if [ "$RET" = "true" ]; then
if should_start -a $autostart = "true" ; then
@@ -91,13 +88,8 @@
fi
fi
- rm -Rf $tempfile
+ rm $tempfile
;;
-
- *)
- echo "postinst failed \`$1'" >&2
- exit 0
- ;;
esac
#DEBHELPER#
Modified: xsp/trunk/debian/mono-xsp2.postrm
===================================================================
--- xsp/trunk/debian/mono-xsp2.postrm 2008-02-04 21:11:58 UTC (rev 3593)
+++ xsp/trunk/debian/mono-xsp2.postrm 2008-02-17 22:51:11 UTC (rev 3594)
@@ -1,20 +1,11 @@
-#!/bin/bash -e
+#!/bin/sh
+set -e
-xsp2confd="/etc/xsp2/conf.d/"
-
-case "$1" in
- purge)
- rm -Rf "$xsp2confd/*"
- #Purge debconf
- if [ -f /usr/share/debconf/confmodule ]; then
- . /usr/share/debconf/confmodule
- db_purge
- fi
- #update-rc.d
+if [ "$1" = "purge" ]; then
+ rm -f /etc/xsp2/debian.webapp
+ # purge init.d script
update-rc.d -f mono-xsp2 remove > /dev/null 2>&1
-
- ;;
-esac
+fi
#DEBHELPER#
Modified: xsp/trunk/debian/mono-xsp2.preinst
===================================================================
--- xsp/trunk/debian/mono-xsp2.preinst 2008-02-04 21:11:58 UTC (rev 3593)
+++ xsp/trunk/debian/mono-xsp2.preinst 2008-02-17 22:51:11 UTC (rev 3594)
@@ -1,4 +1,5 @@
-#!/bin/sh -e
+#!/bin/sh
+set -e
NAME=mono-xsp2
DESC="XSP WebServer"
@@ -6,7 +7,7 @@
case "$1" in
upgrade|install)
if [ -f /etc/init.d/mono-xsp2 ]; then
- if which invoke-rc.d >/dev/null 2>&1; then
+ if which invoke-rc.d > /dev/null 2>&1; then
invoke-rc.d mono-xsp2 stop
else
/etc/init.d/mono-xsp2 stop
Modified: xsp/trunk/debian/mono-xsp2.prerm
===================================================================
--- xsp/trunk/debian/mono-xsp2.prerm 2008-02-04 21:11:58 UTC (rev 3593)
+++ xsp/trunk/debian/mono-xsp2.prerm 2008-02-17 22:51:11 UTC (rev 3594)
@@ -1,4 +1,5 @@
-#!/bin/sh -e
+#!/bin/sh
+set -e
NAME=mono-xsp2
DESC="XSP WebServer"
@@ -36,4 +37,3 @@
#DEBHELPER#
exit 0
-
Modified: xsp/trunk/debian/watch
===================================================================
--- xsp/trunk/debian/watch 2008-02-04 21:11:58 UTC (rev 3593)
+++ xsp/trunk/debian/watch 2008-02-17 22:51:11 UTC (rev 3594)
@@ -1,2 +1,2 @@
-version=2
-http://go-mono.com/sources-stable/ .*/xsp-(.*)\.tar\.bz2
+version=3
+http://go-mono.com/sources-stable/ .*/xsp-(.*)\.(?:zip|(?:tar\.(?:bz2|gz)))
More information about the Pkg-mono-svn-commits
mailing list