[Pkg-mono-svn-commits] revision 138

[Eduard Bloch]

Repository changes in pkg-mono:

By: blade
Date: Tue, 27 Jan 2004 12:15:27 +0100
Modified:
U   mcs/trunk/debian/changelog
U   mcs/trunk/debian/control
U   mcs/trunk/debian/rules
Log:
   * Replaced all that crappy shell wrappes with a binary wrapper. Moved EXEs
     back to /usr/bin, who does really care about cosmetics...


Modified: mcs/trunk/debian/changelog
===================================================================
--- mcs/trunk/debian/changelog	2004-01-27 11:01:03 UTC (rev 137)
+++ mcs/trunk/debian/changelog	2004-01-27 11:15:26 UTC (rev 138)
@@ -3,6 +3,8 @@
   * NOT RELEASED YET
   * Build-Conflicts with previous versions of mono-assemblies-base because of
     the unclean build systems which breaks mcs at build time
+  * Replaced all that crappy shell wrappes with a binary wrapper. Moved EXEs
+    back to /usr/bin, who does really care about cosmetics...
 
  -- Eduard Bloch <blade@debian.org>  Thu, 22 Jan 2004 00:58:47 +0100
 

Modified: mcs/trunk/debian/control
===================================================================
--- mcs/trunk/debian/control	2004-01-27 11:01:03 UTC (rev 137)
+++ mcs/trunk/debian/control	2004-01-27 11:15:26 UTC (rev 138)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Mono Group <pkg-mono-group@lists.alioth.debian.org>
 Build-Depends: debhelper (>> 3.0.0), c-sharp-compiler, libxslt1-dev
-Build-Conflicts: mono-assemblies-base (<< 0.30)
+Build-Conflicts: mono-assemblies-base (<< 0.30), mono-assemblies-base (>> 0.30-10)
 Standards-Version: 3.6.1
 
 Package: mono-assemblies-base
@@ -40,6 +40,7 @@
 Section: devel
 Architecture: all
 Depends: mono-jit (= ${Source-Version}) | cli-virtual-machine
+Conflicts: mono-common (<< ${Source-Version})
 Provides: c-sharp-compiler
 Description: the Mono C# compiler
  This is the Mono C# (C-Sharp) compiler, a platform-independent compiler which

Modified: mcs/trunk/debian/rules
===================================================================
--- mcs/trunk/debian/rules	2004-01-27 11:01:03 UTC (rev 137)
+++ mcs/trunk/debian/rules	2004-01-27 11:15:26 UTC (rev 138)
@@ -28,11 +28,12 @@
 	$(MAKE) install prefix=$(PWD)/debian/tmp/usr
 #cd debian/tmp/usr/bin ; /bin/sh $(PWD)/debian/rename-exes
 	dh_movefiles
-	mv debian/mono-mcs/usr/bin/*.exe debian/mono-mcs/usr/lib/mono-mcs/bin/
+	#mv debian/mono-mcs/usr/bin/*.exe debian/mono-mcs/usr/lib/mono-mcs/bin/
 	#perl -pe 's!/usr/bin/m(ono|int)!exec /usr/bin/cli!' -i `file debian/mono-mcs/usr/bin/* | grep shell | cut -f1 -d:`
-	for x in debian/mono-mcs/usr/lib/mono-mcs/bin/*.exe ; do \
-		/bin/echo -e "#!/bin/sh\nexec /usr/bin/cli /usr/lib/mono-mcs/bin/$$(basename $$x)" ' "$$@"' > debian/mono-mcs/usr/bin/$$(basename $$x .exe) ;  \
-	done
+	#for x in debian/mono-mcs/usr/lib/mono-mcs/bin/*.exe ; do \
+	#	/bin/echo -e "#!/bin/sh\nexec /usr/bin/cli /usr/lib/mono-mcs/bin/$$(basename $$x)" ' "$$@"' > debian/mono-mcs/usr/bin/$$(basename $$x .exe) ;  \
+	#done
+	for x in debian/mono-mcs/usr/bin/*.exe ; do ln -sf cli-wrapper $${x%.exe} ; done
 	chmod -x debian/mono-mcs/usr/lib/mono-mcs/bin/*.exe
 	chmod -x debian/mono-assemblies-*/usr/lib/*dll*
 	chmod +x debian/mono-mcs/usr/bin/*