[med-svn] [Git][med-team/saint][master] 6 commits: Fix gcc-10 FTBFS

[Nilesh Patra]

Nilesh Patra pushed to branch master at Debian Med / saint


Commits:
ed5bf83b by Nilesh Patra at 2020-07-28T20:51:38+05:30
Fix gcc-10 FTBFS

- - - - -
432ddcdd by Nilesh Patra at 2020-07-28T20:53:46+05:30
Drop compate, debhelper-compat 13

- - - - -
0a2ea65b by Nilesh Patra at 2020-07-28T20:54:26+05:30
standards version: 4.5.0

- - - - -
a65c46c9 by Nilesh Patra at 2020-07-28T20:55:08+05:30
Add "Rules-Requires-Root:no"

- - - - -
e7aa1680 by Nilesh Patra at 2020-07-28T20:55:55+05:30
Use secure URI

- - - - -
c60f15d1 by Nilesh Patra at 2020-07-28T20:56:57+05:30
Update changelog

- - - - -


6 changed files:

- debian/changelog
- − debian/compat
- debian/control
- debian/copyright
- + debian/patches/fix-gcc10-build.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,19 @@
+saint (2.5.0+dfsg-4) unstable; urgency=medium
+
+  * Team Upload.
+  [ Steffen Moeller ]
+  * d/u/metadata: yamllint
+  * Update metadata with ref to conda
+
+  [ Nilesh Patra ]
+  * Fix gcc-10 FTBFS (Closes: #957772)
+  * Drop compate, debhelper-compat 13
+  * standards version: 4.5.0
+  * Add "Rules-Requires-Root:no"
+  * Use secure URI
+
+ -- Nilesh Patra <npatra974 at gmail.com>  Tue, 28 Jul 2020 20:55:59 +0530
+
 saint (2.5.0+dfsg-3) unstable; urgency=medium
 
   * Remove unneeded get-orig-source target


=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-11


=====================================
debian/control
=====================================
@@ -4,12 +4,13 @@ Uploaders: Andreas Tille <tille at debian.org>,
            Thorsten Alteholz <debian at alteholz.de>
 Section: science
 Priority: optional
-Build-Depends: debhelper (>= 11~),
+Build-Depends: debhelper-compat (= 13),
                libgsl-dev
-Standards-Version: 4.1.4
+Standards-Version: 4.5.0
 Vcs-Browser: https://salsa.debian.org/med-team/saint
 Vcs-Git: https://salsa.debian.org/med-team/saint.git
 Homepage: http://saint-apms.sourceforge.net/Main.html
+Rules-Requires-Root: no
 
 Package: saint
 Architecture: any


=====================================
debian/copyright
=====================================
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: SAINT
 Upstream-Contact: Hyung Won Choi <hyung_won_choi at nuhs.edu.sg>
 Source: https://sourceforge.net/projects/saint-apms/files/


=====================================
debian/patches/fix-gcc10-build.patch
=====================================
@@ -0,0 +1,56 @@
+Author: Nilesh Patra <npatra974 at gmail.com>
+Description: Append relevant attribute flag to prevent gcc-10 FTBFS
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?archive=no&bug=957772
+Last-Updated: July 28, 2020
+
+--- a/src/SAINTspc-noctrl/saint.h
++++ b/src/SAINTspc-noctrl/saint.h
+@@ -242,12 +242,12 @@
+ 
+ 
+ /* GLOBAL VARIABLES */
+-int burn;
+-int iter;
+-float freq;
+-float freqgroup;
+-int modelvar;
+-int NORMALIZE;
++__attribute__((__common__)) int burn;
++__attribute__((__common__)) int iter;
++__attribute__((__common__)) float freq;
++__attribute__((__common__)) float freqgroup;
++__attribute__((__common__)) int modelvar;
++__attribute__((__common__)) int NORMALIZE;
+ 
+ /*************/
+ /* functions */
+--- a/src/SAINTspc-ctrl/saint.h
++++ b/src/SAINTspc-ctrl/saint.h
+@@ -237,11 +237,11 @@
+   HISTOGRAM2 hist_eta0;
+ } SUMMARY;
+ 
+-int NORMALIZE;
+-int lowMode;
+-int minFold;
+-int burn;
+-int iter;
++__attribute__((__common__)) int NORMALIZE;
++__attribute__((__common__)) int lowMode;
++__attribute__((__common__)) int minFold;
++__attribute__((__common__)) int burn;
++__attribute__((__common__)) int iter;
+ 
+ 
+ 
+--- a/src/SAINTint-ctrl/saint.h
++++ b/src/SAINTint-ctrl/saint.h
+@@ -54,7 +54,7 @@
+ #define _tiny_ 1e-100
+ 
+ /* global variable */
+-float dmin;
++__attribute__((__common__)) float dmin;
+ 
+ 
+ typedef struct tagDATA {


=====================================
debian/patches/series
=====================================
@@ -1,2 +1,3 @@
 fix-makefile.patch
 ld-as-needed.patch
+fix-gcc10-build.patch



View it on GitLab: https://salsa.debian.org/med-team/saint/-/compare/85b53613ac53dbdcf2d6ef8be739fd04943d1ee1...c60f15d13e726a91d797dd327930003b16a9f57e

-- 
View it on GitLab: https://salsa.debian.org/med-team/saint/-/compare/85b53613ac53dbdcf2d6ef8be739fd04943d1ee1...c60f15d13e726a91d797dd327930003b16a9f57e
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/20200728/a1d9d50e/attachment-0001.html>