Disable pristine-tar option in gbp.conf, since there is no pristine-tar branch.

diff --git a/debian/changelog b/debian/changelog
index fcda26a8bb45ba74b5fc4906aaf44c781a97922e..efbfb5c06f9e56ed40c9550685c977ea41e90e2f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,9 @@ bcachefs-tools (1:1.4.2~git20240213-0.1) UNRELEASED; urgency=medium
   * Non-maintainer upload.
   * New upstream release (git snapshot cd4cbfc6).
     * Remove the do-not-install-mount-symlink patch.
-    * Add epoch to deal with new upstream versioning scheme. (Closes: #1054620)
+    * Add epoch to deal with new upstream versioning scheme,
+      and disable pristine-tar option in gbp.conf, since there is no
+      pristine-tar branch. (Closes: #1054620)
     * revert-bindgen-changes.patch: New patch, reinstates upstream
       hack that makes bcachefs-tools work with bindgen older than 0.69.4
       (which isn't in Debian yet).

diff --git a/debian/gbp.conf b/debian/gbp.conf
index a347f1008382e7f4a056c7990a251e572bca52a0..27e23cb0af2c5d64748afe2cbf568275acd99e8b 100644 (file)
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,5 +1,5 @@
 [DEFAULT]
-pristine-tar = True
+pristine-tar = False
 upstream-tag = v%(version)s
 ignore-branch = True