[med-svn] [Git][med-team/ciftilib][debian/master] 3 commits: gbp.conf: drop pq settings

[Ghislain Antony Vaillant]

Ghislain Antony Vaillant pushed to branch debian/master at Debian Med / ciftilib


Commits:
a242d864 by Ghislain Antony Vaillant at 2019-04-02T19:38:58Z
gbp.conf: drop pq settings

- - - - -
098a2e65 by Ghislain Antony Vaillant at 2019-04-02T19:40:44Z
Cherry-pick upstream fix for FTBFS on big endian

Gbp-Dch: Short
Closes: #921555
Thanks: Adrian Bunk for reporting

- - - - -
801027b6 by Ghislain Antony Vaillant at 2019-04-02T19:50:36Z
Prepare changelog

- - - - -


4 changed files:

- debian/changelog
- debian/gbp.conf
- + debian/patches/0001-force-endian-of-datatype-example-to-make-tests-pass-.patch
- + debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+ciftilib (1.5.3-2) UNRELEASED; 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 at gmail.com>  Tue, 02 Apr 2019 21:49:25 +0200
+
 ciftilib (1.5.3-1) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/gbp.conf
=====================================
@@ -4,6 +4,3 @@ debian-branch = debian/master
 upstream-tag = upstream/%(version)s
 debian-tag = debian/%(version)s
 pristine-tar = True
-
-[pq]
-patch-numbers = False


=====================================
debian/patches/0001-force-endian-of-datatype-example-to-make-tests-pass-.patch
=====================================
@@ -0,0 +1,30 @@
+From: Tim Coalson <tsc5yc at 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) {


=====================================
debian/patches/series
=====================================
@@ -0,0 +1 @@
+0001-force-endian-of-datatype-example-to-make-tests-pass-.patch



View it on GitLab: https://salsa.debian.org/med-team/ciftilib/compare/7404c968411b750315bcfa5dfc882faf771474c2...801027b67892f1716038538f649984247152d941

-- 
View it on GitLab: https://salsa.debian.org/med-team/ciftilib/compare/7404c968411b750315bcfa5dfc882faf771474c2...801027b67892f1716038538f649984247152d941
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/20190402/030e9172/attachment-0001.html>