[Pkg-mono-svn-commits] [SCM] mono branch, master-experimental, updated. debian/2.6.3-4-34-gd1bf954

[Mirco Bauer]

The following commit has been merged in the master-experimental branch:
commit 1d90b158dc54187dd18046293088d7afe9cc4904
Merge: f4de1348931838741b6418a62fb0eafb5a2fc00b 1be5ec1b6be271b4c94e6ed5dd6e622dd598440a
Author: Mirco Bauer <meebey at meebey.net>
Date:   Tue Aug 3 01:08:20 2010 +0200

    Merge branch 'debian/patches/build_extra_libraries_for_cli_2.0' into merge/2.6.7

diff --combined mcs/class/Makefile
index 468b364,24794e1..7a3fa72
--- a/mcs/class/Makefile
+++ b/mcs/class/Makefile
@@@ -88,12 -88,9 +88,9 @@@ common_dirs := 
  	Microsoft.JScript		\
  	CustomMarshalers		\
  	OpenSystem.C			\
- 	Mono.Cecil			\
- 	Mono.Cecil.Mdb			\
  	SystemWebTestShim
  
- net_1_1_dirs :=		\
- 	FirebirdSql.Data.Firebird
+ net_1_1_dirs :=
  
  net_2_0_dirs := \
  	Microsoft.Build.Framework	\
@@@ -116,15 -113,17 +113,18 @@@
  	System.Web.DynamicData		\
  	System.ServiceModel.Web		\
  	System.Web.Mvc			\
 +	System.Web.Mvc2			\
  	Mono.C5				\
  	Mono.Management			\
  	Mono.Options 			\
  	Mono.Simd			\
  	Mono.Tasklets       		\
  	WindowsBase			\
+ 	System.Data.Services    \
+ 	Mono.Cecil			\
+ 	Mono.Cecil.Mdb			\
  	Mono.Debugger.Soft	\
- 	System.Data.Services
+ 	FirebirdSql.Data.Firebird
  
  net_2_0_only_dirs := \
  	System.Web.Extensions_1.0	\

-- 
mono