diff -Nru ffms2-2.23/debian/changelog ffms2-2.23/debian/changelog
--- ffms2-2.23/debian/changelog	2020-03-22 15:40:21.000000000 +0000
+++ ffms2-2.23/debian/changelog	2021-07-28 21:00:25.000000000 +0000
@@ -1,8 +1,25 @@
-ffms2 (2.23-4build1) focal; urgency=medium
+ffms2 (2.23-5~20.04.sav0) focal; urgency=medium
 
-  * No-change rebuild for libgcc-s1 package name change.
+  * Backport to Focal
+  * debian/control: Set debhelper-compat (= 12) BD
 
- -- Matthias Klose <doko@ubuntu.com>  Sun, 22 Mar 2020 16:40:21 +0100
+ -- Rob Savoury <savoury@savos.tech>  Wed, 28 Jul 2021 14:00:25 -0700
+
+ffms2 (2.23-5) unstable; urgency=medium
+
+  [ Ondřej Nový ]
+  * Use debhelper-compat instead of debian/compat
+
+  [ Sebastian Ramacher ]
+  * debian/control:
+    - B-D on libswresample-dev
+    - Bump Standards-Version
+    - Set RRR: no
+    - Remove unnecessary Recommends
+    - Extend Description
+  * debian/: Bump debhelper compat to 13
+
+ -- Sebastian Ramacher <sramacher@debian.org>  Fri, 18 Jun 2021 00:28:20 +0200
 
 ffms2 (2.23-4) unstable; urgency=medium
 
diff -Nru ffms2-2.23/debian/compat ffms2-2.23/debian/compat
--- ffms2-2.23/debian/compat	2018-12-29 08:24:28.000000000 +0000
+++ ffms2-2.23/debian/compat	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-11
diff -Nru ffms2-2.23/debian/control ffms2-2.23/debian/control
--- ffms2-2.23/debian/control	2018-12-29 08:36:05.000000000 +0000
+++ ffms2-2.23/debian/control	2021-07-28 21:00:25.000000000 +0000
@@ -5,35 +5,35 @@
  Reinhard Tartler <siretart@tauware.de>,
  Rico Tzschichholz <ricotz@ubuntu.com>,
  Sebastian Ramacher <sramacher@debian.org>
-Build-Depends: debhelper (>= 11),
+Build-Depends: debhelper-compat (= 12),
  pkg-config,
- libavutil-dev (>= 4:0.8~),
- libavformat-dev (>= 4:0.8~),
  libavcodec-dev (>= 4:0.8~),
+ libavformat-dev (>= 4:0.8~),
+ libavutil-dev (>= 4:0.8~),
+ libswresample-dev,
  libswscale-dev (>= 4:0.8~),
- libavresample-dev,
  zlib1g-dev,
  python3,
  python3-markdown
 Section: libs
-Standards-Version: 4.3.0
+Standards-Version: 4.5.1
 Vcs-Browser: https://salsa.debian.org/multimedia-team/ffms2
 Vcs-Git: https://salsa.debian.org/multimedia-team/ffms2.git
 Homepage: https://github.com/FFMS/ffms2
+Rules-Requires-Root: no
 
 Package: libffms2-dev
 Architecture: any
 Multi-Arch: same
 Section: libdevel
 Depends: libffms2-4 (= ${binary:Version}),
- libavformat-dev,
  libavcodec-dev,
- libswscale-dev,
- libavresample-dev,
+ libavformat-dev,
  libavutil-dev,
+ libswresample-dev,
+ libswscale-dev,
  zlib1g-dev,
  ${misc:Depends}
-Recommends: ffmsindex
 Description: Development files for libffms2
  A cross platform ffmpeg wrapper library, and some additional content for
  things ffmpeg doesn't handle well. A more friendly API and an easy way to
@@ -50,6 +50,8 @@
  A cross platform ffmpeg wrapper library, and some additional content for
  things ffmpeg doesn't handle well. A more friendly API and an easy way to
  say "open and decompress this, I don't care how".
+ .
+ This package contains the shared library.
 
 Package: ffmsindex
 Architecture: any
diff -Nru ffms2-2.23/debian/not-installed ffms2-2.23/debian/not-installed
--- ffms2-2.23/debian/not-installed	1970-01-01 00:00:00.000000000 +0000
+++ ffms2-2.23/debian/not-installed	2021-06-17 22:26:53.000000000 +0000
@@ -0,0 +1,3 @@
+usr/share/doc/ffms2/ffms2-api.md
+usr/share/doc/ffms2/ffms2-changelog.md
+usr/lib/*/libffms2.la
diff -Nru ffms2-2.23/debian/rules ffms2-2.23/debian/rules
--- ffms2-2.23/debian/rules	2018-12-29 08:47:41.000000000 +0000
+++ ffms2-2.23/debian/rules	2021-06-17 22:26:53.000000000 +0000
@@ -1,6 +1,5 @@
 #!/usr/bin/make -f
 
-export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
 %: