Merge remote-tracking branch 'upstream/master'

Syncing with Debian's live-boot as of
commit 6cee205c9b6c7eb9c48bf66bfdd75ab04e38308c (tag: debian/1%20210208, upstream/master)

diff --combined debian/control
index d040147,972c5d6..c88a3fc
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -1,26 -1,25 +1,26 @@@
  Source: live-boot
  Section: misc
  Priority: optional
 -Maintainer: Debian Live Maintainers <debian-live@lists.debian.org>
 -Uploaders: Raphaël Hertzog <raphael@offensive-security.com>,
 - Luca Boccassi <bluca@debian.org>
 +Maintainer: Grml Team <team@grml.org>
 +Uploaders: Michael Prokop <mika@grml.org>
  Build-Depends:
   debhelper-compat (= 12),
   po4a,
- Standards-Version: 4.4.1
+ Standards-Version: 4.5.0
  Rules-Requires-Root: no
  Homepage: https://wiki.debian.org/DebianLive
 -Vcs-Browser: https://salsa.debian.org/live-team/live-boot
 -Vcs-Git: https://salsa.debian.org/live-team/live-boot.git
 +Vcs-Browser: https://git.grml.org/?p=live-boot-grml.git
 +Vcs-Git: git://git.grml.org/live-boot-grml.git
 +Origin: Grml
 +Bugs: mailto:bugs@grml.org
  
 -Package: live-boot
 +Package: live-boot-grml
  Architecture: all
  Depends:
 - live-boot-initramfs-tools | live-boot-backend,
 + live-boot-grml-initramfs-tools | live-boot-backend,
   ${misc:Depends},
  Recommends:
 - live-boot-doc,
 + live-boot-grml-doc,
   live-tools,
   rsync,
   uuid-runtime,
@@@ -29,22 -28,18 +29,22 @@@ Suggests
   curlftpfs,
   httpfs2,
   wget,
 +Conflicts: live-boot
 +Replaces: live-boot
 +Provides: live-boot
  Description: Live System Boot Components
 - The Debian Live project maintains the components to build Debian based Live
 - systems and the official Debian Live images themselves.
 - .
   live-boot contains the components to configure a live system during the boot
   process (early userspace). Do not install this package on your regular system,
   it is only meant to be used in a live image.
   .
   In addition to live-boot, a backend for the initrd generation is required, such
   as live-boot-initramfs-tools.
 + .
 + Please notice that this package is maintained by the grml.org team.
 + This is NOT a fork of Debian's live-boot, it's just a customized
 + version to better fit Grml's needs.
  
 -Package: live-boot-doc
 +Package: live-boot-grml-doc
  Section: doc
  Architecture: all
  Multi-Arch: foreign
@@@ -58,12 -53,8 +58,12 @@@ Description: Live System Boot Component
   process (early userspace).
   .
   This package contains the documentation.
 + .
 + Please notice that this package is maintained by the grml.org team.
 + This is NOT a fork of Debian's live-boot, it's just a customized
 + version to better fit Grml's needs.
  
 -Package: live-boot-initramfs-tools
 +Package: live-boot-grml-initramfs-tools
  Architecture: all
  Depends:
   busybox | busybox-initramfs,
@@@ -85,7 -76,3 +85,7 @@@ Description: Live System Boot Component
   it is only meant to be used in a live image.
   .
   This package contains the initramfs-tools backend.
 + .
 + Please notice that this package is maintained by the grml.org team.
 + This is NOT a fork of Debian's live-boot, it's just a customized
 + version to better fit Grml's needs.