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

Eduard Bloch blade@quantz.debian.org
Tue, 24 Feb 2004 18:19:10 +0100


Author: blade
Date: 2004-02-24 18:19:09 +0100 (Tue, 24 Feb 2004)
New Revision: 332

Modified:
   mcs/trunk/debian/changelog
   mcs/trunk/debian/control
   mcs/trunk/debian/mono-assemblies-arch.files
   mcs/trunk/debian/rules
Log:
Sync preview branch with mcs trunk


Modified: mcs/trunk/debian/changelog
===================================================================
--- mcs/trunk/debian/changelog	2004-02-24 17:16:14 UTC (rev 331)
+++ mcs/trunk/debian/changelog	2004-02-24 17:19:09 UTC (rev 332)
@@ -1,6 +1,7 @@
-mcs (0.29.99.20040114-3) unstable; urgency=low
+mcs (0.30.1-1) unstable; urgency=low
 
   * NOT RELEASED YET
+  * New upstream release
   * Replaced all that crappy shell wrappes with a binary wrapper. Moved EXEs
     to /usr/share/dotnet/bin
   * Don't compress JAY's example file (closes: #231237)

Modified: mcs/trunk/debian/control
===================================================================
--- mcs/trunk/debian/control	2004-02-24 17:16:14 UTC (rev 331)
+++ mcs/trunk/debian/control	2004-02-24 17:19:09 UTC (rev 332)
@@ -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), mono-assemblies-base (>> 0.30-10)
+Build-Conflicts: mono-assemblies-base (<< 0.30), mono-assemblies-base (>> 0.30.1-10)
 Standards-Version: 3.6.1
 
 Package: mono-assemblies-base
@@ -24,7 +24,7 @@
 Package: mono-assemblies-arch
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, mono-assemblies-base
+Depends: ${shlibs:Depends}, mono-assemblies-base, libgdiplus
 Conflicts: mono-assemblies
 Provides: cli-runtime
 Conflicts: cli-runtime

Modified: mcs/trunk/debian/mono-assemblies-arch.files
===================================================================
--- mcs/trunk/debian/mono-assemblies-arch.files	2004-02-24 17:16:14 UTC (rev 331)
+++ mcs/trunk/debian/mono-assemblies-arch.files	2004-02-24 17:19:09 UTC (rev 332)
@@ -1 +0,0 @@
-usr/lib/libgdiplus.dll.so

Modified: mcs/trunk/debian/rules
===================================================================
--- mcs/trunk/debian/rules	2004-02-24 17:16:14 UTC (rev 331)
+++ mcs/trunk/debian/rules	2004-02-24 17:19:09 UTC (rev 332)
@@ -24,19 +24,17 @@
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-	mkdir -p debian/tmp/usr debian/mono-mcs/usr/lib/mono-mcs/bin
+	mkdir -p debian/tmp/usr debian/mono-mcs/usr/share/dotnet/bin
 	$(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/share/dotnet/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/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/*
+	mv debian/mono-mcs/usr/bin/*.exe debian/mono-mcs/usr/share/dotnet/bin
+	chmod -x debian/mono-assemblies-*/usr/lib/*dll* debian/mono-mcs/usr/share/dotnet/bin/*.exe
 
 # Build architecture-independent files here.
 binary-indep: build install