[med-svn] [Git][med-team/sumatra][master] 6 commits: buildflags.patch: new: propagate build flags.

[Étienne Mollier (@emollier)]

Étienne Mollier pushed to branch master at Debian Med / sumatra


Commits:
b59aceb4 by Étienne Mollier at 2025-12-09T22:15:24+01:00
buildflags.patch: new: propagate build flags.

Closes: #1119579

- - - - -
793010ac by Étienne Mollier at 2025-12-09T22:17:52+01:00
d/patches/*: normalise Last-Update timestamp.

- - - - -
38cfe5b5 by Étienne Mollier at 2025-12-09T22:19:07+01:00
d/watch: convert to v5 watch file.

- - - - -
c592b051 by Étienne Mollier at 2025-12-09T22:19:40+01:00
d/control: drop redundant Rules-Requires-Root: no.

- - - - -
8f106f3f by Étienne Mollier at 2025-12-09T22:20:00+01:00
d/control: declare compliance to standards version 4.7.2.

- - - - -
12c6cf29 by Étienne Mollier at 2025-12-09T22:20:48+01:00
d/changelog: ready for upload to unstable.

- - - - -


7 changed files:

- debian/changelog
- debian/control
- + debian/patches/buildflags.patch
- debian/patches/hardening.patch
- debian/patches/series
- debian/patches/use_debian_packaged_sumalibs.patch
- debian/watch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,9 +1,17 @@
-sumatra (1.0.36+ds-3) UNRELEASED; urgency=medium
+sumatra (1.0.36+ds-3) unstable; urgency=medium
 
+  [ Andreas Tille ]
   * Remove Tim Booth <tbooth at ceh.ac.uk> since address is bouncing
     (Thank you for your work on this package, Tim)
 
- -- Andreas Tille <tille at debian.org>  Mon, 16 Sep 2024 12:49:44 +0200
+  [ Étienne Mollier ]
+  * buildflags.patch: new: propagate build flags. (Closes: #1119579)
+  * d/patches/*: normalise Last-Update timestamp.
+  * d/watch: convert to v5 watch file.
+  * d/control: drop redundant Rules-Requires-Root: no.
+  * d/control: declare compliance to standards version 4.7.2.
+
+ -- Étienne Mollier <emollier at debian.org>  Tue, 09 Dec 2025 22:20:36 +0100
 
 sumatra (1.0.36+ds-2) unstable; urgency=medium
 


=====================================
debian/control
=====================================
@@ -7,11 +7,10 @@ Priority: optional
 Build-Depends: debhelper-compat (= 13),
                libsuma-dev,
                zlib1g-dev
-Standards-Version: 4.6.1
+Standards-Version: 4.7.2
 Vcs-Browser: https://salsa.debian.org/med-team/sumatra
 Vcs-Git: https://salsa.debian.org/med-team/sumatra.git
 Homepage: http://metabarcoding.org/sumatra
-Rules-Requires-Root: no
 
 Package: sumatra
 Architecture: any


=====================================
debian/patches/buildflags.patch
=====================================
@@ -0,0 +1,37 @@
+Description: propagate all Debian build flags.
+Author: Étienne Mollier <emollier at debian.org>
+Bug-Debian: https://bugs.debian.org/1119579
+Forwarded: not-needed
+Last-Update: 2025-12-09
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- sumatra.orig/Makefile
++++ sumatra/Makefile
+@@ -1,6 +1,6 @@
+ PREFIX=/usr
+ 
+-CFLAGS=-I$(PREFIX)/include
++CFLAGS += -I$(PREFIX)/include
+ 
+ EXEC = sumatra
+ 
+@@ -27,7 +27,7 @@
+ # executable compilation and link
+ 
+ sumatra: $(SUMATRA_OBJ)
+-	$(CC) $(LDFLAGS) -o $@ -pthread $(SUMATRA_OBJ) $(LIBSUMAPATH) $(LIB)
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ -pthread $(SUMATRA_OBJ) $(LIBSUMAPATH) $(LIB)
+ 	
+ ########
+ #
+--- sumatra.orig/global.mk
++++ sumatra/global.mk
+@@ -17,7 +17,7 @@
+ default: all
+ 
+ %.o: %.c
+-	$(CC) $(CFLAGS) -c -o $@ $< $(LIB)
++	$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $< $(LIB)
+ 
+ 
+ ########


=====================================
debian/patches/hardening.patch
=====================================
@@ -1,5 +1,5 @@
 Author: Andreas Tille <tille at debian.org>
-Last-Update: Wed, 05 Aug 2015 17:54:58 +0200
+Last-Update: 2015-08-05
 Forwarded: not-needed
 Description: Propagate hardening options
 


=====================================
debian/patches/series
=====================================
@@ -1,3 +1,4 @@
 hardening.patch
 use_debian_packaged_sumalibs.patch
 fix_build.patch
+buildflags.patch


=====================================
debian/patches/use_debian_packaged_sumalibs.patch
=====================================
@@ -1,5 +1,5 @@
 Author: Andreas Tille <tille at debian.org>
-Last-Update: Thu, 09 Apr 2020 14:06:08 +0200
+Last-Update: 2020-08-09
 Forwarded: not-needed
 Description: Build using Debian packaged libsuma
 


=====================================
debian/watch
=====================================
@@ -1,4 +1,5 @@
-version=4
+Version: 5
 
-opts=dversionmangle=s/\+ds// \
-https://git.metabarcoding.org/obitools/sumatra/wikis/home .*/sumatra/uploads/.*/sumatra_v(\d[\d.-]+)\.(?:tar(?:\.gz|\.bz2)?|tgz)
+Source: https://git.metabarcoding.org/obitools/sumatra/wikis/home
+Matching-Pattern: .*/sumatra/uploads/.*/sumatra_v(\d[\d.-]+)\.(?:tar(?:\.gz|\.bz2)?|tgz)
+Dversionmangle: auto



View it on GitLab: https://salsa.debian.org/med-team/sumatra/-/compare/79bd37fe3b517e79b8f2e62a962ef563f0f80d6c...12c6cf29756812bcebd01e9a6d3c70d121bc8214

-- 
View it on GitLab: https://salsa.debian.org/med-team/sumatra/-/compare/79bd37fe3b517e79b8f2e62a962ef563f0f80d6c...12c6cf29756812bcebd01e9a6d3c70d121bc8214
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/20251209/c6156e64/attachment-0001.htm>