From: Peter Pentchev Date: Thu, 11 Feb 2021 10:04:57 +0000 (+0200) Subject: Update the Debian packaging for zchunk-1.1.9. X-Git-Tag: archive/raspbian/1.1.9+ds1-1+rpi1^2~2 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a41f0783fafedba30758a466cf4a23813b671249;p=zchunk.git Update the Debian packaging for zchunk-1.1.9. --- diff --git a/debian/changelog b/debian/changelog index 6aed672..eecc8ce 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ -zchunk (1.1.8+ds1-1) UNRELEASED; urgency=medium +zchunk (1.1.9+ds1-1) UNRELEASED; urgency=medium - * New upstream release. + * New upstream release that includes the test-checksums patch. -- Peter Pentchev Thu, 11 Feb 2021 11:29:26 +0200 diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 7ba8619..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -test-checksums.patch diff --git a/debian/patches/test-checksums.patch b/debian/patches/test-checksums.patch deleted file mode 100644 index 5ba9a9c..0000000 --- a/debian/patches/test-checksums.patch +++ /dev/null @@ -1,56 +0,0 @@ -Description: Handle zstd 1.4.7+ -Origin: upstream; https://github.com/zchunk/zchunk/commit/d2eae512bee09a4047cfe586de12f644d73b0736#diff-fb327c87db6b2c02c67999cd120ccf98eb09d654b487f2612366306f9d6ffd9c -Author: Jonathan Dieter -Bug-Debian: https://bugs.debian.org/978320 -Last-Update: 2021-01-02 - ---- a/test/meson.build -+++ b/test/meson.build -@@ -214,7 +214,10 @@ - ) - - if build_machine.endian() != 'big' -- check_sha = '45e48c11fea129d2c434ffcec7d8fbc1720f30f33d438654cd117616121c218e' -+ check_sha = 'eff3098803ba80f0c446d49f48188f89167d7f29cdc8a98c19f0ecfb4e2ee3c9' -+ if zstd_dep.found() and zstd_dep.version().version_compare('<=1.4.6') -+ check_sha = '45e48c11fea129d2c434ffcec7d8fbc1720f30f33d438654cd117616121c218e' -+ endif - if zstd_dep.found() and zstd_dep.version().version_compare('<=1.3.5') - check_sha = '45e48c11fea129d2c434ffcec7d8fbc1720f30f33d438654cd117616121c218e' - endif -@@ -234,7 +237,10 @@ - ] - ) - -- check_sha = 'b4805798547be62421944a87db3a90de455b4772c6013e685720b49336b8b17e' -+ check_sha = 'b86795ca14eb04b382d1c7f94501aa5d1a2ddb05a5351c0235d00edb954e9b66' -+ if zstd_dep.found() and zstd_dep.version().version_compare('<=1.4.6') -+ check_sha = 'b4805798547be62421944a87db3a90de455b4772c6013e685720b49336b8b17e' -+ endif - if zstd_dep.found() and zstd_dep.version().version_compare('<=1.3.4') - check_sha = '0fb0f2262c62714063e409117fcbd4c114b35e3abbfc90b042a41246b62ff789' - endif -@@ -252,7 +258,10 @@ - ) - endif - --check_sha = '9472ddc74dbd96291077bbb8d793e605824be8dba45e3e94bbc54b7de21a37a1' -+check_sha = 'c46929367cd3d05daaca3b44657726791b428fb2198f5e7e5367b5cc781307aa' -+if zstd_dep.found() and zstd_dep.version().version_compare('<=1.4.6') -+ check_sha = '9472ddc74dbd96291077bbb8d793e605824be8dba45e3e94bbc54b7de21a37a1' -+endif - if zstd_dep.found() and zstd_dep.version().version_compare('<=1.3.5') - check_sha = '6911b50cad5b6ed3ee89322338c559afdd0e72f614d3817b47ce370df52fd6b4' - endif -@@ -276,7 +285,10 @@ - ] - ) - --check_sha = '4e86b47410a3a5090c7d60040d24d8d390c31f16f96ea112c8f153888eaf8c6e' -+check_sha = '5fc2449aeb51f6a898529fa4d53b04de6df6a352826f819dc2b39b153ddaa788' -+if zstd_dep.found() and zstd_dep.version().version_compare('<=1.4.6') -+ check_sha = '4e86b47410a3a5090c7d60040d24d8d390c31f16f96ea112c8f153888eaf8c6e' -+endif - if zstd_dep.found() and zstd_dep.version().version_compare('<=1.3.5') - check_sha = '62ee66fbf41a1f18617f400383eb38905050050f0f435a6e56df4a30d1bb694d' - endif