[med-svn] [Git][med-team/bart][master-contrib] 5 commits: routine-update: Standards-Version: 4.6.0

[Martin Uecker (@uecker-guest)]

Martin Uecker pushed to branch master-contrib at Debian Med / bart


Commits:
00d969c5 by Andreas Tille at 2021-10-27T08:04:31+02:00
routine-update: Standards-Version: 4.6.0

- - - - -
ebd42db0 by Andreas Tille at 2021-10-27T08:04:36+02:00
routine-update: No tab in license text

- - - - -
08dca9da by Martin Uecker at 2021-12-29T18:13:37+01:00
workaround for compiler bug

- - - - -
a99fc6c1 by Martin Uecker at 2021-12-29T18:13:37+01:00
Update changelog

- - - - -
46bb1d4d by Martin Uecker at 2021-12-29T18:17:37+01:00
Merge branch 'master' into master-contrib

- - - - -


5 changed files:

- debian/changelog
- debian/control
- debian/copyright
- + debian/patches/0005-workaround-for-compiler-bug.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,8 +1,14 @@
 bart-cuda (0.7.00-1) UNRELEASED; urgency=medium
 
+  [ Martin Uecker ]
   * New upstream version.
   * Update upstream metadata.
   * Patch to relax failing unit test.
+  * Patch to work around compiler bug.
+
+  [ Andreas Tille ]
+  * Standards-Version: 4.6.0 (routine-update)
+  * No tab in license text (routine-update)
 
  -- Martin Uecker <martin.uecker at med.uni-goettingen.de>  Thu, 26 Aug 2021 15:05:30 +0200
 


=====================================
debian/control
=====================================
@@ -9,7 +9,7 @@ Build-Depends: debhelper-compat (= 13),
                libpng-dev,
                liblapacke-dev,
                nvidia-cuda-toolkit
-Standards-Version: 4.5.0
+Standards-Version: 4.6.0
 Vcs-Browser: https://salsa.debian.org/med-team/bart
 Vcs-Git: https://salsa.debian.org/med-team/bart.git
 Homepage: https://mrirecon.github.io/bart/


=====================================
debian/copyright
=====================================
@@ -13,12 +13,12 @@ Copyright: 2013-2020 The Regents of the University of California
            2014-2016 Joseph Y Cheng
            2013,2015 Tao Zhang
            2016      Tim Loderhose
-           2016	     David Smith
+           2016             David Smith
            2016      Hans Johnson
            2017-2018 Damien Nguyen
            2017-2019 Christian Holme
            2017-2020 Sebastian Rosenzweig
-	   2020	     Martin Krämer
+           2020             Martin Krämer
 License: BSD-3-clause
  All rights reserved.
  .


=====================================
debian/patches/0005-workaround-for-compiler-bug.patch
=====================================
@@ -0,0 +1,40 @@
+From: Martin Uecker <martin.uecker at med.uni-goettingen.de>
+Date: Wed, 29 Dec 2021 14:31:57 +0100
+Subject: workaround for compiler bug
+
+---
+ src/simu/shape.h      | 4 ++--
+ src/simu/shepplogan.h | 6 +++---
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/simu/shape.h b/src/simu/shape.h
+index 52c1448..eae2b84 100644
+--- a/src/simu/shape.h
++++ b/src/simu/shape.h
+@@ -1,6 +1,6 @@
+ 
+ #include <complex.h>
+ 
+-extern complex double xpolygon(int N, const double pg[N][2], const double p[3]);
+-extern complex double kpolygon(int N, const double pg[N][2], const double q[3]);
++extern complex double xpolygon(int N, const double pg[/*N*/][2], const double p[3]);
++extern complex double kpolygon(int N, const double pg[/*N*/][2], const double q[3]);
+ 
+diff --git a/src/simu/shepplogan.h b/src/simu/shepplogan.h
+index 34b71b6..fad5ac7 100644
+--- a/src/simu/shepplogan.h
++++ b/src/simu/shepplogan.h
+@@ -62,10 +62,10 @@ extern complex double krectangle(const double center[2], const double axis[2], d
+     
+ 
+ 
+-extern complex double phantom(unsigned int N, const struct ellipsis_s arr[__VLA(N)], const double pos[2], _Bool ksp);
+-extern complex double phantomX(unsigned int N, const struct ellipsis_s arr[__VLA(N)], const double pos[2], _Bool ksp);
++extern complex double phantom(unsigned int N, const struct ellipsis_s arr[/*__VLA(N)*/], const double pos[2], _Bool ksp);
++extern complex double phantomX(unsigned int N, const struct ellipsis_s arr[/*__VLA(N)*/], const double pos[2], _Bool ksp);
+ 
+-extern complex double phantom3d(unsigned int N, const struct ellipsis3d_s arr[__VLA(N)], const double pos[3], _Bool ksp);
++extern complex double phantom3d(unsigned int N, const struct ellipsis3d_s arr[/*__VLA(N)*/], const double pos[3], _Bool ksp);
+ 
+ #include "misc/cppwrap.h"
+ 


=====================================
debian/patches/series
=====================================
@@ -2,3 +2,4 @@
 0002-remove-empty-directory.patch
 0003-deactivate-ode-unit-tests.patch
 0004-relax-failing-unit-test.patch
+0005-workaround-for-compiler-bug.patch



View it on GitLab: https://salsa.debian.org/med-team/bart/-/compare/7b25cac642eb1ba9f58c8016f91d651f5cf9daca...46bb1d4ddc8bdace1254b79a81daf397666c2183

-- 
View it on GitLab: https://salsa.debian.org/med-team/bart/-/compare/7b25cac642eb1ba9f58c8016f91d651f5cf9daca...46bb1d4ddc8bdace1254b79a81daf397666c2183
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/20211229/0259fd47/attachment-0001.htm>