Merge updates from debian/bullseye

Conflicts resolved:
	debian/changelog

Signed-off-by: Denis Pynkin <denis.pynkin@collabora.com>

debian/changelog

-raspi-firmware (1.20200212-1co1) apertis; urgency=medium
+raspi-firmware (1.20210303+ds-1apertis1) UNRELEASED; urgency=medium
 
-  [ Apertis package maintainers ]
-  * Import Apertis version 1.20200212-1
+  * Remaining Apertis changes:
+    * debian/apertis/component: Set to non-free
+    * Disable post-install/remove scripts for kernel and initramfs
+    * Remove `dosfstools` dependency
 
-  [ Denis Pynkin ]
-  * debian/apertis/component: Set to non-free
-  * Disable post-install/remove scripts for kernel and initramfs
-  * Remove `dosfstools` dependency
+ -- Denis Pynkin <denis.pynkin@collabora.com>  Thu, 29 Apr 2021 00:26:09 +0300
 
- -- Denis Pynkin <denis.pynkin@collabora.com>  Tue, 12 May 2020 09:26:20 +0000
+raspi-firmware (1.20210303+ds-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Gunnar Wolf <gwolf@debian.org>  Mon, 05 Apr 2021 10:42:59 -0500
+
+raspi-firmware (1.20210111+ds-2) unstable; urgency=medium
+
+  * Added better detection code to provide a working serial console
+  * dh_strip and dh_dwz should not be run over firmware files! Disable
+    them.
+
+ -- Gunnar Wolf <gwolf@debian.org>  Thu, 14 Jan 2021 13:53:53 -0600
+
+raspi-firmware (1.20210111+ds-1) unstable; urgency=medium
+
+  * New upstream release
+  * Several lintian low-priority messages cleaned
+    * debhelper compat 10→13
+    * Remove redundant Priority/Section tags from binary packages when
+      they replicate the source package's respective tag
+    * Vcs-Browser should not include the trailing ".git" particle
+    * Standards-version 4.5.0 → 4.5.1.0
+    * Override warnings "unused-file-paragraph-in-dep5-copyright" and
+      "wildcard-matches-nothing-in-dep5-copyright", as relevant files
+      came from a different source (documented in debian/copyright)
+    * Added "+ds" suffix to produced upstream version in debian/watch
+      indicating it is different from the upstream release
+
+ -- Gunnar Wolf <gwolf@debian.org>  Mon, 11 Jan 2021 17:57:36 -0600
+
+raspi-firmware (1.20201022-3) unstable; urgency=medium
+
+  * One more stab at fixing architecture detection - It gets tricky! :-(
+    (Closes: #975943)
+  * Dropped dependency on file - no longer needed
+
+ -- Gunnar Wolf <gwolf@debian.org>  Sun, 03 Jan 2021 17:00:16 -0600
+
+raspi-firmware (1.20201022-2) unstable; urgency=medium
+
+  * Team upload.
+
+  [ Diederik de Haas ]
+  * Fix arch detection of latest kernel (Closes: #975943).
+
+ -- Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org>  Sun, 20 Dec 2020 10:50:54 -0300
+
+raspi-firmware (1.20201022-1) unstable; urgency=medium
+
+  * New upstream version 1.20201022
+  * Use DPKG_MAINTSCRIPT_ARCH for getting system architecture instead of
+    dpkg --print-architecture (Closes: #971748)
+  * Drop deprecated declaration of elevator=deadline (Closes: #971882)
+  * Allow to pass arbitrary parameters to the kernel via
+    /etc/default/raspi-extra-cmdline (Closes: #971883, #951744)
+  * Reliability fix when copying DTBs (Closes: #968376)
+
+ -- Gunnar Wolf <gwolf@debian.org>  Wed, 28 Oct 2020 23:49:05 -0600
+
+raspi-firmware (1.20200601-3) unstable; urgency=medium
+
+  * Fix ROOTPART on virtual environment, thanks to Francisco José R. M.
+    for pointing out to the culprit!
+
+ -- Gunnar Wolf <gwolf@debian.org>  Thu, 20 Aug 2020 11:34:50 -0500
+
+raspi-firmware (1.20200601-2) unstable; urgency=medium
+
+  * Drop an ancient (pre-kernel 4.14) confusing bit of conditional code
+  * Don't set CMA in RPi4 unless specified expressly
+
+ -- Gunnar Wolf <gwolf@debian.org>  Wed, 05 Aug 2020 11:52:35 -0500
+
+raspi-firmware (1.20200601-1) unstable; urgency=medium
+
+  [ Romain Perier ]
+  * New upstream version 1.20200601
+
+  [ Gunnar Wolf ]
+  * Fix z50-raspi-firmware causing an unbootable system due to the
+    hardcoding of partition numbers (Closes: #964915)
+
+ -- Gunnar Wolf <gwolf@debian.org>  Wed, 05 Aug 2020 00:57:15 -0500
 
 raspi-firmware (1.20200212-1) unstable; urgency=medium
 

debian/compat

-10

debian/control

@@ -6,32 +6,29 @@ Maintainer: pkg-raspi <pkg-raspi-maintainers@lists.alioth.debian.org>
 Uploaders: Michael Stapelberg <stapelberg@debian.org>,
  Gunnar Wolf <gwolf@debian.org>,
  Romain Perier <romain.perier@gmail.com>
-Build-Depends: debhelper (>= 10)
-Standards-Version: 4.5.0
+Build-Depends: debhelper-compat (= 13)
+Standards-Version: 4.5.1.0
 Homepage: https://github.com/raspberrypi/firmware
 Vcs-Git: https://salsa.debian.org/debian/raspi-firmware.git
-Vcs-Browser: https://salsa.debian.org/debian/raspi-firmware.git
+Vcs-Browser: https://salsa.debian.org/debian/raspi-firmware
 XS-Autobuild: yes
 
 Package: raspi3-firmware
 Depends: raspi-firmware, ${misc:Depends}
 Architecture: arm64 armhf armel
-Priority: optional
 Section: non-free/oldlibs
 Description: transitional package
  This is a transitional package. It can safely be removed.
 
 Package: raspi-firmware
 Architecture: arm64 armhf armel
-Priority: optional
-Section: non-free/misc
 Pre-Depends: dpkg (>= 1.17.14)
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Breaks: linux-firmware-raspi3 (<< 1.20161123-2), raspi3-firmware (<< 1.20190718-1~)
 Replaces: linux-firmware-raspi3 (<< 1.20161123-2), raspi3-firmware (<< 1.20190718-1~)
 Description: Raspberry Pi family GPU firmware and bootloaders
  This package contains all the proprietary files necessary to boot a
- Raspberry Pi board. This should work with all models in the 0, 1, 2 and
- 3 families.
+ Raspberry Pi board. This should work with all models in the 0, 1, 2, 3 and
+ 4 families.
  .
  Raspberry Pi is a trademark of the Raspberry Pi Foundation.