Update the Debian packaging for zchunk-1.2.3

diff --git a/debian/changelog b/debian/changelog
index 30bd25b98bff2e0c5f894c8fe7315755ee4fe7cc..073905c345e91584e42eb4e494133d818ccaa425 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,10 @@
-zchunk (1.2.2+ds1-2) UNRELEASED; urgency=medium
+zchunk (1.2.3+ds1-1) UNRELEASED; urgency=medium
 
   * Declare compliance with Policy 4.6.2 with no changes.
   * Add the year 2023 to my debian/* copyright notice.
+  * New upstream release:
+    - drop a hunk from the cppcheck patch
+    - refresh the line numbers in the typos patch
 
  -- Peter Pentchev <roam@debian.org>  Thu, 05 Jan 2023 20:40:44 +0200
 

diff --git a/debian/patches/cppcheck.patch b/debian/patches/cppcheck.patch
index db69d1c325030f24eed96b15f95d6ede22051aa4..83b4015f16cddc0c6acda98eaf3ff718f8a16c7c 100644 (file)
--- a/debian/patches/cppcheck.patch
+++ b/debian/patches/cppcheck.patch
@@ -1,7 +1,7 @@
 Description: Fix a couple of issues reported by cppcheck.
 Forwarded: no
 Author: Peter Pentchev <roam@ringlet.net>
-Last-Update: 2022-08-12
+Last-Update: 2023-01-05
 
 --- a/src/lib/comp/nocomp/nocomp.c
 +++ b/src/lib/comp/nocomp/nocomp.c
@@ -83,16 +83,3 @@ Last-Update: 2022-08-12
      }
      zck_clear_error(NULL);
      zck->prep_hash_type = -1;
---- a/test/zck_cmp_uncomp.c
-+++ b/test/zck_cmp_uncomp.c
-@@ -232,8 +232,8 @@
-         iter = zck_get_next_chunk(iter);
-     }
- 
--    printf("\n\nTotal to be reused : %12lu\n", reuse);
--    printf("Total to be downloaded : %12lu\n", todwl);
-+    printf("\n\nTotal to be reused : %12zu\n", reuse);
-+    printf("Total to be downloaded : %12zu\n", todwl);
- 
-     close(in_fd);
-     close(zck_fd);

diff --git a/debian/patches/typos.patch b/debian/patches/typos.patch
index 9c8680a33dddd8f4aca1bcf4e8845b560df3c661..7e55ca07de7e84049fccab7b27a5dc653ef6c8d7 100644 (file)
--- a/debian/patches/typos.patch
+++ b/debian/patches/typos.patch
@@ -5,7 +5,7 @@ Last-Update: 2021-08-21
 
 --- a/README.md
 +++ b/README.md
-@@ -58,7 +58,7 @@
+@@ -59,7 +59,7 @@
  be able to reduce the overall file size by using a [zstd dictionary](https://facebook.github.io/zstd/#small-data).
  The dictionary takes up extra space at the beginning of the zchunk file, but is
  used as an identical initial dictionary for compressing each chunk, which can