Bug#926302: unblock: ciftilib/1.5.3-2
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package ciftilib
diff -Nru ciftilib-1.5.3/debian/changelog ciftilib-1.5.3/debian/changelog
--- ciftilib-1.5.3/debian/changelog 2019-01-30 10:15:35.000000000 +0100
+++ ciftilib-1.5.3/debian/changelog 2019-04-02 21:49:25.000000000 +0200
@@ -1,3 +1,11 @@
+ciftilib (1.5.3-2) unstable; urgency=medium
+
+ * gbp.conf: drop pq settings
+ * Cherry-pick upstream fix for FTBFS on big endian.
+ Thanks to Adrian Bunk for reporting (Closes: #921555)
+
+ -- Ghislain Antony Vaillant <ghisvail@gmail.com> Tue, 02 Apr 2019 21:49:25 +0200
+
ciftilib (1.5.3-1) unstable; urgency=medium
* Team upload.
diff -Nru ciftilib-1.5.3/debian/gbp.conf ciftilib-1.5.3/debian/gbp.conf
--- ciftilib-1.5.3/debian/gbp.conf 2019-01-30 10:15:35.000000000 +0100
+++ ciftilib-1.5.3/debian/gbp.conf 2019-04-02 21:49:25.000000000 +0200
@@ -4,6 +4,3 @@
upstream-tag = upstream/%(version)s
debian-tag = debian/%(version)s
pristine-tar = True
-
-[pq]
-patch-numbers = False
diff -Nru ciftilib-1.5.3/debian/patches/0001-force-endian-of-datatype-example-to-make-tests-pass-.patch ciftilib-1.5.3/debian/patches/0001-force-endian-of-datatype-example-to-make-tests-pass-.patch
--- ciftilib-1.5.3/debian/patches/0001-force-endian-of-datatype-example-to-make-tests-pass-.patch 1970-01-01 01:00:00.000000000 +0100
+++ ciftilib-1.5.3/debian/patches/0001-force-endian-of-datatype-example-to-make-tests-pass-.patch 2019-04-02 21:49:25.000000000 +0200
@@ -0,0 +1,30 @@
+From: Tim Coalson <tsc5yc@mst.edu>
+Date: Mon, 1 Apr 2019 16:56:12 -0500
+Subject: force endian of datatype example to make tests pass on bigendian
+ systems
+
+---
+ example/datatype.cxx | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/example/datatype.cxx b/example/datatype.cxx
+index a293856..1da380b 100644
+--- a/example/datatype.cxx
++++ b/example/datatype.cxx
+@@ -19,14 +19,14 @@ int main(int argc, char** argv)
+ if (argc < 3)
+ {
+ cout << "usage: " << argv[0] << " <input cifti> <output cifti>" << endl;
+- cout << " rewrite the input cifti file to the output filename, using uint8 and data scaling." << endl;
++ cout << " rewrite the input cifti file to the output filename, using uint8 and data scaling, little-endian." << endl;
+ return 1;
+ }
+ try
+ {
+ CiftiFile inputFile(argv[1]);//on-disk reading by default
+ inputFile.setWritingDataTypeAndScaling(NIFTI_TYPE_UINT8, -1.0, 6.0);//tells it to use this datatype to best represent this specified range of values [-1.0, 6.0] whenever this instance is written
+- inputFile.writeFile(argv[2]);//if this is the same filename as the input, CiftiFile actually detects this and reads the input into memory first
++ inputFile.writeFile(argv[2], CiftiVersion(), CiftiFile::LITTLE);//if this is the same filename as the input, CiftiFile actually detects this and reads the input into memory first
+ //otherwise, it will read and write one row at a time, using very little memory
+ //inputFile.setWritingDataTypeNoScaling(NIFTI_TYPE_FLOAT32);//this is how you would revert back to writing as float32 without rescaling
+ } catch (CiftiException& e) {
diff -Nru ciftilib-1.5.3/debian/patches/series ciftilib-1.5.3/debian/patches/series
--- ciftilib-1.5.3/debian/patches/series 1970-01-01 01:00:00.000000000 +0100
+++ ciftilib-1.5.3/debian/patches/series 2019-04-02 21:49:25.000000000 +0200
@@ -0,0 +1 @@
+0001-force-endian-of-datatype-example-to-make-tests-pass-.patch
unblock ciftilib/1.5.3-2
-- System Information:
Debian Release: 9.8
APT prefers stable-updates
APT policy: (500, 'stable-updates'), (500, 'stable')
Architecture: amd64 (x86_64)
Kernel: Linux 4.9.0-6-amd64 (SMP w/1 CPU core)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8), LANGUAGE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
Reply to: