[med-svn] [Git][med-team/maffilter][master] 2 commits: Added patch to combine upstream's c++ flags with out own.

[Michael R. Crusoe (@crusoe)]

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


Commits:
90fcad40 by Michael R. Crusoe at 2024-03-26T09:39:41+01:00
Added patch to combine upstream's c++ flags with out own.

- - - - -
4cec5cdc by Michael R. Crusoe at 2024-03-26T09:58:07+01:00
d/rules: simplified

- - - - -


4 changed files:

- debian/changelog
- + debian/patches/hardening
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+maffilter (1.3.1+dfsg-6) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Added patch to combine upstream's c++ flags with out own.
+  * d/rules: simplified
+
+ -- Michael R. Crusoe <crusoe at debian.org>  Tue, 26 Mar 2024 09:35:04 +0100
+
 maffilter (1.3.1+dfsg-5) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/patches/hardening
=====================================
@@ -0,0 +1,14 @@
+From: Michael R. Crusoe <crusoe at debian.org>
+Subject: Don't overwrite user-provided CXX flags
+Forwarded: https://github.com/jydu/maffilter/pull/28
+--- maffilter.orig/CMakeLists.txt
++++ maffilter/CMakeLists.txt
+@@ -12,7 +12,7 @@
+       FORCE)
+ ENDIF()
+ 
+-SET(CMAKE_CXX_FLAGS "-std=c++11 -Wall -Weffc++ -Wshadow")
++add_compile_options(-std=c++11 -Wall -Weffc++ -Wshadow)
+ 
+ 
+ 


=====================================
debian/patches/series
=====================================
@@ -0,0 +1 @@
+hardening


=====================================
debian/rules
=====================================
@@ -3,15 +3,9 @@
 #export DH_VERBOSE=1
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-export DEB_CFLAGS_MAINT_APPEND=-DNDEBUG -g
-export DEB_CXXFLAGS_MAINT_APPEND=-DNDEBUG -g
 
 %:
 	dh $@
 
-override_dh_auto_configure:
-	dh_auto_configure -- -DCMAKE_BUILD_TYPE=RelWithDebInfo
-
-override_dh_fixperms:
-	dh_fixperms
+execute_after_dh_fixperms:
 	find debian/*/usr/share -name "*.bpp" -executable -exec chmod -x \{\} \;



View it on GitLab: https://salsa.debian.org/med-team/maffilter/-/compare/151d6af3950ac831487a10839aa5bd27ef0d24cb...4cec5cdc315419e1d61f7c118b31474b3c50c675

-- 
View it on GitLab: https://salsa.debian.org/med-team/maffilter/-/compare/151d6af3950ac831487a10839aa5bd27ef0d24cb...4cec5cdc315419e1d61f7c118b31474b3c50c675
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/20240326/f30cda44/attachment-0001.htm>