Drop debian/patches/0001-dump-fix-print-format-of-entry-position.patch which was...

diff --git a/debian/changelog b/debian/changelog
index 78c5983747575c83534d3a63602b18604c88a020..a98735c99c2434c700f8ce6fbe0083e5a940dc4b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 exfatprogs (1.2.8-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Drop debian/patches/0001-dump-fix-print-format-of-entry-position.patch
+    which was a cherry-pick from exfat-next.
 
  -- Sven Hoexter <hoexter@debian.org>  Tue, 04 Mar 2025 15:59:24 +0100
 

diff --git a/debian/patches/0001-dump-fix-print-format-of-entry-position.patch b/debian/patches/0001-dump-fix-print-format-of-entry-position.patch
deleted file mode 100644 (file)
index 292fb5a..0000000
--- a/debian/patches/0001-dump-fix-print-format-of-entry-position.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From: Yuezhang Mo <Yuezhang.Mo@sony.com>
-Subject: [PATCH] dump: fix print format of entry position
-
-This commit changes the entry position to be printed with "%llx".
-
-Signed-off-by: Yuezhang Mo <Yuezhang.Mo@sony.com>
-
-Origin: upstream, https://github.com/YuezhangMo/exfatprogs/commit/485b16a891e396c4842cfd0d2a5f08d66407405c
-Bug: https://github.com/exfatprogs/exfatprogs/issues/290
----
- dump/dump.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/dump/dump.c b/dump/dump.c
-index 0ac1fd3..6fa1636 100644
---- a/dump/dump.c
-+++ b/dump/dump.c
-@@ -167,7 +167,7 @@ static int exfat_show_ondisk_all_info(struct exfat_blk_dev *bd)
-               goto free_exfat;
- 
-       if (ed.type == EXFAT_VOLUME) {
--              exfat_info("Volume label entry position: \t\t0x%lx\n", off);
-+              exfat_info("Volume label entry position: \t\t0x%llx\n", (unsigned long long)off);
-               exfat_info("Volume label character count: \t\t%u\n", ed.vol_char_cnt);
-               volume_label = exfat_conv_volume_label(&ed);
-               if (!volume_label)
-@@ -182,7 +182,7 @@ static int exfat_show_ondisk_all_info(struct exfat_blk_dev *bd)
-               goto free_exfat;
- 
-       if (ed.type == EXFAT_UPCASE) {
--              exfat_info("Upcase table entry position: \t\t0x%lx\n", off);
-+              exfat_info("Upcase table entry position: \t\t0x%llx\n", (unsigned long long)off);
-               exfat_info("Upcase table start cluster: \t\t%x\n",
-                               le32_to_cpu(ed.upcase_start_clu));
-               exfat_info("Upcase table size: \t\t\t%" PRIu64 "\n",
-@@ -197,7 +197,7 @@ static int exfat_show_ondisk_all_info(struct exfat_blk_dev *bd)
-               bitmap_len = le64_to_cpu(ed.bitmap_size);
-               bitmap_clu = le32_to_cpu(ed.bitmap_start_clu);
- 
--              exfat_info("Bitmap entry position: \t\t\t0x%lx\n", off);
-+              exfat_info("Bitmap entry position: \t\t\t0x%llx\n", (unsigned long long)off);
-               exfat_info("Bitmap start cluster: \t\t\t%x\n", bitmap_clu);
-               exfat_info("Bitmap size: \t\t\t\t%llu\n", bitmap_len);
- 
--- 
-2.47.2
-

diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644 (file)
index dbed648..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-dump-fix-print-format-of-entry-position.patch