Merge remote-tracking branch 'upstream/master'

diff --cc Makefile
Simple merge

diff --cc backend/initramfs-tools/live.hook
Simple merge

diff --cc components/9990-cmdline-old
Simple merge

diff --cc components/9990-main.sh
index b9bd71b,b50952f..b0e2a7b
--- 1/components/9990-main.sh
--- 2/components/9990-main.sh
+++ b/components/9990-main.sh
@@@ -178,10 -201,11 +201,10 @@@ Live (
        # this includes code that checks what is mounted on /lib/live/mount/*
        # (eg: grep /lib/live /proc/mount)
        # XXX: to be removed before the bullseye release
-       mkdir -p ${rootmnt}/lib/live/mount
-       mount --rbind /run/live ${rootmnt}/lib/live/mount
+       mkdir -p "${rootmnt}/lib/live/mount"
+       mount --rbind /run/live "${rootmnt}/lib/live/mount"
  
        Fstab
 -      Netbase
  
        Swap
  

diff --cc components/9990-misc-helpers.sh
Simple merge

diff --cc debian/changelog
index 7055ec1,d3020bf..8f9b668
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,35 -1,25 +1,57 @@@
+ live-boot (1:20190614) unstable; urgency=medium
+ 
+   [ Roland Clobus ]
+   * The homepage is https://wiki.debian.org/DebianLive
+   * Used the same text for po4a as in live-manual.
+   * Updated URL to the homepage and manual.
+   * Fixed Lintian warning: manpage-section-mismatch
+   * Always rebuild po4a.cfg This is needed to ensure that new languages
+     will automatically be found
+   * New Build-Depends: po4a for the translation files
+   * Updated the translation files. The translators can now update their
+     translations.
+ 
+   [ Benjamin Drung ]
+   * Also search for libnss_*.so files in /usr/lib (Closes: #930419)
+ 
+   [ Luca Boccassi ]
+   * Set Rules-Requires-Root: no
+   * Set Standards-Version to 4.3.0
+ 
+  -- Luca Boccassi <bluca@debian.org>  Fri, 14 Jun 2019 10:55:07 +0100
+ 
 +live-boot (1:20180603+grml.3) unstable; urgency=medium
 +
 +  * [d189b07] Ensure locating libnss* files doesn't fail on merged-usr
 +    systems
 +
 + -- Michael Prokop <mika@grml.org>  Thu, 11 Jul 2019 11:51:40 +0200
 +
 +live-boot (1:20180603+grml.2) unstable; urgency=medium
 +
 +  * [ad4ec75] Do not generate dhcp entry for loopback interface.
 +    Thanks to Mykola Malkov for the bug report
 +
 + -- Michael Prokop <mika@grml.org>  Fri, 08 Feb 2019 17:26:00 +0100
 +
 +live-boot (1:20180603+grml.1) unstable; urgency=medium
 +
 +  * [f35e0cf] Sync with Debian's upstream
 +    (https://salsa.debian.org/live-team/live-boot/),
 +    git commit 7130a2c0b.
 +  * [c8a5e53] Minimize delta to Debian's upstream/master
 +  * [27bc786] Support debian_networking boot option to use Debian's
 +    network behavior
 +  * [52474b4] 9990-grml-networking.sh:
 +    * By displaying "Preconfiguring Grml networking" it's more
 +      explicit that we're running the 9990-grml-networking.sh code
 +    * It's not the 23networking live-initramfs hook since quite some time,
 +      update the comment for generation of /etc/network/interfaces
 +    * Support also new style network device names by iterating over
 +      /sys/class/net/* and skipping only the loopback interface
 +
 + -- Michael Prokop <mika@grml.org>  Fri, 14 Dec 2018 15:40:36 +0100
 +
  live-boot (1:20180603) unstable; urgency=medium
  
    [ Luca Boccassi ]

diff --cc debian/control
index 6a54689,65c6b83..e20fe5e
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -1,23 -1,25 +1,27 @@@
  Source: live-boot
  Section: misc
  Priority: optional
 -Maintainer: Debian Live Maintainers <debian-live@lists.debian.org>
 -Uploaders: Iain R. Learmonth <irl@debian.org>, Raphaël Hertzog <hertzog@debian.org>,
 - Luca Boccassi <bluca@debian.org>
 +Maintainer: Grml Team <team@grml.org>
++Uploaders: Michael Prokop <mika@grml.org>
  Build-Depends:
-  debhelper (>= 10),
- Standards-Version: 4.1.3
+  debhelper-compat (= 12),
+  po4a,
+ Standards-Version: 4.4.1
+ 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
 +Homepage: http://live.debian.net/devel/live-boot/
- Vcs-Browser: http://git.grml.org/?p=live-boot-grml.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,

diff --cc debian/live-boot-grml.bug-presubj
Simple merge

diff --cc debian/rules
index a5df4d6,96182a3..e19aca4
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -7,11 -7,11 +7,11 @@@ override_dh_auto_install
        dh_auto_install -- DESTDIR=debian/tmp
  
        # Removing useless files
 -      rm -f debian/tmp/usr/share/doc/live-boot/COPYING
 +      rm -f debian/tmp/usr/share/doc/live-boot-grml/COPYING
  
        # live-boot-initramfs-tools
 -      mkdir -p debian/live-boot-initramfs-tools/usr/share
 -      mv debian/tmp/usr/share/initramfs-tools debian/live-boot-initramfs-tools/usr/share
 +      mkdir -p debian/live-boot-grml-initramfs-tools/usr/share
 +      mv debian/tmp/usr/share/initramfs-tools debian/live-boot-grml-initramfs-tools/usr/share
  
- override_dh_install:
-       dh_install --fail-missing
+ override_dh_missing:
+       dh_missing --fail-missing