[SCM] Packaging for numexpr branch, master, updated. debian/1.4.2-3.1
Picca Frédéric-Emma?==?UTF-8?Q?nuel
picca at debian.org
Sun Mar 4 11:34:10 UTC 2012
The following commit has been merged in the master branch:
commit 68307ca409f5de7d3eece1a30db3ece889f60688
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date: Sun Mar 4 12:24:21 2012 +0100
fix the FTBFS on hurd and KFreeBSD
use gbp-pq to deal with pacthes series
diff --git a/debian/changelog b/debian/changelog
index 1536daf..49e057a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+numexpr (1.4.2-3.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * debian/patches
+ - patch series regenerated with gbp-pq
+ - 0001-fix-unittests.patch (regenerated)
+ - 0002-debian-changes-1.3.1-1.patch (regeneated)
+ - 0003-feature-forwarded-upstream-fix-FTBFS-on-Hurd-and-KFr.patch (new)
+
+ -- Picca Frédéric-Emmanuel <picca at debian.org> Sun, 04 Mar 2012 12:06:58 +0100
+
numexpr (1.4.2-3) unstable; urgency=low
[Antonio Valentino]
diff --git a/debian/patches/fix-unittests.patch b/debian/patches/0001-fix-unittests.patch
similarity index 67%
rename from debian/patches/fix-unittests.patch
rename to debian/patches/0001-fix-unittests.patch
index f4c201a..ae4ffc7 100644
--- a/debian/patches/fix-unittests.patch
+++ b/debian/patches/0001-fix-unittests.patch
@@ -1,12 +1,22 @@
+From: Debian Science Maintainers
+ <debian-science-maintainers at lists.alioth.debian.org>
+Date: Sun, 4 Mar 2012 12:04:34 +0100
+Subject: fix-unittests
+
Fix unit tests for 2 bit platforms
Use assert_almost_equal instead of assert_equal.
See also
https://groups.google.com/group/numexpr/browse_thread/thread/bb777b53da34bbd0
+---
+ numexpr/tests/test_numexpr.py | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+diff --git a/numexpr/tests/test_numexpr.py b/numexpr/tests/test_numexpr.py
+index 52a8129..4dfffaf 100644
--- a/numexpr/tests/test_numexpr.py
+++ b/numexpr/tests/test_numexpr.py
-@@ -73,8 +73,8 @@
+@@ -73,8 +73,8 @@ class test_numexpr(TestCase):
('prod_ddn', 'r0', 't3', 2)])
# Check that full reductions work.
x = zeros(1e5)+.01 # checks issue #41
diff --git a/debian/patches/0002-debian-changes-1.3.1-1.patch b/debian/patches/0002-debian-changes-1.3.1-1.patch
new file mode 100644
index 0000000..16958d4
--- /dev/null
+++ b/debian/patches/0002-debian-changes-1.3.1-1.patch
@@ -0,0 +1,21 @@
+From: Debian Science Maintainers
+ <debian-science-maintainers at lists.alioth.debian.org>
+Date: Sun, 4 Mar 2012 12:04:34 +0100
+Subject: debian-changes-1.3.1-1
+
+---
+ numexpr.egg-info/SOURCES.txt | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/numexpr.egg-info/SOURCES.txt b/numexpr.egg-info/SOURCES.txt
+index ea3af86..5e7ebfd 100644
+--- a/numexpr.egg-info/SOURCES.txt
++++ b/numexpr.egg-info/SOURCES.txt
+@@ -4,6 +4,7 @@ LICENSE.txt
+ MANIFEST.in
+ README.txt
+ RELEASE_NOTES.txt
++setup.cfg
+ setup.py
+ site.cfg.example
+ ./numexpr/tests/__init__.py
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
new file mode 100644
index 0000000..27a252e
--- /dev/null
+++ b/debian/patches/0003-feature-forwarded-upstream-fix-FTBFS-on-Hurd-and-KFr.patch
@@ -0,0 +1,27 @@
+From: =?UTF-8?q?Picca=20Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca at debian.org>
+Date: Sun, 4 Mar 2012 11:59:02 +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(-)
+
+diff --git a/numexpr/tests/test_numexpr.py b/numexpr/tests/test_numexpr.py
+index 4dfffaf..08c5e50 100644
+--- a/numexpr/tests/test_numexpr.py
++++ b/numexpr/tests/test_numexpr.py
+@@ -586,6 +586,12 @@ 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")
++
+ # Check for two threads at least
+ numexpr.set_num_threads(2)
+ #print "**** Running from main process:"
diff --git a/debian/patches/debian-changes-1.3.1-1 b/debian/patches/debian-changes-1.3.1-1
deleted file mode 100644
index 1a8b4e9..0000000
--- a/debian/patches/debian-changes-1.3.1-1
+++ /dev/null
@@ -1,36 +0,0 @@
-Description: Upstream changes introduced in version 1.3.1-1
- This patch has been created by dpkg-source during the package build.
- Here's the last changelog entry, hopefully it gives details on why
- those changes were made:
- .
- numexpr (1.3.1-1) experimental; urgency=low
- .
- * Initial Release. (Closes: #589165)
- .
- The person named in the Author field signed this changelog entry.
-Author: Wen Heping <wenheping at gmail.com>
-Bug-Debian: http://bugs.debian.org/589165
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
---- numexpr-1.3.1.orig/numexpr.egg-info/SOURCES.txt
-+++ numexpr-1.3.1/numexpr.egg-info/SOURCES.txt
-@@ -4,6 +4,7 @@ LICENSE.txt
- MANIFEST.in
- README.txt
- RELEASE_NOTES.txt
-+setup.cfg
- setup.py
- site.cfg.example
- ./numexpr/tests/__init__.py
diff --git a/debian/patches/series b/debian/patches/series
index 926eefe..3880cb4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
-fix-unittests.patch
-debian-changes-1.3.1-1
+0001-fix-unittests.patch
+0002-debian-changes-1.3.1-1.patch
+0003-feature-forwarded-upstream-fix-FTBFS-on-Hurd-and-KFr.patch
--
Packaging for numexpr
More information about the debian-science-commits
mailing list