From: Michael Prokop <mika@grml.org>
Date: Tue, 9 Mar 2021 17:28:27 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: debian/1%20210208+grml.1~1
X-Git-Url: http://git.grml.org/?p=live-boot-grml.git;a=commitdiff_plain;h=322e57a4a7c972702e93038df009c045286bffbd

Merge remote-tracking branch 'upstream/master'

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

322e57a4a7c972702e93038df009c045286bffbd
diff --cc debian/control
index d040147,972c5d6..c88a3fc
--- a/debian/control
+++ b/debian/control
@@@ -6,21 -7,19 +6,21 @@@ Uploaders: Michael Prokop <mika@grml.or
  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,