diff -Nru libzstd-1.4.5+dfsg/debian/changelog libzstd-1.4.5+dfsg/debian/changelog --- libzstd-1.4.5+dfsg/debian/changelog 2020-06-29 14:10:31.000000000 +0000 +++ libzstd-1.4.5+dfsg/debian/changelog 2020-07-03 20:45:58.000000000 +0000 @@ -1,3 +1,13 @@ +libzstd (1.4.5+dfsg-3+rpi1) bullseye-staging; urgency=medium + + [changes brought forward from 1.3.3+dfsg-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 14 Jan 2018 16:35:02 +0000] + * Disable testsuite. + + [changes introduced in 1.3.5+dfsg-2+rpi1 by Peter Michael Green] + * Remove .gitattributes file, it seems to break dgit. + + -- Raspbian forward porter <root@raspbian.org> Fri, 03 Jul 2020 20:45:58 +0000 + libzstd (1.4.5+dfsg-3) unstable; urgency=medium [ Paul Menzel ] diff -Nru libzstd-1.4.5+dfsg/debian/patches/auto-1.3.8+dfsg-2+rpi1-e6031276dd66e3d70631645ae04130471248c333-1546854160 libzstd-1.4.5+dfsg/debian/patches/auto-1.3.8+dfsg-2+rpi1-e6031276dd66e3d70631645ae04130471248c333-1546854160 --- libzstd-1.4.5+dfsg/debian/patches/auto-1.3.8+dfsg-2+rpi1-e6031276dd66e3d70631645ae04130471248c333-1546854160 1970-01-01 00:00:00.000000000 +0000 +++ libzstd-1.4.5+dfsg/debian/patches/auto-1.3.8+dfsg-2+rpi1-e6031276dd66e3d70631645ae04130471248c333-1546854160 2020-07-03 20:45:58.000000000 +0000 @@ -0,0 +1,50 @@ +From: Raspbian forward porter <root@raspbian.org> +Subject: Automatically generated patch (1.3.8+dfsg-2+rpi1) + +Last (up to) 3 git changes, FYI: + +commit e6031276dd66e3d70631645ae04130471248c333 +Author: Raspbian automatic forward porter <root@raspbian.org> +Date: Mon Jan 7 09:42:38 2019 +0000 + + Defuzz fuzzy quilt patches and/or disable broken quilt patches + +commit 6eee7c6d652fad87951b182d5ca9d438a624cd51 +Merge: 0fa2168 a9027b6 +Author: Raspbian automatic forward porter <root@raspbian.org> +Date: Mon Jan 7 09:42:35 2019 +0000 + + Merge version 1.3.5+dfsg-2+rpi1 and 1.3.8+dfsg-2 to produce 1.3.8+dfsg-2+rpi1 + +commit a9027b6a4f87209a7c5bb5dae30e6bd3ae9bc97d +Merge: 222ea88 15e45b6 +Author: Alexandre Mestiashvili <mestia@debian.org> +Date: Thu Jan 3 13:47:31 2019 +0000 + + Merge libzstd (1.3.8+dfsg-2) import into refs/heads/workingbranch +--- + +--- libzstd-1.3.8+dfsg.orig/.gitattributes ++++ /dev/null +@@ -1,21 +0,0 @@ +-# Set the default behavior +-* text eol=lf +- +-# Explicitly declare source files +-*.c text eol=lf +-*.h text eol=lf +- +-# Denote files that should not be modified. +-*.odt binary +-*.png binary +- +-# Visual Studio +-*.sln text eol=crlf +-*.vcxproj* text eol=crlf +-*.vcproj* text eol=crlf +-*.suo binary +-*.rc text eol=crlf +- +-# Windows +-*.bat text eol=crlf +-*.cmd text eol=crlf diff -Nru libzstd-1.4.5+dfsg/debian/patches/remove-.gitattributes-file-it-seems-to-b.patch libzstd-1.4.5+dfsg/debian/patches/remove-.gitattributes-file-it-seems-to-b.patch --- libzstd-1.4.5+dfsg/debian/patches/remove-.gitattributes-file-it-seems-to-b.patch 1970-01-01 00:00:00.000000000 +0000 +++ libzstd-1.4.5+dfsg/debian/patches/remove-.gitattributes-file-it-seems-to-b.patch 2020-07-03 20:45:58.000000000 +0000 @@ -0,0 +1,35 @@ +From: Peter Michael Green <plugwash@raspbian.org> +Date: Mon, 31 Dec 2018 10:31:58 +0000 +X-Dgit-Generated: 1.3.5+dfsg-2+rpi1 c1713c5e804a7b379e38c88ebade8d13bf8e8e2a +Subject: Remove .gitattributes file, it seems to break dgit. + + +--- + +--- libzstd-1.3.5+dfsg.orig/.gitattributes ++++ /dev/null +@@ -1,24 +0,0 @@ +-# Set the default behavior +-* text eol=lf +- +-# Explicitly declare source files +-*.c text eol=lf +-*.h text eol=lf +- +-# Denote files that should not be modified. +-*.odt binary +-*.png binary +- +-# Visual Studio +-*.sln text eol=crlf +-*.vcxproj* text eol=crlf +-*.vcproj* text eol=crlf +-*.suo binary +-*.rc text eol=crlf +- +-# Windows +-*.bat text eol=crlf +-*.cmd text eol=crlf +- +-# .travis.yml merging +-.travis.yml merge=ours diff -Nru libzstd-1.4.5+dfsg/debian/patches/series libzstd-1.4.5+dfsg/debian/patches/series --- libzstd-1.4.5+dfsg/debian/patches/series 2020-06-29 14:10:31.000000000 +0000 +++ libzstd-1.4.5+dfsg/debian/patches/series 2020-07-03 20:45:58.000000000 +0000 @@ -5,3 +5,4 @@ 0015-Skip-dev-random-tests-on-hurd.patch 0016-Fix-spelling.patch 0017-alpha-fbfs-st_mtime.patch +auto-1.3.8+dfsg-2+rpi1-e6031276dd66e3d70631645ae04130471248c333-1546854160 diff -Nru libzstd-1.4.5+dfsg/debian/rules libzstd-1.4.5+dfsg/debian/rules --- libzstd-1.4.5+dfsg/debian/rules 2020-06-29 14:10:31.000000000 +0000 +++ libzstd-1.4.5+dfsg/debian/rules 2020-07-03 20:45:58.000000000 +0000 @@ -49,3 +49,6 @@ cp $(mandir)/zstd.1 $(mandir)/zstdmt.1 $(HELP2MAN) --name='parallelised Zstandard compression, al la pigz' contrib/pzstd/pzstd \ | perl -pe 's/(\(de\)compression\s\(default:)(\d+)(\))/$$1 All$$3/g' >$(mandir)/pzstd.1 + +override_dh_auto_test: + echo testsuite disabled