Merge remote-tracking branch 'origin/pr/153'

diff --git a/debian/changelog b/debian/changelog
index e039910..440c41f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+grml-debootstrap (0.91) unstable; urgency=medium
+
+  * [ef76531] docs: fix duplicated --efi option in usage examples
+  * [22cdc9f] Provide workaround for Debian bug #918590 with lvm + udev in
+    VM installations
+  * [5d3fdc8] Check for existence of debootstrap binary after command line
+    processing
+  * [eb667bc] Bump Standards-Version to 4.5.0
+  * [8002a17] Execute 'wrap-and-sort -a -t -s' on debian/
+
+ -- Michael Prokop <mika@grml.org>  Tue, 12 May 2020 17:23:59 +0200
+
 grml-debootstrap (0.90) unstable; urgency=medium
 
   * [2891924] packer: Update VBoxGuestAdditions to v5.2.24

diff --git a/debian/control b/debian/control
index 0688ba8..2909fb1 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,34 +2,39 @@ Source: grml-debootstrap
 Section: admin
 Priority: optional
 Maintainer: Grml Team <team@grml.org>
-Uploaders: Michael Prokop <mika@debian.org>,
-           Alexander Wirt <formorer@debian.org>,
-           Christian Hofstaedtler <zeha@debian.org>,
-           Ulrich Dangel <mru@spamt.net>
-Build-Depends: debhelper-compat (= 12),
-Build-Depends-Indep: asciidoc,
-                     docbook-xsl,
-                     shunit2,
-                     xsltproc
-Standards-Version: 4.4.1
+Uploaders:
+ Michael Prokop <mika@debian.org>,
+ Alexander Wirt <formorer@debian.org>,
+ Christian Hofstaedtler <zeha@debian.org>,
+ Ulrich Dangel <mru@spamt.net>,
+Build-Depends:
+ debhelper-compat (= 12),
+Build-Depends-Indep:
+ asciidoc,
+ docbook-xsl,
+ shunit2,
+ xsltproc,
+Standards-Version: 4.5.0
 Homepage: https://grml.org/grml-debootstrap/
 Vcs-git: git://git.grml.org/grml-debootstrap.git
 Vcs-Browser: https://git.grml.org/?p=grml-debootstrap.git
 
 Package: grml-debootstrap
 Architecture: all
-Depends: debian-archive-keyring,
-         debootstrap (>= 0.3.3.3) | cdebootstrap (>= 0.3.16),
-         e2fsprogs,
-         fdisk | util-linux (<< 2.29.2-3~),
-         gawk,
-         kmod,
-         ${misc:Depends},
-         ${shlibs:Depends}
-Recommends: dialog,
-            kpartx,
-            parted,
-            qemu-utils
+Depends:
+ debian-archive-keyring,
+ debootstrap (>= 0.3.3.3) | cdebootstrap (>= 0.3.16),
+ e2fsprogs,
+ fdisk | util-linux (<< 2.29.2-3~),
+ gawk,
+ kmod,
+ ${misc:Depends},
+ ${shlibs:Depends},
+Recommends:
+ dialog,
+ kpartx,
+ parted,
+ qemu-utils,
 Description: wrapper around debootstrap for installing pure Debian
  Provides a wrapper suite around debootstrap and cdebootstrap
  to ease installation of a pure Debian system.