[Pkg-mono-svn-commits] rev 378 - xsp-snapshot/trunk/debian/official
Pablo Fischer
pabl0-guest@quantz.debian.org
Sat, 28 Feb 2004 08:28:09 +0100
Author: pabl0-guest
Date: 2004-02-28 08:28:09 +0100 (Sat, 28 Feb 2004)
New Revision: 378
Modified:
xsp-snapshot/trunk/debian/official/asp.net-examples.postinst
xsp-snapshot/trunk/debian/official/asp.net-examples.prerm
xsp-snapshot/trunk/debian/official/mono-server.init
xsp-snapshot/trunk/debian/official/mono-xsp.init
xsp-snapshot/trunk/debian/official/mono-xsp.postinst
xsp-snapshot/trunk/debian/official/rules
Log:
* mono-xsp.postinst:
+ Fixed the port_8080 to check if port 8080 is available, we
should just use webcache instead of localhost:, cause some computers
doesn't use localhost, they use other names (hostname)
* rules:
+ Added a dh_movefiles before linking the bins to the cli-wrapper
+ Removed the dh_movefiles that is AFTER the linking process.
* asp.net-examples(postinst|prerm)
+ Fixed the --host flag, vhostmanager doesn't recognize --host, it should be
--path
* .init files:
+ Fixed the rule that checks if the virtualhost file exists, it was getting a 'forced true'
Modified: xsp-snapshot/trunk/debian/official/asp.net-examples.postinst
===================================================================
--- xsp-snapshot/trunk/debian/official/asp.net-examples.postinst 2004-02-28 06:27:46 UTC (rev 377)
+++ xsp-snapshot/trunk/debian/official/asp.net-examples.postinst 2004-02-28 07:28:09 UTC (rev 378)
@@ -4,7 +4,7 @@
#Add the host
echo "Updating Root Servers..."
mono-vhostmanager add --config-file=/etc/xsp/virtual.conf \
- --host=/usr/share/asp.net-demos/asp \
+ --path=/usr/share/asp.net-demos/asp \
--alias=/samples
fi
@@ -12,6 +12,6 @@
#Add the host
echo "Updating Root Servers..."
mono-vhostmanager add --config-file=/etc/mono-server/virtual.conf \
- --host=/usr/share/asp.net-demos/asp \
+ --path=/usr/share/asp.net-demos/asp \
--alias=/samples
fi
Modified: xsp-snapshot/trunk/debian/official/asp.net-examples.prerm
===================================================================
--- xsp-snapshot/trunk/debian/official/asp.net-examples.prerm 2004-02-28 06:27:46 UTC (rev 377)
+++ xsp-snapshot/trunk/debian/official/asp.net-examples.prerm 2004-02-28 07:28:09 UTC (rev 378)
@@ -4,7 +4,7 @@
#Add the host
echo "Updating Root Servers..."
mono-vhostmanager del --config-file=/etc/xsp/virtual.conf \
- --host=/usr/share/asp.net-demos/asp \
+ --path=/usr/share/asp.net-demos/asp \
--alias=/samples
fi
@@ -12,7 +12,7 @@
#Add the host
echo "Updating Root Servers..."
mono-vhostmanager del --config-file=/etc/mono-server/virtual.conf \
- --host=/usr/share/asp.net-demos/asp \
+ --path=/usr/share/asp.net-demos/asp \
--alias=/samples
fi
Modified: xsp-snapshot/trunk/debian/official/mono-server.init
===================================================================
--- xsp-snapshot/trunk/debian/official/mono-server.init 2004-02-28 06:27:46 UTC (rev 377)
+++ xsp-snapshot/trunk/debian/official/mono-server.init 2004-02-28 07:28:09 UTC (rev 378)
@@ -53,7 +53,7 @@
hostsempty=`mono-vhostmanager print --config-file=$VIRTUALFILE`
- if [[ $hostsempty = *NHF* || *FNE* ]]; then
+ if [[ $hostsempty = *NHF* || $hostsempty = *FNE* ]]; then
echo "Sorry, you don't have any hosts. I suggest you to download asp.net-examples"
exit 0
fi
Modified: xsp-snapshot/trunk/debian/official/mono-xsp.init
===================================================================
--- xsp-snapshot/trunk/debian/official/mono-xsp.init 2004-02-28 06:27:46 UTC (rev 377)
+++ xsp-snapshot/trunk/debian/official/mono-xsp.init 2004-02-28 07:28:09 UTC (rev 378)
@@ -39,7 +39,7 @@
hostsempty=`mono-vhostmanager print --config-file=$VIRTUALFILE`
- if [[ $hostsempty = *NHF* || *FNE* ]]; then
+ if [[ $hostsempty = *NHF* || $hostsempty = *FNE* ]]; then
echo "Sorry, you don't have any hosts. I suggest you to download asp.net-examples"
exit 0
fi
Modified: xsp-snapshot/trunk/debian/official/mono-xsp.postinst
===================================================================
--- xsp-snapshot/trunk/debian/official/mono-xsp.postinst 2004-02-28 06:27:46 UTC (rev 377)
+++ xsp-snapshot/trunk/debian/official/mono-xsp.postinst 2004-02-28 07:28:09 UTC (rev 378)
@@ -40,7 +40,7 @@
fi
#Check the port 8080, is it available?
- port_8080=`netstat -ta | grep localhost:webcache | wc -l`
+ port_8080=`netstat -ta | grep 'webcache' | wc -l`
if [ $port_8080 = "1" ]; then
disable_8080
Modified: xsp-snapshot/trunk/debian/official/rules
===================================================================
--- xsp-snapshot/trunk/debian/official/rules 2004-02-28 06:27:46 UTC (rev 377)
+++ xsp-snapshot/trunk/debian/official/rules 2004-02-28 07:28:09 UTC (rev 378)
@@ -51,8 +51,8 @@
dh_testroot
dh_clean -k
dh_installdirs
-
cd server && $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+ dh_movefiles
# We should follow the MonoConventions
# First, for mono-xsp
for x in debian/mono-xsp/usr/bin/*.exe ; do ln -sf cli-wrapper $${x%.exe} ; done
@@ -67,7 +67,7 @@
binary-indep: build install
dh_testdir
dh_testroot
- dh_movefiles
+# dh_movefiles
dh_installchangelogs ChangeLog
dh_installdocs
dh_installexamples