[med-svn] [Git][med-team/libbpp-raa][master] 4 commits: d/patches/unforce-cxxflags.patch: merge with upstreams flags
Michael R. Crusoe (@crusoe)
gitlab at salsa.debian.org
Mon Mar 25 23:50:43 GMT 2024
Michael R. Crusoe pushed to branch master at Debian Med / libbpp-raa
Commits:
808b9db5 by Michael R. Crusoe at 2024-03-25T16:03:52+01:00
d/patches/unforce-cxxflags.patch: merge with upstreams flags
especially "-std=c++11"; and forward this patch to them.
- - - - -
1c3f7359 by Michael R. Crusoe at 2024-03-25T16:03:53+01:00
d/control: rely on substvars for more dependencies.
- - - - -
9b53f918 by Michael R. Crusoe at 2024-03-25T16:03:53+01:00
Silence some false-positive Lintian warnings and errors related to the t64 transition.
- - - - -
bf4cfee6 by Michael R. Crusoe at 2024-03-25T16:05:08+01:00
routine-update: Standards-Version: 4.6.2
- - - - -
6 changed files:
- debian/changelog
- debian/control
- debian/libbpp-raa4t64.lintian-overrides
- debian/libbpp-raa4t64.symbols.amd64
- debian/patches/unforce-cxxflags.patch
- + debian/source/lintian-overrides
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,15 @@
+libbpp-raa (2.4.1-8) UNRELEASED; urgency=medium
+
+ * Team upload.
+ * d/patches/unforce-cxxflags.patch: merge with upstreams flags
+ especially "-std=c++11"; and forward this patch to them.
+ * d/control: rely on substvars for more dependencies.
+ * Silence some false-positive Lintian warnings and errors related to
+ the t64 transition.
+ * Standards-Version: 4.6.2 (routine-update)
+
+ -- Michael R. Crusoe <crusoe at debian.org> Mon, 25 Mar 2024 15:44:48 +0100
+
libbpp-raa (2.4.1-7.1) unstable; urgency=medium
* Non-maintainer upload.
=====================================
debian/control
=====================================
@@ -9,7 +9,7 @@ Build-Depends: dpkg-dev (>= 1.22.5), debhelper-compat (= 13),
d-shlibs (>= 0.106~),
zlib1g-dev,
libbpp-seq-dev
-Standards-Version: 4.6.1
+Standards-Version: 4.6.2
Vcs-Browser: https://salsa.debian.org/med-team/libbpp-raa
Vcs-Git: https://salsa.debian.org/med-team/libbpp-raa.git
Homepage: http://biopp.univ-montp2.fr/wiki/index.php/Main_Page
@@ -20,7 +20,7 @@ Architecture: any
Section: libdevel
Depends: libbpp-raa4t64 (= ${binary:Version}),
${misc:Depends},
- libbpp-seq-dev
+ ${devlibs:Depends}
Multi-Arch: same
Description: Bio++ Remote Acnuc Access library development files
This library contains utilitary and classes to query public databases
@@ -36,8 +36,7 @@ Conflicts: libbpp-raa4 (<< ${source:Version})
Architecture: any
Section: libs
Depends: ${shlibs:Depends},
- ${misc:Depends},
- libbpp-seq12
+ ${misc:Depends}
Multi-Arch: same
Description: Bio++ Remote Acnuc Access library
This library contains utilitary and classes to query public databases
=====================================
debian/libbpp-raa4t64.lintian-overrides
=====================================
@@ -1 +1,2 @@
libbpp-raa4t64: package-name-doesnt-match-sonames libbpp-raa4
+libbpp-raa4t64: conflicts-with-version libbpp-raa4 (<< 2.4.1-8)
=====================================
debian/libbpp-raa4t64.symbols.amd64
=====================================
@@ -1,4 +1,5 @@
libbpp-raa.so.4 libbpp-raa4t64 #MINVER#
+* Build-Depends-Package: libbpp-raa-dev
_ZN3bpp14RaaSpeciesTree10firstChildEi at Base 2.4.1
_ZN3bpp14RaaSpeciesTree11nextSynonymEi at Base 2.4.1
_ZN3bpp14RaaSpeciesTree5countEi at Base 2.4.1
@@ -77,8 +78,6 @@ libbpp-raa.so.4 libbpp-raa4t64 #MINVER#
_ZNSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EE17_M_realloc_insertIJS5_EEEvN9__gnu_cxx17__normal_iteratorIPS5_S7_EEDpOT_ at Base 2.4.1
_ZNSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EED1Ev at Base 2.4.1
_ZNSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EED2Ev at Base 2.4.1
- _ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEC1IS3_EEPKcRKS3_ at Base 2.4.1
- _ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEC2IS3_EEPKcRKS3_ at Base 2.4.1
_ZSt18__do_uninit_fill_nIPNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEmS5_ET_S7_T0_RKT1_ at Base 2.4.1
_ZTINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE at Base 2.4.1
_ZTSNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE at Base 2.4.1
=====================================
debian/patches/unforce-cxxflags.patch
=====================================
@@ -1,20 +1,18 @@
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/BioPP/bpp-raa/pull/4
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -9,8 +9,8 @@ cmake_minimum_required (VERSION 2.8.11)
+--- libbpp-raa.orig/CMakeLists.txt
++++ libbpp-raa/CMakeLists.txt
+@@ -9,8 +9,8 @@
project (bpp-raa C CXX)
# Compile options
-set (CMAKE_CXX_FLAGS "-std=c++11 -Wall")
-+#set (CMAKE_CXX_FLAGS "-std=c++11 -g")
-set (CMAKE_C_FLAGS "-Wall")
-+# set (CMAKE_C_FLAGS "-Wall")
++add_compile_options(-Wall)
++set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
IF(NOT CMAKE_BUILD_TYPE)
SET(CMAKE_BUILD_TYPE Release CACHE STRING
-
=====================================
debian/source/lintian-overrides
=====================================
@@ -0,0 +1,2 @@
+# false positive from the t64 transition
+libbpp-raa source: version-substvar-for-external-package Conflicts ${source:Version} libbpp-raa4t64 -> libbpp-raa4 [debian/control:35]
View it on GitLab: https://salsa.debian.org/med-team/libbpp-raa/-/compare/5b87fa6c77951cd8a3b5384ea6a7da7c08f4341c...bf4cfee62e0573cae4802247714ab7c5bdcf6c01
--
View it on GitLab: https://salsa.debian.org/med-team/libbpp-raa/-/compare/5b87fa6c77951cd8a3b5384ea6a7da7c08f4341c...bf4cfee62e0573cae4802247714ab7c5bdcf6c01
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/775db295/attachment-0001.htm>
More information about the debian-med-commit
mailing list