From d512300d75169a27395dbdfcc960fbb1aff333a3 Mon Sep 17 00:00:00 2001 From: Peter Pentchev Date: Sat, 1 Jul 2023 19:30:04 +0300 Subject: [PATCH] Update the Debian packaging for zchunk 1.2.4 --- debian/changelog | 5 ++- debian/patches/series | 1 - debian/patches/typos.patch | 2 +- debian/patches/upstream-zstd-1.5.4.patch | 56 ------------------------ 4 files changed, 5 insertions(+), 59 deletions(-) delete mode 100644 debian/patches/upstream-zstd-1.5.4.patch diff --git a/debian/changelog b/debian/changelog index 9a05cc0..fd5c9a7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,9 @@ -zchunk (1.2.3+ds1-3) UNRELEASED; urgency=medium +zchunk (1.2.4+ds1-1) UNRELEASED; urgency=medium * Use debhelper compat level 14 for `meson install`. + * New upstream release: + - drop the upstream-zstd-1.5.4 patch, it was taken from upstream + - refresh the typos patch -- Peter Pentchev Sat, 01 Jul 2023 19:14:48 +0300 diff --git a/debian/patches/series b/debian/patches/series index 924ba3a..398da5b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,2 @@ typos.patch cppcheck.patch -upstream-zstd-1.5.4.patch diff --git a/debian/patches/typos.patch b/debian/patches/typos.patch index 7e55ca0..00f95f4 100644 --- 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 -@@ -59,7 +59,7 @@ +@@ -61,7 +61,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 diff --git a/debian/patches/upstream-zstd-1.5.4.patch b/debian/patches/upstream-zstd-1.5.4.patch deleted file mode 100644 index 1087df6..0000000 --- a/debian/patches/upstream-zstd-1.5.4.patch +++ /dev/null @@ -1,56 +0,0 @@ -Description: Update tests to handle zstd 1.5.4 -Bug-Debian: https://bugs.debian.org/1031485 -Origin: upstream, https://github.com/zchunk/zchunk/commit/7b84aabb0ff0365e57ae35178eeeb610fc3c0888 -Author: Jonathan Dieter -Last-Update: 2023-02-22 - ---- a/test/meson.build -+++ b/test/meson.build -@@ -251,7 +251,10 @@ - ) - - if build_machine.endian() != 'big' -- check_sha = 'ac9d431f1f568d8921257fa17929c320f0cdcbff450d9f3c38c78c4f410ee788' -+ check_sha = '7412757c744bcb17a112fedcbec6914d307bc4d2ab5936a2b6908a64a5c8c0ec' -+ if zstd_dep.found() and zstd_dep.version().version_compare('<=1.5.3') -+ check_sha = 'ac9d431f1f568d8921257fa17929c320f0cdcbff450d9f3c38c78c4f410ee788' -+ endif - if zstd_dep.found() and zstd_dep.version().version_compare('<=1.5.0') - check_sha = '4f07f865bb15624cf854aa369e14a3538ad9e9bf98e233036d37d2568e60b7cc' - endif -@@ -294,7 +297,10 @@ - ) - - -- check_sha = '35549b28b01c0a43d7389d4c40d5b750c73fb6c0c6701355ef709ef4a37df389' -+ check_sha = '25669f40abd98cc6a010173ad9891960ef56f12fad2ba95acb642ca11a98e96f' -+ if zstd_dep.found() and zstd_dep.version().version_compare('<=1.5.3') -+ check_sha = '35549b28b01c0a43d7389d4c40d5b750c73fb6c0c6701355ef709ef4a37df389' -+ endif - if zstd_dep.found() and zstd_dep.version().version_compare('<=1.5.0') - check_sha = '11d08d01c7877d51b84a0f97ebf651ca3304de10cdf207223df2dbc3295fa532' - endif -@@ -331,7 +337,10 @@ - is_parallel: false - ) - -- check_sha = '2580f66412adce1ed8d92abc09b0f64eb155155f61e21a8269a2c4a338857e51' -+ check_sha = 'f9057c70daf878ec93b86156ccabb4ce4549d409fe0446b4f88a0f88f916956b' -+ if zstd_dep.found() and zstd_dep.version().version_compare('<=1.5.3') -+ check_sha = '2580f66412adce1ed8d92abc09b0f64eb155155f61e21a8269a2c4a338857e51' -+ endif - if zstd_dep.found() and zstd_dep.version().version_compare('<=1.5.0') - check_sha = 'db42e903a2cf3b859835298272ff45bff6d2435d32fe7fda2bfe2815ab161994' - endif -@@ -380,7 +389,10 @@ - is_parallel: false - ) - -- check_sha = '863dc2bda721a32c26485eeb2223d5dabcf9ac517ecba8c7991fa0120d04c937' -+ check_sha = 'ec068277d5277b2c7c3c45e25f5b23a0e7ef56fd4c0463db28255642850379ab' -+ if zstd_dep.found() and zstd_dep.version().version_compare('<=1.5.3') -+ check_sha = '863dc2bda721a32c26485eeb2223d5dabcf9ac517ecba8c7991fa0120d04c937' -+ endif - if zstd_dep.found() and zstd_dep.version().version_compare('<=1.5.0') - check_sha = 'ee8df850bc4797e6696b966a74a459129b0f6d23dfb720d1cc8cba6f2b209dd2' - endif -- 2.30.2