[SCM] Packaging for numexpr branch, master, updated. debian/2.0.1-2-17-gf0bed27

[Antonio Valentino]

The following commit has been merged in the master branch:
commit f36713c14e2ba29428a4296f627ca0f4f8748839
Author: Antonio Valentino <antonio.valentino at tiscali.it>
Date:   Sat Apr 27 10:43:22 2013 +0000

    Removed patches applied upstream

diff --git a/debian/changelog b/debian/changelog
index 4f388b1..f84c914 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
 numexpr (2.1-1) UNRELEASED; urgency=low
 
   * New upstream release
+  * Removed parches applied upstream:
+    0002-feature-forwarded-upstream-fix-FTBFS-on-Hurd-and-KFr.patch and 
+    0003-Set-default-nthreads-to-one-on-sparc.patch 
+  * Refresh remaining patches
   * Re-enable unittests at build time on sparc
-  * New patch: set the default number of threads to 1 on sparc
 
  -- Antonio Valentino <antonio.valentino at tiscali.it>  Sat, 27 Apr 2013 10:32:31 +0000
 
diff --git a/debian/patches/0001-debian-changes-1.3.1-1.patch b/debian/patches/0001-debian-changes-1.3.1-1.patch
index d8c4323..4c145d1 100644
--- a/debian/patches/0001-debian-changes-1.3.1-1.patch
+++ b/debian/patches/0001-debian-changes-1.3.1-1.patch
@@ -9,7 +9,7 @@ Subject: debian-changes-1.3.1-1
 
 --- a/numexpr.egg-info/SOURCES.txt
 +++ b/numexpr.egg-info/SOURCES.txt
-@@ -5,6 +5,7 @@
+@@ -6,6 +6,7 @@
  MANIFEST.in
  README.txt
  RELEASE_NOTES.txt
diff --git a/debian/patches/0002-feature-forwarded-upstream-fix-FTBFS-on-Hurd-and-KFr.patch b/debian/patches/0002-feature-forwarded-upstream-fix-FTBFS-on-Hurd-and-KFr.patch
deleted file mode 100644
index 46a12a0..0000000
--- a/debian/patches/0002-feature-forwarded-upstream-fix-FTBFS-on-Hurd-and-KFr.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From: =?UTF-8?q?Picca=20Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca at debian.org>
-Date: Sun, 4 Mar 2012 17:08:28 +0100
-Subject: feature forwarded upstream fix FTBFS on Hurd and KFreeBSD
-
- - on kfreebsd /dev/shm is N/A
- - on Hurd -- inter-process semaphore locking is N/A
----
- numexpr/tests/test_numexpr.py |    5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
-
---- a/numexpr/tests/test_numexpr.py
-+++ b/numexpr/tests/test_numexpr.py
-@@ -727,6 +727,7 @@
- 
- def suite():
-     import unittest
-+    import platform as pl
- 
-     theSuite = unittest.TestSuite()
-     niter = 1
-@@ -754,7 +755,11 @@
-         theSuite.addTest(
-             unittest.makeSuite(test_irregular_stride) )
-         theSuite.addTest(unittest.makeSuite(test_zerodim))
--        theSuite.addTest(unittest.makeSuite(test_subprocess))
-+
-+        # multiprocessing module is not supported on Hurd/kFreeBSD
-+        if (pl.system().lower() not in ('gnu', 'gnu/kfreebsd')):
-+            theSuite.addTest(unittest.makeSuite(test_subprocess))
-+
-         # I need to put this test after test_subprocess because
-         # if not, the test suite locks immediately before test_subproces.
-         # This only happens with Windows, so I suspect of a subtle bad
diff --git a/debian/patches/0003-Set-default-nthreads-to-one-on-sparc.patch b/debian/patches/0003-Set-default-nthreads-to-one-on-sparc.patch
deleted file mode 100644
index 45a249a..0000000
--- a/debian/patches/0003-Set-default-nthreads-to-one-on-sparc.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From: Antonio Valentino <antonio.valentino at tiscali.it>
-Date: Sun, 22 Apr 2012 20:57:19 +0200
-Subject: Set default nthreads to one on sparc
-
----
- numexpr/__init__.py |   12 +++++++++++-
- 1 file changed, 11 insertions(+), 1 deletion(-)
-
---- a/numexpr/__init__.py
-+++ b/numexpr/__init__.py
-@@ -35,6 +35,7 @@
-     is_cpu_amd_intel = False
- 
- import os.path
-+import platform
- from numexpr.expressions import E
- from numexpr.necompiler import NumExpr, disassemble, evaluate
- from numexpr.tests import test, print_versions
-@@ -47,7 +48,16 @@
- # Check that we don't surpass the MAX_THREADS in interpreter.c
- if ncores > 4096:
-     ncores = 4096
--set_num_threads(ncores)
-+if 'sparc' in platform.machine():
-+    import warnings
-+    warnings.warn('The number of threads have been set to 1 because problems related '
-+                  'to threading have been reported on some sparc machine. '
-+                  'The number of threads can be changes using the "set_num_threads" '
-+                  'function.')
-+    set_num_threads(1)
-+else:
-+    set_num_threads(ncores)
-+
- # The default for VML is 1 thread (see #39)
- set_vml_num_threads(1)
- 
diff --git a/debian/patches/series b/debian/patches/series
index 5236602..dbfc991 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
 0001-debian-changes-1.3.1-1.patch
-0002-feature-forwarded-upstream-fix-FTBFS-on-Hurd-and-KFr.patch
-0003-Set-default-nthreads-to-one-on-sparc.patch

-- 
Packaging for numexpr