From: Steinar H. Gunderson <sesse@debian.org>
Date: Tue, 13 Feb 2024 21:39:43 +0000 (+0100)
Subject: Disable pristine-tar option in gbp.conf, since there is no pristine-tar branch.
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=HEAD;p=bcachefs-tools-debian

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

diff --git a/debian/changelog b/debian/changelog
index 939c7eb..a32359b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,9 @@ bcachefs-tools (1:1.6.3-0.1) UNRELEASED; urgency=medium
   * Non-maintainer upload.
   * New upstream release.
     * 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 a347f10..27e23cb 100644
--- 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