Michael R. Crusoe pushed to branch master at Debian Med / libbpp-qt
Commits: 19a1a932 by Michael R. Crusoe at 2024-03-25T15:31:51+01:00 d/patches/unforce-cxxflags.patch: update to merge upstream's flags and forward the patch to them. - - - - - aefefd83 by Michael R. Crusoe at 2024-03-25T15:36:39+01:00 Silence some false-positive lintian errors and warnings related to the t64 transition. - - - - - 4a9f3f25 by Michael R. Crusoe at 2024-03-25T18:57:11+01:00 remove unused "BUILD_TESTING=off" - - - - - 7 changed files: - debian/changelog - − debian/libbbp-qt2.lintian-overrides - debian/libbpp-qt2t64.lintian-overrides - debian/libbpp-qt2t64.symbols.amd64 - debian/patches/unforce-cxxflags.patch - debian/rules - + debian/source/lintian-overrides Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,13 @@ +libbpp-qt (2.4.1-10) UNRELEASED; urgency=medium + + * Team upload. + * d/patches/unforce-cxxflags.patch: update to merge upstream's flags; + and forward the patch to them. + * Silence some false-positive lintian errors and warnings related to + the t64 transition. + + -- Michael R. Crusoe <[email protected]> Mon, 25 Mar 2024 15:27:37 +0100 + libbpp-qt (2.4.1-9.1) unstable; urgency=medium * Non-maintainer upload. ===================================== debian/libbbp-qt2.lintian-overrides deleted ===================================== @@ -1,2 +0,0 @@ -# override false positive -libbpp-qt2: spelling-error-in-copyright CeCILL CeCILL (duplicate word) CeCILL ===================================== debian/libbpp-qt2t64.lintian-overrides ===================================== @@ -1 +1,2 @@ libbpp-qt2t64: package-name-doesnt-match-sonames libbpp-qt2 +libbpp-qt2t64: conflicts-with-version libbpp-qt2 (<< 2.4.1-10) ===================================== debian/libbpp-qt2t64.symbols.amd64 ===================================== @@ -391,7 +391,6 @@ libbpp-qt.so.2 libbpp-qt2t64 #MINVER# _ZNSt6vectorIPN3bpp12NodeTemplateINS0_19TreeDrawingNodeInfoEEESaIS4_EED2Ev@Base 2.4.1 _ZNSt6vectorIPN3bpp4NodeESaIS2_EE17_M_realloc_insertIJRKS2_EEEvN9__gnu_cxx17__normal_iteratorIPS2_S4_EEDpOT_@Base 2.4.1 _ZNSt6vectorIPN3bpp4NodeESaIS2_EE17_M_realloc_insertIJS2_EEEvN9__gnu_cxx17__normal_iteratorIPS2_S4_EEDpOT_@Base 2.4.1 - _ZNSt6vectorIdSaIdEE17_M_realloc_insertIJRKdEEEvN9__gnu_cxx17__normal_iteratorIPdS1_EEDpOT_@Base 2.4.1 _ZNSt6vectorIdSaIdEED1Ev@Base 2.4.1 _ZNSt6vectorIdSaIdEED2Ev@Base 2.4.1 _ZNSt6vectorIiSaIiEE17_M_realloc_insertIJiEEEvN9__gnu_cxx17__normal_iteratorIPiS1_EEDpOT_@Base 2.4.1 @@ -399,8 +398,6 @@ libbpp-qt.so.2 libbpp-qt2t64 #MINVER# _ZNSt6vectorIiSaIiEED2Ev@Base 2.4.1 _ZNSt6vectorImSaImEED1Ev@Base 2.4.1 _ZNSt6vectorImSaImEED2Ev@Base 2.4.1 - _ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEC1IS3_EEPKcRKS3_@Base 2.4.1 - _ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEC2IS3_EEPKcRKS3_@Base 2.4.1 _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED0Ev@Base 2.4.1 _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED1Ev@Base 2.4.1 _ZNSt7__cxx1115basic_stringbufIcSt11char_traitsIcESaIcEED2Ev@Base 2.4.1 ===================================== debian/patches/unforce-cxxflags.patch ===================================== @@ -1,17 +1,16 @@ From: Gert Wollny <[email protected]> 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/BioPP/bpp-qt/pull/4 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -8,7 +8,7 @@ cmake_minimum_required (VERSION 2.8.11) +--- libbpp-qt.orig/CMakeLists.txt ++++ libbpp-qt/CMakeLists.txt +@@ -8,7 +8,7 @@ project (bpp-qt CXX) # Compile options -set (CMAKE_CXX_FLAGS "-std=c++11 -Wall -Wshadow -Wconversion") -+#set (CMAKE_CXX_FLAGS "-std=c++11 -g") ++add_compile_options(-std=c++11 -Wall -Wshadow -Wconversion) IF(NOT CMAKE_BUILD_TYPE) SET(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING ===================================== debian/rules ===================================== @@ -4,8 +4,6 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all -CMAKE_EXTRA_FLAGS += -DBUILD_TESTING=OFF - %: dh $@ ===================================== debian/source/lintian-overrides ===================================== @@ -0,0 +1,2 @@ +# false positive from the t64 transition +libbpp-qt source: version-substvar-for-external-package Conflicts ${source:Version} libbpp-qt2t64 -> libbpp-qt2 [debian/control:39] View it on GitLab: https://salsa.debian.org/med-team/libbpp-qt/-/compare/56763e6ca9eeba62a5fde1149dc8474730cccd72...4a9f3f2500fc7c1be0e6cf677c5bf4eba6dcbbed -- View it on GitLab: https://salsa.debian.org/med-team/libbpp-qt/-/compare/56763e6ca9eeba62a5fde1149dc8474730cccd72...4a9f3f2500fc7c1be0e6cf677c5bf4eba6dcbbed You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ debian-med-commit mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit
