[SCM] Packaging for pytables branch, master, updated. debian/2.4.0-1-39-gc098989
Antonio Valentino
antonio.valentino at tiscali.it
Mon Jun 24 19:32:14 UTC 2013
The following commit has been merged in the master branch:
commit c098989d4316156c2b46f26124b8ef0e346d47f4
Author: Antonio Valentino <antonio.valentino at tiscali.it>
Date: Mon Jun 24 17:59:45 2013 +0000
Refresh all patches
Drop 0002-Fix-detection-od-platforms-supporting-blosc.patch (applied upstream)
diff --git a/debian/changelog b/debian/changelog
index b4e1023..e643f8f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-pytables (3.0.0-1) experimental; urgency=low
+pytables (3.0.0-1) UNRELEASED; urgency=low
* New upstream release
* Fix PDF doc installation after upstream changes
@@ -6,6 +6,11 @@ pytables (3.0.0-1) experimental; urgency=low
* Build-Depend on numexpr >= 2.1
* Minimum Python version is now 2.6
* New packages for Python 3
+ * Refresh all patches
+ * Drop 0002-Fix-detection-od-platforms-supporting-blosc.patch
+ (applied upstream)
+
+ -- Antonio Valentino <antonio.valentino at tiscali.it> Sun, 23 Jun 2013 14:14:23 +0000
pytables (2.4.0-3) unstable; urgency=low
diff --git a/debian/patches/0002-Fix-detection-od-platforms-supporting-blosc.patch b/debian/patches/0001-Fix-detection-of-platforms-supporting-blosc.patch
similarity index 61%
rename from debian/patches/0002-Fix-detection-od-platforms-supporting-blosc.patch
rename to debian/patches/0001-Fix-detection-of-platforms-supporting-blosc.patch
index 524e3f0..0c91662 100644
--- a/debian/patches/0002-Fix-detection-od-platforms-supporting-blosc.patch
+++ b/debian/patches/0001-Fix-detection-of-platforms-supporting-blosc.patch
@@ -1,16 +1,14 @@
From: Antonio Valentino <antonio.valentino at tiscali.it>
Date: Mon, 24 Jun 2013 18:47:32 +0200
-Subject: Fix detection od platforms supporting blosc
+Subject: Fix detection of platforms supporting blosc
---
tables/utilsExtension.pyx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/tables/utilsExtension.pyx b/tables/utilsExtension.pyx
-index 6a06af7..71db46b 100644
---- a/tables/utilsExtension.pyx
-+++ b/tables/utilsExtension.pyx
-@@ -124,7 +124,7 @@ def _arch_without_blosc():
+--- a/tables/utilsextension.pyx
++++ b/tables/utilsextension.pyx
+@@ -234,7 +234,7 @@
for a in ["arm", "sparc", "mips"]:
if a in arch:
return True
diff --git a/debian/patches/0001-Fix-tests-of-nested-record-reperesentation-on-big-en.patch b/debian/patches/0001-Fix-tests-of-nested-record-reperesentation-on-big-en.patch
deleted file mode 100644
index d4629db..0000000
--- a/debian/patches/0001-Fix-tests-of-nested-record-reperesentation-on-big-en.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From: Antonio Valentino <antonio.valentino at tiscali.it>
-Date: Mon, 24 Jun 2013 05:59:00 +0000
-Subject: Fix tests of nested record reperesentation on big-endian machines.
-
-Backport of upstream fix for gh-237 (see also
-https://github.com/PyTables/PyTables/issues/237).
----
- tables/tests/test_nestedtypes.py | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/tables/tests/test_nestedtypes.py b/tables/tests/test_nestedtypes.py
-index 7ec7ea2..524bbc7 100644
---- a/tables/tests/test_nestedtypes.py
-+++ b/tables/tests/test_nestedtypes.py
-@@ -816,15 +816,15 @@ class ColsTestCase(common.TempFileMixin, common.PyTablesTestCase):
- )
- except AssertionError:
- self.assertEqual(repr(tbl.cols),
--"""/test.cols (Cols), 6 columns
-- x (Column(0, 2), ('<i4', (2,)))
-+ """/test.cols (Cols), 6 columns
-+ x (Column(0, 2), ('%s', (2,)))
- Info (Cols(), Description)
- color (Column(0,), |S2)
- info (Cols(), Description)
-- y (Column(0, 2, 2), ('<f8', (2, 2)))
-+ y (Column(0, 2, 2), ('%s', (2, 2)))
- z (Column(0,), uint8)
--"""
--)
-+""" % (numpy.int32(0).dtype.str, numpy.float64(0).dtype.str)
-+ )
-
- def test00b_repr(self):
- """Checking string representation of nested Cols."""
diff --git a/debian/patches/series b/debian/patches/series
index ed2d21e..0342713 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-0001-Fix-tests-of-nested-record-reperesentation-on-big-en.patch
-0002-Fix-detection-od-platforms-supporting-blosc.patch
+0001-Fix-detection-of-platforms-supporting-blosc.patch
--
Packaging for pytables
More information about the debian-science-commits
mailing list