[Pkg-mono-svn-commits] [SCM] mono branch, master, updated. debian/2.4+dfsg-5-1-ga4d9cd5

[Mirco Bauer]

The following commit has been merged in the master branch:
commit a4d9cd59048e8ce13e75a067b94539a0b547faba
Author: Mirco Bauer <meebey at meebey.net>
Date:   Sun Jul 5 14:51:44 2009 +0200

      * debian/rules:
        + Force pthread for armel as __thread FTBFS.
        + Build Mono.Simd in test target, which hopefully fixes the failing
          mono/mini tests.
      * debian/control:
        + Removed dh_installxsp and monodiet from the package description of
          mono-utils. (Closes: #534906)
        + Bumped Standards-Version to 3.8.2 (no changes needed)

diff --git a/debian/changelog b/debian/changelog
index 7b1c86a..c1e07f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+mono (2.4+dfsg-6) unstable; urgency=low
+
+  * debian/rules:
+    + Force pthread for armel as __thread FTBFS.
+    + Build Mono.Simd in test target, which hopefully fixes the failing
+      mono/mini tests.
+  * debian/control:
+    + Removed dh_installxsp and monodiet from the package description of
+      mono-utils. (Closes: #534906)
+    + Bumped Standards-Version to 3.8.2 (no changes needed)
+
+ -- Mirco Bauer <meebey at debian.org>  Sun, 05 Jul 2009 14:44:23 +0200
+
 mono (2.4+dfsg-5) unstable; urgency=low
 
   * debian/rules:
diff --git a/debian/control b/debian/control
index c57377e..559b82f 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,7 @@ Build-Depends: debhelper (>= 7),
 	zlib1g-dev,
 	autoconf,
 	automake
-Standards-Version: 3.8.0
+Standards-Version: 3.8.2
 Homepage: http://www.mono-project.com/
 Vcs-Git: git://git.debian.org/git/pkg-mono/packages/mono.git
 Vcs-Browser: http://git.debian.org/?p=pkg-mono/packages/mono.git
@@ -79,7 +79,7 @@ Description: Mono utilities
  bytecode (aka assemblies), and a class library.
  .
  This package includes various tools useful for CLI developers, like
- dh_installxsp, pedump, monodiet, monodis and monograph.
+ pedump, monodis and monograph.
 
 Package: mono-complete
 Architecture: i386 lpia kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390
diff --git a/debian/rules b/debian/rules
index 92c5cf2..68fd392 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,6 +38,9 @@ endif
 
 ifeq ($(DEB_BUILD_ARCH), armel)
 	CONF_FLAGS += --with-fpu=NONE
+	# the build-system picks __thread for armel which is not working,
+	# thus we have to explicitly pick pthread
+	CONF_FLAGS += --with-tls=pthread
 endif
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -166,6 +169,9 @@ test-arch-stamp: configure-indep
 	# some tests need System.Core
 	cd mcs/class/System.Core && LC_ALL=C $(MAKE) PROFILE=net_2_0
 
+	# mono/mini tests need Mono.Simd
+	cd mcs/class/Mono.Simd && LC_ALL=C $(MAKE) PROFILE=net_2_0
+
 	# show time baby: run all tests
 	-$(MINI_TEST)
 	-$(MONO_TEST)

-- 
mono