[med-svn] [Git][med-team/qrisk2][master] 8 commits: Merge build_on_non-linux_systems.patch and multiarch-libc.patch

Santiago Vila (@sanvila) gitlab at salsa.debian.org
Mon Mar 2 10:33:21 GMT 2026 


Santiago Vila pushed to branch master at Debian Med / qrisk2


Commits:
e24a0208 by Santiago Vila at 2026-03-02T11:23:00+01:00
Merge build_on_non-linux_systems.patch and multiarch-libc.patch

The second one supersedes the first one.

Also, restore include/clinrisk/utils.h as dependency for c/utils.o.

- - - - -
2aec8ffd by Santiago Vila at 2026-03-02T11:24:00+01:00
Do not run makedepend. Closes: #1046238.

- - - - -
9bb471a0 by Santiago Vila at 2026-03-02T11:25:00+01:00
Improve hardening-flags.patch.

This should make blhc happy.

- - - - -
0911f3b9 by Santiago Vila at 2026-03-02T11:26:00+01:00
d/control: Drop "Rules-Requires-Root: no" (default).

- - - - -
fc8247c1 by Santiago Vila at 2026-03-02T11:27:00+01:00
d/control: Drop "Priority: optional" (default).

- - - - -
f06dee3e by Santiago Vila at 2026-03-02T11:28:00+01:00
d/control: Update standards-version.

- - - - -
7d8e0e63 by Santiago Vila at 2026-03-02T11:29:00+01:00
Add debian/salsa-ci.yml.

- - - - -
420b115c by Santiago Vila at 2026-03-02T11:30:00+01:00
Upload for unstable as 0.1.20150729-8

- - - - -


8 changed files:

- debian/changelog
- debian/control
- − debian/patches/build_on_non-linux_systems.patch
- debian/patches/hardening-flags.patch
- debian/patches/multiarch-libc.patch
- debian/patches/series
- + debian/patches/skip-makedepend.patch
- + debian/salsa-ci.yml


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,16 @@
+qrisk2 (0.1.20150729-8) unstable; urgency=medium
+
+  * Team upload.
+  * Merge build_on_non-linux_systems.patch and multiarch-libc.patch.
+  * Do not run makedepend. Closes: #1046238.
+  * Improve hardening-flags.patch.
+  * Drop "Rules-Requires-Root: no" (default).
+  * Drop "Priority: optional" (default).
+  * Update standards-version.
+  * Add debian/salsa-ci.yml.
+
+ -- Santiago Vila <sanvila at debian.org>  Mon, 02 Mar 2026 11:30:00 +0100
+
 qrisk2 (0.1.20150729-7) unstable; urgency=medium
 
   * Fix clean target


=====================================
debian/control
=====================================
@@ -3,14 +3,12 @@ Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.
 Uploaders: Andreas Tille <tille at debian.org>,
            Thorsten Alteholz <debian at alteholz.de>
 Section: science
-Priority: optional
 Build-Depends: debhelper-compat (= 13),
                xutils-dev
-Standards-Version: 4.7.0
+Standards-Version: 4.7.3
 Vcs-Browser: https://salsa.debian.org/med-team/qrisk2
 Vcs-Git: https://salsa.debian.org/med-team/qrisk2.git
 Homepage: https://qrisk.org/
-Rules-Requires-Root: no
 
 Package: qrisk2
 Architecture: any


=====================================
debian/patches/build_on_non-linux_systems.patch deleted
=====================================
@@ -1,22 +0,0 @@
-Author: Samuel Thibault <sthibault at debian.org>
-Last-Update: Wed, 23 Nov 2016 02:35:21 +0100
-Bug-Debian: https://bugs.debian.org/845403
-Description: qrisk2 currently FTBFS on !linux archs because its Makefile hardcodes
- a dependency on /usr/include/linux/string.h.  This patch enables build also on
- non-Linux systems
-
---- a/Makefile
-+++ b/Makefile
-@@ -81,9 +81,9 @@ clean:
- # DO NOT DELETE
- 
- c/Q80_model_4_0.o: /usr/include/math.h /usr/include/features.h
--c/Q80_model_4_0.o: /usr/include/linux/string.h
-+c/Q80_model_4_0.o: /usr/include/string.h
- c/Q80_model_4_0.o: include/clinrisk/Q80_model_4_0.h include/clinrisk/utils.h
- c/Q80_model_4_1.o: /usr/include/math.h /usr/include/features.h
--c/Q80_model_4_1.o: /usr/include/linux/string.h
-+c/Q80_model_4_1.o: /usr/include/string.h
- c/Q80_model_4_1.o: include/clinrisk/Q80_model_4_1.h include/clinrisk/utils.h
--c/utils.o: /usr/include/linux/string.h include/clinrisk/utils.h
-+c/utils.o: /usr/include/string.h include/clinrisk/utils.h


