[Pkg-mono-svn-commits] rev 306 - xsp-snapshot/trunk/debian/official

[Pablo Fischer]

Author: pabl0-guest
Date: 2004-02-19 03:53:11 +0100 (Thu, 19 Feb 2004)
New Revision: 306

Modified:
   xsp-snapshot/trunk/debian/official/TODO
   xsp-snapshot/trunk/debian/official/asp.net-examples.postinst
   xsp-snapshot/trunk/debian/official/changelog
   xsp-snapshot/trunk/debian/official/mono-server.postinst
   xsp-snapshot/trunk/debian/official/rules
Log:
Updated...


Modified: xsp-snapshot/trunk/debian/official/TODO
===================================================================
--- xsp-snapshot/trunk/debian/official/TODO	2004-02-19 02:51:22 UTC (rev 305)
+++ xsp-snapshot/trunk/debian/official/TODO	2004-02-19 02:53:11 UTC (rev 306)
@@ -1,3 +1,7 @@
+18 feb 2004 20:51:57
+
+* Check why the f*** the mono-xsp or mono-server package doesn not wants to copy the .conf file (yesterday was working).. damn!!!
+
 17 feb 2004 21:47:45
 
 * Ask Edd why we need a asp.net-examples-server package if we are going to use mod-mono-server or xsp instead

Modified: xsp-snapshot/trunk/debian/official/asp.net-examples.postinst
===================================================================
--- xsp-snapshot/trunk/debian/official/asp.net-examples.postinst	2004-02-19 02:51:22 UTC (rev 305)
+++ xsp-snapshot/trunk/debian/official/asp.net-examples.postinst	2004-02-19 02:53:11 UTC (rev 306)
@@ -1,11 +1,18 @@
 #!/bin/sh -e
 
 if [ -x /usr/bin/xsp.exe -a -d /etc/xsp ]; then
-    echo "Updating Root Servers..."
-    echo "/samples:/usr/share/asp.net-demos/asp" >> /etc/xsp/virtual.conf
+    #We don't have already the virtual host?
+    wehaveit=`grep -x '/samples:/usr/share/asp.net-demos/asp' /etc/xsp/virtual.conf  | wc -l`
+    if [ $wehaveit = "0" ]; then
+	echo "Updating Root Servers..."
+	echo "/samples:/usr/share/asp.net-demos/asp" >> /etc/xsp/virtual.conf
+    fi
 fi
 
 if [ -x /usr/bin/mod-mono-server.exe -a -d /etc/mono-server ]; then
-    echo "Updating Root Servers..."
-    echo "/samples:/usr/share/asp.net-demos/asp" >> /etc/mono-server/virtual.conf
+    wehaveit=`grep -x '/samples:/usr/share/asp.net-demos/asp' /etc/mono-server/virtual.conf  | wc -l`
+    if [ $wehaveit = "0" ]; then
+	echo "Updating Root Servers..."
+	echo "/samples:/usr/share/asp.net-demos/asp" >> /etc/mono-server/virtual.conf
+    fi
 fi

Modified: xsp-snapshot/trunk/debian/official/changelog
===================================================================
--- xsp-snapshot/trunk/debian/official/changelog	2004-02-19 02:51:22 UTC (rev 305)
+++ xsp-snapshot/trunk/debian/official/changelog	2004-02-19 02:53:11 UTC (rev 306)
@@ -1,3 +1,9 @@
+xsp (0.9-1) unstable; urgency=low
+
+  * NOT RELEASED YET
+
+ -- Pablo Fischer <pablo@pablo.com.mx>  Wed, 18 Feb 2004 20:38:40 -0600
+	
 xsp (0.9) unstable; urgency=low
 
   * NOT RELEASED YET

Modified: xsp-snapshot/trunk/debian/official/mono-server.postinst
===================================================================
--- xsp-snapshot/trunk/debian/official/mono-server.postinst	2004-02-19 02:51:22 UTC (rev 305)
+++ xsp-snapshot/trunk/debian/official/mono-server.postinst	2004-02-19 02:53:11 UTC (rev 306)
@@ -10,13 +10,13 @@
 
 activate_monoserver() {
     sed s/start_boot=false/start_boot=true/g $modmono_default > $tempfile
-    cp -f $tempfile $xsp_default
+    cp -f $tempfile $modmono_default
 
 }
 
 deactivate_monoserver() {
     sed s/start_boot=true/start_boot=false/g $modmono_default > $tempfile
-    cp -f $tempfile $xsp_default
+    cp -f $tempfile $modmono_default
 }
 
 

Modified: xsp-snapshot/trunk/debian/official/rules
===================================================================
--- xsp-snapshot/trunk/debian/official/rules	2004-02-19 02:51:22 UTC (rev 305)
+++ xsp-snapshot/trunk/debian/official/rules	2004-02-19 02:53:11 UTC (rev 306)
@@ -57,11 +57,8 @@
 	chmod +x $(CURDIR)/debian/mono-xsp/usr/bin/xsp
 
 	/bin/echo -e "#!/bin/sh\nexec /usr/bin/mono /usr/bin/mod-mono-server.exe" ' "$$@"' > $(CURDIR)/debian/mono-server/usr/bin/mod-mono-server
-y	chmod +x $(CURDIR)/debian/mono-server/usr/bin/mod-mono-server
+	chmod +x $(CURDIR)/debian/mono-server/usr/bin/mod-mono-server
 
-	# only the server, the asp tool install is broken   
-	#$(MAKE) install DESTDIR=$(CURDIR)/debian/xsp
-
 binary-arch: build install
 # We have nothing to do by default.
 
@@ -77,8 +74,8 @@
 	cd test && cp *.dll $(CURDIR)/debian/asp.net-examples/usr/share/asp.net-demos/dll
 	rm -Rf $(CURDIR)/debian/asp.net-examples/usr/share/asp.net-demos/asp/monodoc.ashx
 	chmod -x $(CURDIR)/debian/asp.net-examples/usr/share/asp.net-demos/*/*
-	cp $(CURDIR)/debian/virtual-modmono.conf $(CURDIR)/debian/mono-server/etc/mono-server/virtual.conf
-	cp $(CURDIR)/debian/virtual-xsp.conf $(CURDIR)/debian/mono-xsp/etc/xsp/virtual.conf
+	install -m644 $(CURDIR)/debian/virtual-modmono.conf $(CURDIR)/debian/mono-server/etc/mono-server/virtual.conf
+	install -m644 $(CURDIR)/debian/virtual-xsp.conf $(CURDIR)/debian/mono-xsp/etc/xsp/virtual.conf
 #	install -m755 debian/asp.net-examples-server-snapshot $(CURDIR)/debian/asp.net-examples-snapshot/usr/bin
 	#cd test && cp *.dll $(CURDIR)/debian/asp.net-examples/usr/lib
 #	dh_install