[med-svn] [Git][med-team/pbdagcon][master] 4 commits: Fix FTCBFS

[Nilesh Patra (@nilesh)]

Nilesh Patra pushed to branch master at Debian Med / pbdagcon


Commits:
d4bf42d0 by Nilesh Patra at 2021-11-21T15:59:14+05:30
Fix FTCBFS

- - - - -
56acfdfd by Nilesh Patra at 2021-11-21T16:05:45+05:30
Do not override compiler flags in tests either

- - - - -
8e069462 by Nilesh Patra at 2021-11-21T16:06:42+05:30
Disable CI on i386

- - - - -
23b6a3ae by Nilesh Patra at 2021-11-21T16:07:39+05:30
Upload to unstable

- - - - -


4 changed files:

- debian/changelog
- debian/control
- debian/patches/compiler-flags.patch
- debian/salsa-ci.yml


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+pbdagcon (0.3+git20180411.c14c422+dfsg-5) unstable; urgency=medium
+
+  * Team upload.
+  * Fix FTCBFS (Closes: #983630)
+  * Do not override compiler flags in tests either
+  * Disable CI on i386
+
+ -- Nilesh Patra <nilesh at debian.org>  Sun, 21 Nov 2021 16:07:06 +0530
+
 pbdagcon (0.3+git20180411.c14c422+dfsg-4) unstable; urgency=medium
 
   * Team Upload.


=====================================
debian/control
=====================================
@@ -5,7 +5,7 @@ Uploaders: Andreas Tille <tille at debian.org>,
 Section: science
 Priority: optional
 Build-Depends: debhelper-compat (= 13),
-               python3,
+               python3:any,
                zlib1g-dev,
                libhdf5-dev,
                libboost-dev,


=====================================
debian/patches/compiler-flags.patch
=====================================
@@ -4,7 +4,7 @@ Forwarded: no
 Last-Update: 2016-10-23
 --- a/src/cpp/makefile
 +++ b/src/cpp/makefile
-@@ -8,8 +8,8 @@ PBDAGCON_OBJECTS := BlasrM5AlnProvider.o
+@@ -8,8 +8,8 @@
  DAZCON_OBJECTS := DB.o QV.o align.o DazAlnProvider.o dazcon.o
  
  CPPFLAGS += -MMD -MP
@@ -15,3 +15,14 @@ Last-Update: 2016-10-23
  
  INCDIRS := \
  	${DAZZ_DB_INCLUDE} \
+--- a/test/cpp/makefile
++++ b/test/cpp/makefile
+@@ -48,7 +48,7 @@
+ GTEST_CPPFLAGS += -isystem $(GTEST_INCLUDE) -isystem ${GTEST_SRC}/..
+ GTEST_CXXFLAGS += -g -Wall -Wextra -pthread
+ 
+-CXXFLAGS := -O3 -std=c++14
++CXXFLAGS += -O3 -std=c++14
+ 
+ GTEST_OBJECTS := gtest-all.o gtest_main.o
+ DAZCON_OBJECTS := DB.o QV.o align.o Alignment.o \


=====================================
debian/salsa-ci.yml
=====================================
@@ -2,3 +2,6 @@
 include:
   - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
   - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml
+
+variables:
+  SALSA_CI_DISABLE_BUILD_PACKAGE_I386: "true"



View it on GitLab: https://salsa.debian.org/med-team/pbdagcon/-/compare/a3ca86673dfb203bd496035257677c904bfb78dd...23b6a3ae8bab5da853b34d27e5750b5b2925277b

-- 
View it on GitLab: https://salsa.debian.org/med-team/pbdagcon/-/compare/a3ca86673dfb203bd496035257677c904bfb78dd...23b6a3ae8bab5da853b34d27e5750b5b2925277b
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/20211121/965c6f5a/attachment-0001.htm>