=====================================
debian/patches/hardening-flags.patch
=====================================
@@ -18,7 +18,7 @@ Author: Thorsten Alteholz <debian at alteholz.de>
  
  .c:
 -	$(CC) $(INCLUDES) $(LDFLAGS) $< -o $@ $(LIBS)
-+	$(CC) $(INCLUDES) $(LDFLAGS) $(CPPFLAGS) $< -o $@ $(LIBS)
++	$(CC) $(INCLUDES) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) $< -o $@ $(LIBS)
  
  .c.o:
 -	$(CC) $(INCLUDES) $(CCFLAGS) -c $< -o $@


=====================================
debian/patches/multiarch-libc.patch
=====================================
@@ -4,15 +4,15 @@ Description: Do not hardcode location of libc headers
 
 --- a/Makefile
 +++ b/Makefile
-@@ -80,10 +80,6 @@ clean:
+@@ -80,10 +80,6 @@
  
  # DO NOT DELETE
  
 -c/Q80_model_4_0.o: /usr/include/math.h /usr/include/features.h
--c/Q80_model_4_0.o: /usr/include/string.h
+-c/Q80_model_4_0.o: /usr/include/linux/string.h
  c/Q80_model_4_0.o: include/clinrisk/Q80_model_4_0.h include/clinrisk/utils.h
 -c/Q80_model_4_1.o: /usr/include/math.h /usr/include/features.h
--c/Q80_model_4_1.o: /usr/include/string.h
+-c/Q80_model_4_1.o: /usr/include/linux/string.h
  c/Q80_model_4_1.o: include/clinrisk/Q80_model_4_1.h include/clinrisk/utils.h
--c/utils.o: /usr/include/string.h include/clinrisk/utils.h
-+c/utils.o:
+-c/utils.o: /usr/include/linux/string.h include/clinrisk/utils.h
++c/utils.o: include/clinrisk/utils.h


=====================================
debian/patches/series
=====================================
@@ -1,4 +1,4 @@
 hardening-flags.patch
-build_on_non-linux_systems.patch
 multiarch-libc.patch
 glibc-2.38.patch
+skip-makedepend.patch


=====================================
debian/patches/skip-makedepend.patch
=====================================
@@ -0,0 +1,16 @@
+From: Santiago Vila <sanvila at debian.org>
+Subject: Do not run makedepend
+Bug-Debian: https://bugs.debian.org/1046238
+Last-Update: 2026-03-01
+
+--- a/Makefile
++++ b/Makefile
+@@ -52,7 +52,7 @@
+ 
+ .SUFFIXES: .c
+ 
+-default: dep executables
++default: executables
+ 
+ executables: $(EXECUTABLES)
+ 	cp $(EXECUTABLES) executables


=====================================
debian/salsa-ci.yml
=====================================
@@ -0,0 +1,7 @@
+---
+include:
+  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/recipes/debian.yml
+
+variables:
+  SALSA_CI_DISABLE_BUILD_PACKAGE_ALL: 1
+  SALSA_CI_DISABLE_BUILD_PACKAGE_ANY: 1



View it on GitLab: https://salsa.debian.org/med-team/qrisk2/-/compare/5eb799953784a023c7036977af2f2ea065ae18c0...420b115ca045ab728f331c2cfdf3f71b4557a93e

-- 
View it on GitLab: https://salsa.debian.org/med-team/qrisk2/-/compare/5eb799953784a023c7036977af2f2ea065ae18c0...420b115ca045ab728f331c2cfdf3f71b4557a93e
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/20260302/fd2a8bdb/attachment-0001.htm>

More information about the debian-med-commit mailing list