[Pkg-mono-svn-commits] rev 934 - mcs/trunk/debian

[Eduard Bloch]

Author: blade
Date: 2004-06-10 12:21:09 -0600 (Thu, 10 Jun 2004)
New Revision: 934

Modified:
   mcs/trunk/debian/changelog
   mcs/trunk/debian/mono-mcs.links
   mcs/trunk/debian/rules
Log:

Fixes, Workaround, Solutions


Modified: mcs/trunk/debian/changelog
===================================================================
--- mcs/trunk/debian/changelog	2004-06-10 14:40:59 UTC (rev 933)
+++ mcs/trunk/debian/changelog	2004-06-10 18:21:09 UTC (rev 934)
@@ -9,6 +9,8 @@
       mscorlib.dll will still be from net_1_0
     + installation commands overhaul, away from dh_movefiles
     + install gmcs.exe (closes: #244189)
+    + use the second access method of cli-wrapper (directory symlink) to run
+      mcs.exe since it's sensitive to the invocation argument
 
  -- Debian Mono Group <pkg-mono-group@lists.alioth.debian.org>  Fri, 04 Jun 2004 20:04:50 +0200
 

Modified: mcs/trunk/debian/mono-mcs.links
===================================================================
--- mcs/trunk/debian/mono-mcs.links	2004-06-10 14:40:59 UTC (rev 933)
+++ mcs/trunk/debian/mono-mcs.links	2004-06-10 18:21:09 UTC (rev 934)
@@ -1,2 +1,2 @@
-/usr/share/dotnet/mono/1.0/mcs.exe /usr/share/dotnet/bin/mcs.exe
-/usr/share/dotnet/mono/1.0/mbas.exe /usr/share/dotnet/bin/mbas.exe
+/usr/share/dotnet/mono/1.0 /usr/share/dotnet/bin/mcs.exe
+/usr/share/dotnet/mono/1.0 /usr/share/dotnet/bin/mbas.exe

Modified: mcs/trunk/debian/rules
===================================================================
--- mcs/trunk/debian/rules	2004-06-10 14:40:59 UTC (rev 933)
+++ mcs/trunk/debian/rules	2004-06-10 18:21:09 UTC (rev 934)
@@ -10,6 +10,7 @@
 build: build-stamp
 build-stamp:
 	dh_testdir
+	dh_clean -k
 	mkdir -p $(CURDIR)/.wabi
 	perl -pe 's/RUNTIME.=.mono/RUNTIME = cli/;' -i $(CURDIR)/build/config-default.make
 	# gacutil bug, he ignores the /root parameter
@@ -47,9 +48,6 @@
 	rm -f debian/mono-mcs/usr/share/dotnet/bin/gacutil*
 	for x in $(CURDIR)/debian/*/usr/bin ; do cd $$x ; for y in `find ../share/dotnet -name '*.exe'` ; do ln -sf cli-wrapper `basename $$y .exe` ; done ; done
 	find $(CURDIR)/debian/mono-assemblies-base/usr/share/dotnet/mono -type f -name "*.dll" -exec chmod -x {} \;
-	# /usr/lib/mono/1.0/mcs.exe, so this special wrapper is needed
-	rm $(CURDIR)/debian/mono-mcs/usr/bin/mcs
-	install -m755 debian/mcs-wrapper $(CURDIR)/debian/mono-mcs/usr/bin/mcs
 
 # Build architecture-independent files here.
 binary-indep: build install