[med-svn] [Git][med-team/freebayes][master] 4 commits: Rebase patches to upstream 1.3.10
Andreas Tille (@tille)
gitlab at salsa.debian.org
Fri Oct 30 09:55:39 GMT 2026
Andreas Tille pushed to branch master at Debian Med / freebayes
Commits:
34fabd9a by Andreas Tille at 2026-10-30T10:46:57+01:00
Rebase patches to upstream 1.3.10
All Debian patches have been incorporated upstream in 1.3.10, so drop
the remaining (now obsolete) patches:
- 0001: the RELEASE-NOTES entry is part of upstream.
- 0003/0004: the fs Meson module import is in upstream meson.build.
- 0005/0006: the vcflib, smithwaterman and fastahack include paths are
already used by upstream.
The leftover 0006 meson.build hunk added contrib/multichoose to the
include path, but multichoose.h is now provided by vcflib itself.
Keep debian/patches/series as an empty patch queue.
- - - - -
a8d9a11e by Andreas Tille at 2026-10-30T10:48:26+01:00
Record patch rebase in debian/changelog
- - - - -
9b27ea1a by Andreas Tille at 2026-10-30T10:48:35+01:00
Fix autopkgtest with stale tabix index timestamps
dh_strip_nondeterminism normalizes the mtime of the compressed VCF
files but leaves the .tbi files alone. In a clean build this makes the
VCF appear newer than its tabix index, so tabix++ aborts with:
[tabix++] the index file is older than the vcf file.
Refresh the timestamps of all tabix indices after copying the examples
in the autopkgtest.
Closes: #1128054
- - - - -
4953343a by Andreas Tille at 2026-10-30T10:51:17+01:00
Upload to unstable
- - - - -
8 changed files:
- debian/changelog
- − debian/patches/0001-Testing-cleaner-build-for-Debian.patch
- − debian/patches/0003-fastahack-and-smithwaterman-dep-treatment.patch
- − debian/patches/0004-Simplified-build-for-debian.patch
- − debian/patches/0005-Put-Variant.h-as-vcflib-Variant.h.patch
- − debian/patches/0006-Make-vcflib-smithwaterman-and-fastahack-external-inc.patch
- − debian/patches/series
- debian/tests/run-unit-test
Changes:
=====================================
debian/changelog
=====================================
@@ -1,10 +1,14 @@
-freebayes (1.3.10-1) UNRELEASED; urgency=medium
+freebayes (1.3.10-1) unstable; urgency=medium
* d/watch: version=5
* New upstream version
+ * Rebase patches to upstream 1.3.10 (all changes are upstream now).
+ * Refresh tabix index timestamps in autopkgtest to avoid failures when
+ the compressed VCF files have a newer mtime than their index.
+ Closes: #1128054
* Standards-Version: 4.7.4 (routine-update)
- -- Andreas Tille <tille at debian.org> Thu, 29 Oct 2026 16:28:22 +0100
+ -- Andreas Tille <tille at debian.org> Fri, 30 Oct 2026 10:49:10 +0100
freebayes (1.3.9-2) unstable; urgency=medium
=====================================
debian/patches/0001-Testing-cleaner-build-for-Debian.patch deleted
=====================================
@@ -1,24 +0,0 @@
-From: Pjotr Prins <pjotr.public01 at thebird.nl>
-Date: Fri, 26 Apr 2024 21:09:27 -0500
-Subject: Testing cleaner build for Debian
-
----
- RELEASE-NOTES.md | 4 +
- contrib/README.md | 26 +++--
- guix.scm | 7 +-
- meson.build | 293 ++++++++++++++++++++++++++----------------------------
- 4 files changed, 170 insertions(+), 160 deletions(-)
-
---- a/RELEASE-NOTES.md
-+++ b/RELEASE-NOTES.md
-@@ -26,6 +26,10 @@ This is a maintenance release of Freebay
- + A recent version of vcflib installs include files in include/vcflib. freebayes breaks with older vcflib.
- + Removed unused GenotypePriors.cpp, alleles.cpp, dummy.cpp
-
-+## ChangeLog v1.3.9-pre1 (20240427)
-+
-++ try cleaner meson build on Debian
-+
- ## ChangeLog v1.3.8 (20240423)
-
- This is a maintenance release of Freebayes:
=====================================
debian/patches/0003-fastahack-and-smithwaterman-dep-treatment.patch deleted
=====================================
@@ -1,21 +0,0 @@
-From: Pjotr Prins <pjotr.public01 at thebird.nl>
-Date: Sun, 28 Apr 2024 00:33:26 -0500
-Subject: fastahack and smithwaterman dep treatment
-
----
- contrib/README.md | 12 +++++++++---
- guix.scm | 4 ++--
- meson.build | 39 +++++++++++++++++++++------------------
- 3 files changed, 32 insertions(+), 23 deletions(-)
-
---- a/meson.build
-+++ b/meson.build
-@@ -26,6 +26,8 @@ add_global_arguments('-Wno-maybe-uniniti
-
- static_build = get_option('static')
-
-+fs = import('fs')
-+
- # used by Debian: add_global_arguments('-D_GLIBCXX_ASSERTIONS=1', language : 'cpp')
-
- cc = meson.get_compiler('cpp')
=====================================
debian/patches/0004-Simplified-build-for-debian.patch deleted
=====================================
@@ -1,20 +0,0 @@
-From: Pjotr Prins <pjotr.public01 at thebird.nl>
-Date: Sun, 28 Apr 2024 00:48:54 -0500
-Subject: Simplified build for debian
-
----
- guix.scm | 6 +++---
- meson.build | 15 +++------------
- 2 files changed, 6 insertions(+), 15 deletions(-)
-
---- a/meson.build
-+++ b/meson.build
-@@ -26,8 +26,6 @@ add_global_arguments('-Wno-maybe-uniniti
-
- static_build = get_option('static')
-
--fs = import('fs')
--
- # used by Debian: add_global_arguments('-D_GLIBCXX_ASSERTIONS=1', language : 'cpp')
-
- cc = meson.get_compiler('cpp')
=====================================
debian/patches/0005-Put-Variant.h-as-vcflib-Variant.h.patch deleted
=====================================
@@ -1,31 +0,0 @@
-From: Pjotr Prins <pjotr.public01 at thebird.nl>
-Date: Sun, 28 Apr 2024 00:53:25 -0500
-Subject: Put Variant.h as vcflib/Variant.h
-
----
- src/AlleleParser.h | 2 +-
- src/ResultData.h | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
---- a/src/AlleleParser.h
-+++ b/src/AlleleParser.h
-@@ -29,7 +29,7 @@
- #include "CNV.h"
- #include "Result.h"
- #include "LeftAlign.h"
--#include <Variant.h> // note this can end in vcflib/Variant.h
-+#include <vcflib/Variant.h> // note this can end in vcflib/Variant.h
- #include "version_git.h"
-
- // the size of the window of the reference which is always cached in memory
---- a/src/ResultData.h
-+++ b/src/ResultData.h
-@@ -8,7 +8,7 @@
- #include "Allele.h"
- #include "Utility.h"
- #include "AlleleParser.h"
--#include <Variant.h>
-+#include <vcflib/Variant.h>
- #include "version_git.h"
- #include "Result.h"
- #include "NonCall.h"
=====================================
debian/patches/0006-Make-vcflib-smithwaterman-and-fastahack-external-inc.patch deleted
=====================================
@@ -1,286 +0,0 @@
-From: "Michael R. Crusoe" <crusoe at debian.org>
-Date: Fri, 7 Jun 2024 12:10:16 +0200
-Subject: Make vcflib, smithwaterman, and fastahack external includes explicit
-
----
- meson.build | 1 +
- src/Allele.cpp | 2 +-
- src/Allele.h | 2 +-
- src/AlleleParser.cpp | 9 ++++-----
- src/AlleleParser.h | 4 ++--
- src/BedReader.cpp | 2 +-
- src/BedReader.h | 2 +-
- src/Bias.cpp | 2 +-
- src/Bias.h | 2 +-
- src/CNV.h | 2 +-
- src/Contamination.cpp | 2 +-
- src/Contamination.h | 2 +-
- src/DataLikelihood.cpp | 3 +--
- src/FBFasta.h | 2 +-
- src/Genotype.cpp | 2 +-
- src/Genotype.h | 4 ++--
- src/Parameters.cpp | 2 +-
- src/Parameters.h | 2 +-
- src/Utility.h | 2 +-
- src/freebayes.cpp | 3 +--
- 20 files changed, 25 insertions(+), 27 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 3d38970..263db49 100644
---- a/meson.build
-+++ b/meson.build
-@@ -212,6 +212,7 @@ bamleftalign_src = files('src/bamleftalign.cpp')
- incdir = include_directories(
- 'src',
- 'contrib/ttmath',
-+ 'contrib/multichoose',
- )
-
- extra_cpp_args = cc.get_supported_arguments(
-diff --git a/src/Allele.cpp b/src/Allele.cpp
-index 3d6ec78..895c9e7 100644
---- a/src/Allele.cpp
-+++ b/src/Allele.cpp
-@@ -1,5 +1,5 @@
- #include "Allele.h"
--#include "multichoose.h"
-+#include <vcflib/multichoose.h>
- #include "TryCatch.h"
-
-
-diff --git a/src/Allele.h b/src/Allele.h
-index 52bcc4e..cc35030 100644
---- a/src/Allele.h
-+++ b/src/Allele.h
-@@ -12,7 +12,7 @@
- #include <sstream>
- #include <assert.h>
- #include "Utility.h"
--#include "convert.h"
-+#include <smithwaterman/convert.h>
-
- //#ifdef HAVE_BAMTOOLS
- //#include "api/BamAlignment.h"
-diff --git a/src/AlleleParser.cpp b/src/AlleleParser.cpp
-index e505b89..9b1e340 100644
---- a/src/AlleleParser.cpp
-+++ b/src/AlleleParser.cpp
-@@ -1,9 +1,8 @@
- #include "AlleleParser.h"
--#include "multichoose.h" // includes generic functions, so it must be included here
-- // otherwise we will get a linker error
-- // see: http://stackoverflow.com/questions/36039/templates-spread-across-multiple-files
-- // http://www.cplusplus.com/doc/tutorial/templates/ "Templates and Multi-file projects"
--#include "multipermute.h"
-+#include <vcflib/multichoose.h> // includes generic functions, so it must be included here
-+ // otherwise we will get a linker error
-+ // see: http://stackoverflow.com/questions/36039/templates-spread-across-multiple-files
-+ // http://www.cplusplus.com/doc/tutorial/templates/ "Templates and Multi-file projects"
- #include "Logging.h"
-
- using namespace std;
-diff --git a/src/AlleleParser.h b/src/AlleleParser.h
-index ee18577..ee7c127 100644
---- a/src/AlleleParser.h
-+++ b/src/AlleleParser.h
-@@ -13,9 +13,9 @@
- #include <assert.h>
- #include <ctype.h>
- #include <cmath>
--#include "split.h"
-+#include <fastahack/split.h>
- #include <list> // XXX workaround for a missing include in vcflib's join.h
--#include "join.h"
-+#include <vcflib/join.h>
-
- #include "BedReader.h"
- #include "Parameters.h"
-diff --git a/src/BedReader.cpp b/src/BedReader.cpp
-index dabd0af..7a4350f 100644
---- a/src/BedReader.cpp
-+++ b/src/BedReader.cpp
-@@ -7,7 +7,7 @@
- #include <iterator>
- #include <algorithm>
- #include <cmath>
--#include "split.h"
-+#include <fastahack/split.h>
- #include "Utility.h"
- #include "BedReader.h"
- #include "Logging.h"
-diff --git a/src/BedReader.h b/src/BedReader.h
-index 82e1401..cb54124 100644
---- a/src/BedReader.h
-+++ b/src/BedReader.h
-@@ -10,7 +10,7 @@
- #include <iterator>
- #include <algorithm>
- #include <intervaltree/IntervalTree.h>
--#include "split.h"
-+#include <fastahack/split.h>
-
- using namespace std;
-
-diff --git a/src/Bias.cpp b/src/Bias.cpp
-index f6733b8..0f5dee2 100644
---- a/src/Bias.cpp
-+++ b/src/Bias.cpp
-@@ -1,5 +1,5 @@
- #include "Bias.h"
--#include "convert.h"
-+#include <smithwaterman/convert.h>
-
- void Bias::open(string& file) {
-
-diff --git a/src/Bias.h b/src/Bias.h
-index 72b156a..745801b 100644
---- a/src/Bias.h
-+++ b/src/Bias.h
-@@ -7,7 +7,7 @@
- #include <string>
- #include <vector>
- #include <cstdlib>
--#include "split.h"
-+#include <fastahack/split.h>
-
- using namespace std;
-
-diff --git a/src/CNV.h b/src/CNV.h
-index b2f03fc..c78f08e 100644
---- a/src/CNV.h
-+++ b/src/CNV.h
-@@ -10,7 +10,7 @@
- #include <stdlib.h>
- #include <algorithm>
- #include <tuple>
--#include "split.h"
-+#include <fastahack/split.h>
-
- using namespace std;
-
-diff --git a/src/Contamination.cpp b/src/Contamination.cpp
-index aae1c07..137a798 100644
---- a/src/Contamination.cpp
-+++ b/src/Contamination.cpp
-@@ -1,5 +1,5 @@
- #include "Contamination.h"
--#include "convert.h"
-+#include <smithwaterman/convert.h>
-
- void Contamination::open(string& file) {
-
-diff --git a/src/Contamination.h b/src/Contamination.h
-index 83b422d..f5907a6 100644
---- a/src/Contamination.h
-+++ b/src/Contamination.h
-@@ -8,7 +8,7 @@
- #include <vector>
- #include <cstdlib>
- #include <cmath>
--#include "split.h"
-+#include <fastahack/split.h>
-
- using namespace std;
-
-diff --git a/src/DataLikelihood.cpp b/src/DataLikelihood.cpp
-index db0484e..f5d2872 100644
---- a/src/DataLikelihood.cpp
-+++ b/src/DataLikelihood.cpp
-@@ -1,6 +1,5 @@
- #include "DataLikelihood.h"
--#include "multichoose.h"
--#include "multipermute.h"
-+#include <vcflib/multichoose.h>
- #include "Logging.h"
-
- long double
-diff --git a/src/FBFasta.h b/src/FBFasta.h
-index 7587493..cc373fa 100644
---- a/src/FBFasta.h
-+++ b/src/FBFasta.h
-@@ -19,7 +19,7 @@
- #include "LargeFileSupport.h"
- #include "Utility.h"
- #include <sys/stat.h>
--#include "split.h"
-+#include <fastahack/split.h>
- #include <stdlib.h>
- #include <ctype.h>
- #include <unistd.h>
-diff --git a/src/Genotype.cpp b/src/Genotype.cpp
-index bdde8c6..8180b28 100644
---- a/src/Genotype.cpp
-+++ b/src/Genotype.cpp
-@@ -1,5 +1,5 @@
- #include "Genotype.h"
--#include "multichoose.h"
-+#include <vcflib/multichoose.h>
- #include "multipermute.h"
-
-
-diff --git a/src/Genotype.h b/src/Genotype.h
-index ad5e942..0cb0cdc 100644
---- a/src/Genotype.h
-+++ b/src/Genotype.h
-@@ -19,8 +19,8 @@
- #include "CNV.h"
- #include "Ewens.h"
- #include "Bias.h"
--#include "join.h"
--#include "convert.h"
-+#include <vcflib/join.h>
-+#include <smithwaterman/convert.h>
-
- using namespace std;
-
-diff --git a/src/Parameters.cpp b/src/Parameters.cpp
-index 29a0f49..24a06ba 100644
---- a/src/Parameters.cpp
-+++ b/src/Parameters.cpp
-@@ -1,5 +1,5 @@
- #include "Parameters.h"
--#include "convert.h"
-+#include <smithwaterman/convert.h>
-
- using namespace std;
-
-diff --git a/src/Parameters.h b/src/Parameters.h
-index 1419fbb..606eab3 100644
---- a/src/Parameters.h
-+++ b/src/Parameters.h
-@@ -9,7 +9,7 @@
- #include <map>
- #include <getopt.h>
- #include <stdlib.h>
--#include "split.h"
-+#include <fastahack/split.h>
- #include "version_git.h"
- #include "Utility.h"
-
-diff --git a/src/Utility.h b/src/Utility.h
-index 778c113..1c4962a 100644
---- a/src/Utility.h
-+++ b/src/Utility.h
-@@ -14,7 +14,7 @@
- #include <fstream>
- #include <map>
- #include <time.h>
--#include "convert.h"
-+#include <smithwaterman/convert.h>
- #include "ttmath.h"
-
- using namespace std;
-diff --git a/src/freebayes.cpp b/src/freebayes.cpp
-index 025a91b..86268c0 100644
---- a/src/freebayes.cpp
-+++ b/src/freebayes.cpp
-@@ -30,8 +30,7 @@
- #include "Utility.h"
- #include "SegfaultHandler.h"
-
--#include "multichoose.h"
--#include "multipermute.h"
-+#include <vcflib/multichoose.h>
-
- #include "Genotype.h"
- #include "DataLikelihood.h"
=====================================
debian/patches/series deleted
=====================================
@@ -1,5 +0,0 @@
-0001-Testing-cleaner-build-for-Debian.patch
-0003-fastahack-and-smithwaterman-dep-treatment.patch
-0004-Simplified-build-for-debian.patch
-0005-Put-Variant.h-as-vcflib-Variant.h.patch
-0006-Make-vcflib-smithwaterman-and-fastahack-external-inc.patch
=====================================
debian/tests/run-unit-test
=====================================
@@ -16,6 +16,11 @@ cp -a /usr/share/doc/${pkg}/examples/* "${AUTOPKGTEST_TMP}"
cd "${AUTOPKGTEST_TMP}"
+# The build may normalize the mtime of compressed VCF files, which can make
+# them appear newer than their tabix index. Refresh the index timestamps so
+# that tabix does not refuse to open the test data (see #1128054).
+find . -name '*.tbi' -type f -exec touch {} +
+
#do_stuff_to_test_package#
ls -R
View it on GitLab: https://salsa.debian.org/med-team/freebayes/-/compare/d329ed62af5dfe5ad90ac3b2540d7d08d55f95f6...4953343af48b0614c1f976191e5e5abdda3a94dd
--
View it on GitLab: https://salsa.debian.org/med-team/freebayes/-/compare/d329ed62af5dfe5ad90ac3b2540d7d08d55f95f6...4953343af48b0614c1f976191e5e5abdda3a94dd
You're receiving this email because of your account on salsa.debian.org. Manage all notifications: https://salsa.debian.org/-/profile/notifications | Help: https://salsa.debian.org/help
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20261030/1499a4e0/attachment-0001.htm>
More information about the debian-med-commit
mailing list