Merge version 1.4.8+dfsg-3+rpi1 and 1.4.9+dfsg-1 to produce 1.4.9+dfsg-1+rpi1

diff --cc debian/changelog
index 0b65c1aef2c087617309ddad5e27a7dd7b480ac2,66d489c2e3d0d124039f03785a66e7aa248de860..2a59510db9f7b5423ce57cc6d78a842310105824
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,18 +1,25 @@@
- libzstd (1.4.8+dfsg-3+rpi1) bookworm-staging; urgency=medium
++libzstd (1.4.9+dfsg-1+rpi1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from 1.4.8+dfsg-2.1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Fri, 07 May 2021 07:36:26 +0000]
 +  * Fix broken unaligned accesses.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Mon, 11 Oct 2021 18:43:18 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 24 Mar 2022 12:18:55 +0000
++
+ libzstd (1.4.9+dfsg-1) unstable; urgency=medium
+ 
+   * New maintainer, bring libzstd under the RPM packaging team's umbrella.
+     Many thanks to the Debian Med Team and everyone else for their work!
+   * Add my debian/* copyright notice.
+   * Catch up with a renamed Lintian tag in an override.
+   * Correct the upstream copyright years.
+   * Add a trivial git-buildpackage config file.
+   * New upstream release:
+     - update the upstream copyright years
+     - adapt the 0008-Address-embedded-zlib patch
+     - refresh patch line numbers
+   * Fix a kFreeBSD FTBFS - UTIME_NOW is not defined.
+ 
+  -- Peter Pentchev <roam@debian.org>  Sun, 20 Mar 2022 18:25:50 +0200
  
  libzstd (1.4.8+dfsg-3) unstable; urgency=medium
  

diff --cc debian/patches/series
index 8f209742bc8a8623f1cd6611e621209b58d77d24,57e22f3c26c7ec36706eb5be46f814fe67c72581..6b86d8b7de71f565f1f9585eaa001bafde5d5175
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -4,5 -4,4 +4,5 @@@
  0014-Reproducible-build.patch
  0015-Skip-dev-random-tests-on-hurd.patch
  0017-alpha-fbfs-st_mtime.patch
- 0018-fix-file-permissions-on-compression.patch
+ 0018-kfreebsd-ftbfs-utime-now.patch
 +9999-fix-broken-memory-access.patch

diff --cc lib/common/mem.h
Simple merge

diff --cc lib/common/xxhash.c
Simple merge

diff --cc lib/legacy/zstd_v02.c
Simple merge

diff --cc lib/legacy/zstd_v03.c
Simple merge

diff --cc lib/legacy/zstd_v04.c
Simple merge

diff --cc lib/legacy/zstd_v05.c
Simple merge

diff --cc lib/legacy/zstd_v06.c
Simple merge

diff --cc lib/legacy/zstd_v07.c
Simple merge