[SCM] Packaging for numexpr branch, master, updated. debian/1.4.2-3.1-1-g74ee7bb

Picca Frédéric-Emma?==?UTF-8?Q?nuel picca at debian.org
Sun Mar 4 16:45:58 UTC 2012


The following commit has been merged in the master branch:
commit 74ee7bb647d92066658d64d691d64e3aa8e3a7e1
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Sun Mar 4 17:19:51 2012 +0100

    fix for real the FTBFS

diff --git a/debian/changelog b/debian/changelog
index 49e057a..86c19cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+numexpr (1.4.2-3.2) unstable; urgency=low
+
+  * fix for real the FTBFS
+  * debian/patches
+    - 0003-feature-forwarded-upstream-fix-FTBFS-on-Hurd-and-KFr.patch (updated)
+
+ -- Picca Frédéric-Emmanuel <picca at debian.org>  Sun, 04 Mar 2012 13:57:37 +0100
+
 numexpr (1.4.2-3.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff --git a/debian/patches/0003-feature-forwarded-upstream-fix-FTBFS-on-Hurd-and-KFr.patch b/debian/patches/0003-feature-forwarded-upstream-fix-FTBFS-on-Hurd-and-KFr.patch
index 27a252e..e170482 100644
--- a/debian/patches/0003-feature-forwarded-upstream-fix-FTBFS-on-Hurd-and-KFr.patch
+++ b/debian/patches/0003-feature-forwarded-upstream-fix-FTBFS-on-Hurd-and-KFr.patch
@@ -1,26 +1,25 @@
 From: =?UTF-8?q?Picca=20Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca at debian.org>
-Date: Sun, 4 Mar 2012 11:59:02 +0100
+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 |    6 ++++++
- 1 files changed, 6 insertions(+), 0 deletions(-)
+ numexpr/tests/test_numexpr.py |    5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
 
 diff --git a/numexpr/tests/test_numexpr.py b/numexpr/tests/test_numexpr.py
-index 4dfffaf..08c5e50 100644
+index 4dfffaf..feafa1c 100644
 --- a/numexpr/tests/test_numexpr.py
 +++ b/numexpr/tests/test_numexpr.py
-@@ -586,6 +586,12 @@ def _worker(qout = None):
+@@ -586,6 +586,11 @@ def _worker(qout = None):
  class test_subprocess(TestCase):
      def test_multiprocess(self):
          import multiprocessing as mp
 +        import platform as pl
 +
-+        if pl.system().lower() in ('gnu', 'gnu/kfreebsd'):
-+            raise common.SkipTest(
-+                "multiprocessing module is not supported on Hurd/kFreeBSD")
++        if (pl.system().lower() in ('gnu', 'gnu/kfreebsd')):
++                return Skip("multiprocessing module is not supported on Hurd/kFreeBSD")
 +
          # Check for two threads at least
          numexpr.set_num_threads(2)

-- 
Packaging for numexpr



More information about the debian-science-commits mailing list