Merge version 2.0.0+dfsg1-2+rpi1 and 2.0.0+dfsg1-4 to produce 2.0.0+dfsg1-4+rpi1

diff --cc debian/changelog
index a2b8991983b61a24864703807bdb5341a6b8541a,70b70cb7dc00f1e41ae95b96188adaf8b93f6aad..f1b26e5e5264da6b886ed7e3278218873eeaa3ca
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,24 +1,34 @@@
- gpac (2.0.0+dfsg1-2+rpi1) bookworm-staging; urgency=medium
++gpac (2.0.0+dfsg1-4+rpi1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from 1.0.1+dfsg1-3+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 08 May 2021 12:28:54 +0000]
 +  * Link with libatomic on armhf too.
 +
 +  [changes introduced in 1.0.1+dfsg1-4+rpi1+deb11u1 by Peter Michael Green]
 +  * Remove .gitattributes, it causes problems for dgit.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Fri, 04 Mar 2022 15:32:49 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 28 Mar 2023 23:49:32 +0000
++
+ gpac (2.0.0+dfsg1-4) unstable; urgency=medium
+ 
+   * make lintian overrides backwards compatible
+ 
+  -- Reinhard Tartler <siretart@tauware.de>  Tue, 07 Mar 2023 06:41:07 -0500
+ 
+ gpac (2.0.0+dfsg1-3) unstable; urgency=medium
+ 
+   * Backport security fixes for CVE-2022-29339 CVE-2022-29340
+     CVE-2022-29537 CVE-2022-30976 CVE-2022-1035 CVE-2022-1172
+     CVE-2022-1222 CVE-2022-1441 CVE-2022-1795, Closes: 1016443
+   * Backport more security fixes CVE-2022-2453 CVE-2022-2454,
+     Closes: #1015788
+   * Backport more security fixes CVE-2022-38530 CVE-2022-36186
+     CVE-2022-36190 CVE-2022-36191, Closes: #1019595
+   * Backport more security fixes CVE-2022-2549, closes: #1016142,
+     CVE-2022-26967, Closes: #1007224
+   * fix some lintian overrides
+   * update build-depends on libfreetype-dev
+ 
+  -- Reinhard Tartler <siretart@tauware.de>  Mon, 06 Mar 2023 20:09:19 -0500
  
  gpac (2.0.0+dfsg1-2) unstable; urgency=medium
  

diff --cc debian/patches/series
index b8c1bc6ace7800f41a6840f66250e877a8bc95cd,86d29dc90620e810c6d5a172c7a2f0812ba55b77..3ba5db837d5dc48d2925dca7d7ac354e3c3e50f8
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -1,3 -1,16 +1,17 @@@
  gcc-optflags.patch
  dont-err-build-on-uknown-system.patch
+ CVE-2022-29339.patch
+ CVE-2022-29340.patch
+ CVE-2022-30976.patch
+ CVE-2022-1035.patch
+ CVE-2022-1172.patch
+ CVE-2022-1222.patch
+ CVE-2022-1441.patch
+ CVE-2022-1795.patch
+ CVE-2022-2453.patch
+ CVE-2022-2454.patch
+ CVE-2022-38530.patch
+ CVE-2022-36186.patch
+ CVE-2022-26967.patch
+ CVE-2022-2549.patch
 +remove-.gitattributes-it-causes-problems.patch