[med-svn] [Git][med-team/intake][master] 4 commits: fix-ftbfs-on-32bits.patch: adjust to support big endian

Étienne Mollier (@emollier) gitlab at salsa.debian.org
Sat Oct 16 22:47:29 BST 2021



Étienne Mollier pushed to branch master at Debian Med / intake


Commits:
18d1aa84 by Étienne Mollier at 2021-10-16T22:01:02+02:00
fix-ftbfs-on-32bits.patch: adjust to support big endian

- - - - -
324a124b by Étienne Mollier at 2021-10-16T23:24:14+02:00
rename fix-ftbfs-on-32bits.patch as architectures-support.patch

Since the new patch allows us to build on more than just 32-bit
architectures, let's rename it to something more adequate.

- - - - -
a02a0f9f by Étienne Mollier at 2021-10-16T23:24:53+02:00
architectures-support.patch: bring back amd64 support

- - - - -
17864110 by Étienne Mollier at 2021-10-16T23:25:13+02:00
update changelog for upload to unstable

- - - - -


3 changed files:

- debian/changelog
- debian/patches/fix-ftbfs-on-32bits.patch → debian/patches/architectures-support.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+intake (0.6.4-2) unstable; urgency=medium
+
+  * adjust fix-ftbfs-on-32bits.patch to allow unit tests to pass on big endian
+    systems, and rename the patch as architectures-support.patch, to reflect
+    that change.
+
+ -- Étienne Mollier <emollier at debian.org>  Sat, 16 Oct 2021 23:16:30 +0200
+
 intake (0.6.4-1) unstable; urgency=medium
 
   * New upstream version


=====================================
debian/patches/fix-ftbfs-on-32bits.patch → debian/patches/architectures-support.patch
=====================================
@@ -1,8 +1,9 @@
 Description: fix failure to build from source on 32bits platform
+ The patch has been later extended to support big endian systems.
 Author: Étienne Mollier <emollier at debian.org>
 Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=987486
 Forwarded: no
-Last-Update: 2021-07-15
+Last-Update: 2021-10-16
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- intake.orig/intake/source/tests/test_npy.py
@@ -12,6 +13,14 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
      assert s.read().tolist() == [73, 98, 46, 38, 20, 12, 31, 8, 89, 72]
      assert s.npartitions == 1
 -    assert s.dtype == 'int'
-+    assert s.dtype == 'int64'
++    assert s.dtype == '<i8'
      assert s.shape == (10,)
      assert (s.read_partition((0, )) == s.read()).all()
+--- intake.orig/intake/catalog/tests/test_alias.py
++++ intake/intake/catalog/tests/test_alias.py
+@@ -33,4 +33,4 @@
+     assert s.container == 'other'
+     out = str(s.discover())
+     assert s.container == 'ndarray'
+-    assert "int64" in out
++    assert "int64" in out or "<i8" in out


=====================================
debian/patches/series
=====================================
@@ -1,6 +1,6 @@
 tempfix_ftbfs.patch
 fix_privacy_breach.patch
 fix_tests.patch
-fix-ftbfs-on-32bits.patch
+architectures-support.patch
 typo-in-manual-page.patch
 sphinx-app-css.patch



View it on GitLab: https://salsa.debian.org/med-team/intake/-/compare/4d7a89d72e5b7946bdc004c93e56fdaf27d2240e...1786411079ac48d017165a39f5d9bf04452ce58b

-- 
View it on GitLab: https://salsa.debian.org/med-team/intake/-/compare/4d7a89d72e5b7946bdc004c93e56fdaf27d2240e...1786411079ac48d017165a39f5d9bf04452ce58b
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20211016/cc0eed8d/attachment-0001.htm>


More information about the debian-med-commit mailing list