[med-svn] [Git][med-team/physamp][master] 3 commits: d/patches/unforce-cxxflags.patch: merge with upstream's flags, especially -std=c++11

[Michael R. Crusoe (@crusoe)]

Michael R. Crusoe pushed to branch master at Debian Med / physamp


Commits:
867664eb by Michael R. Crusoe at 2024-03-25T17:28:15+01:00
d/patches/unforce-cxxflags.patch: merge with upstream's flags, especially -std=c++11

forward our patch to upstream.

- - - - -
4ade5bc1 by Michael R. Crusoe at 2024-03-25T18:59:19+01:00
Enable full hardening

- - - - -
100c9352 by Michael R. Crusoe at 2024-03-25T18:59:43+01:00
routine-update: Standards-Version: 4.6.2

- - - - -


4 changed files:

- debian/changelog
- debian/control
- debian/patches/unforce-cxxflags.patch
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,13 @@
+physamp (1.1.0-5) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * d/patches/unforce-cxxflags.patch: merge with upstream's flags,
+    especially -std=c++11; forward our patch to upstream.
+  * r/rules: enable full hardening
+  * Standards-Version: 4.6.2 (routine-update)
+
+ -- Michael R. Crusoe <crusoe at debian.org>  Mon, 25 Mar 2024 17:25:38 +0100
+
 physamp (1.1.0-4) unstable; urgency=medium
 
   * Fix watch file


=====================================
debian/control
=====================================
@@ -8,7 +8,7 @@ Build-Depends: debhelper-compat (= 13),
                cmake,
                texinfo,
                libbpp-phyl-dev
-Standards-Version: 4.6.1
+Standards-Version: 4.6.2
 Vcs-Browser: https://salsa.debian.org/med-team/physamp
 Vcs-Git: https://salsa.debian.org/med-team/physamp.git
 Homepage: https://jydu.github.io/physamp/


=====================================
debian/patches/unforce-cxxflags.patch
=====================================
@@ -1,17 +1,16 @@
 From: Gert Wollny <gw.fossdev at gmail.com>
 Date: Wed, 29 Jun 2014 16:52:43 +0200
-Subject: Do not override Debian CXX flags
-Comment: Upstream version 2.3.0 now has additional -std=c++11 which might
-         be needed to be added explicitly
+Subject: Do not override user-provided CXX flags
+Forwarded: https://github.com/jydu/physamp/pull/1
 
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -7,7 +7,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.11)
+--- physamp.orig/CMakeLists.txt
++++ physamp/CMakeLists.txt
+@@ -7,7 +7,7 @@
  PROJECT(physamp CXX)
  
  # Compile options
 -SET (CMAKE_CXX_FLAGS "-std=c++11 -Wall -Weffc++ -Wshadow -Wconversion")
-+# SET (CMAKE_CXX_FLAGS "-std=c++11 -Wall -Weffc++ -Wshadow -Wconversion")
++add_compile_options(-std=c++11 -Wall -Weffc++ -Wshadow -Wconversion)
  
  IF(NOT CMAKE_BUILD_TYPE)
    SET(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING


=====================================
debian/rules
=====================================
@@ -2,11 +2,7 @@
 
 # DH_VERBOSE := 1
 
-# export DEB_BUILD_MAINT_OPTIONS = hardening=+all # does not build
-export DEB_BUILD_MAINT_OPTIONS = hardening=+bindnow
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 %:
 	dh $@
-
-override_dh_auto_configure:
-	dh_auto_configure -- -DCMAKE_BUILD_TYPE=RelWithDebInfo



View it on GitLab: https://salsa.debian.org/med-team/physamp/-/compare/ad72871d64e52c08c7e57ff71deb2bbd2d6fdab1...100c9352cf66c496829fa8d4515fd15438d92567

-- 
View it on GitLab: https://salsa.debian.org/med-team/physamp/-/compare/ad72871d64e52c08c7e57ff71deb2bbd2d6fdab1...100c9352cf66c496829fa8d4515fd15438d92567
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/20240325/ec865593/attachment-0001.htm>