From: Raspbian automatic forward porter <root@raspbian.org>
Date: Fri, 4 Mar 2022 15:32:49 +0000 (+0000)
Subject: Merge version 1.0.1+dfsg1-5+rpi1 and 2.0.0+dfsg1-2 to produce 2.0.0+dfsg1-2+rpi1
X-Git-Tag: archive/raspbian/2.0.0+dfsg1-2+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a7a52e322b912f87980518c4eec1ddd4740c44ef;p=gpac.git

Merge version 1.0.1+dfsg1-5+rpi1 and 2.0.0+dfsg1-2 to produce 2.0.0+dfsg1-2+rpi1
---

a7a52e322b912f87980518c4eec1ddd4740c44ef
diff --cc debian/changelog
index 986e0f2,72138b9..a2b8991
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,30 +1,40 @@@
- gpac (1.0.1+dfsg1-5+rpi1) bookworm-staging; urgency=medium
++gpac (2.0.0+dfsg1-2+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>  Tue, 07 Sep 2021 07:47:19 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 04 Mar 2022 15:32:49 +0000
++
+ gpac (2.0.0+dfsg1-2) unstable; urgency=medium
+ 
+   * Team upload
+   * Upload to unstable
+ 
+  -- Sebastian Ramacher <sramacher@debian.org>  Fri, 25 Feb 2022 20:59:30 +0100
+ 
+ gpac (2.0.0+dfsg1-1) experimental; urgency=medium
+ 
+   * Team upload
+   * New upstream version 2.0.0+dfsg1
+     - Fix remaining security issues (Closes: #990691, #991965)
+       (CVE-2020-35980, CVE-2021-36584)
+     - Fix build with ffmpeg 5.0 (Closes: #1004623)
+   * SONAME bump: libgpac10 -> libgpac11
+   * debian/watch: Add repacksuffix
+   * debian/copyright:
+     - Merge entries with same copyright holder and same license
+     - Update copyright for 2.0.0 release
+   * debian/control:
+     - Bump ffmpeg build dependencies
+     - * Replace libsdl1.2-dev with libsdl2-dev
+   * debian/patches: Remove upstream patches
+   * debian/rules: No longer remove .desktop file
+   * debian/source/lintian-overrides: Update override to current lintian update
+ 
+  -- Sebastian Ramacher <sramacher@debian.org>  Fri, 25 Feb 2022 00:24:53 +0100
  
  gpac (1.0.1+dfsg1-5) unstable; urgency=medium
  
diff --cc debian/patches/series
index a4dcbff,db87f3b..b8c1bc6
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,22 -1,2 +1,3 @@@
  gcc-optflags.patch
  dont-err-build-on-uknown-system.patch
- CVE-2021-30014_CVE-2021-30020_CVE-2021-30022.patch
- CVE-2020-35979.patch
- CVE-2020-35981.patch
- CVE-2020-35982.patch
- CVE-2021-28300.patch
- CVE-2021-29279.patch
- CVE-2021-31255.patch
- CVE-2021-31256.patch
- CVE-2021-31261.patch
- CVE-2021-30015.patch
- CVE-2021-30019.patch
- CVE-2021-30199.patch
- CVE-2021-31257.patch
- CVE-2021-31258.patch
- CVE-2021-31260.patch
- CVE-2021-31262.patch
- talos-2021-1297.patch
- talos-2021-1298.patch
- talos-2021-1299.patch
 +remove-.gitattributes-it-causes-problems.patch