Source: borgbackup2 Version: 2.0.0b5-1 Followup-For: Bug #1052875 X-Debbugs-Cc: scho...@ubuntu.com
I fixed this in https://salsa.debian.org/schopin/borgbackup2/-/commit/8f02b24dc022ad26c7d78b5efe80b9e933a3ebc8 but wasn't able to open a PR against the original Salsa repo, so here's the commit attached as a patch if you prefer it that way.
>From 8f02b24dc022ad26c7d78b5efe80b9e933a3ebc8 Mon Sep 17 00:00:00 2001 From: Simon Chopin <scho...@ubuntu.com> Date: Mon, 16 Oct 2023 11:14:21 +0200 Subject: [PATCH] d/p/manifest-data-files: fix FTBFS due to missing data files Closes: 1052875, LP: #2039423 --- debian/patches/manifest-data-files.patch | 35 ++++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 36 insertions(+) create mode 100644 debian/patches/manifest-data-files.patch diff --git a/debian/patches/manifest-data-files.patch b/debian/patches/manifest-data-files.patch new file mode 100644 index 00000000..24c5c26f --- /dev/null +++ b/debian/patches/manifest-data-files.patch @@ -0,0 +1,35 @@ +From 3078c3cbe69724f28a76890f5b1ae6fb9aa906b6 Mon Sep 17 00:00:00 2001 +From: Simon Chopin <simon.cho...@canonical.com> +Date: Mon, 16 Oct 2023 10:34:51 +0200 +Subject: [PATCH] packaging: Explicit add data files to the manifest + +We've started seeing some failures to build in Debian and Ubuntu that +can be traced to those files missing from the manifest when we're +calling setup.py install. + +Now, this started failing fairly recently, so I'm guessing it's actually +a change of behaviour in the SCM plugin and/or setuptools. It makes +sense though, since we're packaging from the tarball, which isn't in the +Git context needed to actually include those data files. + +Signed-off-by: Simon Chopin <simon.cho...@canonical.com> +Forwarded: https://github.com/borgbackup/borg/pull/7876 +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1052875 +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/borgbackup2/+bug/2039423 +--- + MANIFEST.in | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/MANIFEST.in b/MANIFEST.in +index caf027ad..50c5c565 100644 +--- a/MANIFEST.in ++++ b/MANIFEST.in +@@ -6,3 +6,5 @@ prune .github + include src/borg/platform/darwin.c src/borg/platform/freebsd.c src/borg/platform/linux.c src/borg/platform/posix.c + include src/borg/platform/syncfilerange.c + include src/borg/platform/windows.c ++include src/borg/paperkey.html ++include src/borg/testsuite/archiver/repo12.tar.gz +-- +2.40.1 + diff --git a/debian/patches/series b/debian/patches/series index 3335e123..672026a6 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,3 +5,4 @@ privacy/mathjax.patch explicit_version.patch lower_platformdirs.patch 0001-Make-timestamps-in-manual-pages-reproducible.patch +manifest-data-files.patch -- 2.40.1
