From: Michael Prokop Date: Wed, 27 May 2020 11:59:06 +0000 (+0200) Subject: Merge remote-tracking branch 'upstream/master' X-Git-Tag: debian/1%20200527+grml.1~2 X-Git-Url: http://git.grml.org/?p=live-boot-grml.git;a=commitdiff_plain;h=51f4b9d56200bec4e3e8ca8a209cf84f75308b82 Merge remote-tracking branch 'upstream/master' --- 51f4b9d56200bec4e3e8ca8a209cf84f75308b82 diff --cc components/9990-main.sh index b9bd71b,b50952f..b0e2a7b --- a/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 debian/changelog index 7055ec1,d3020bf..8f9b668 --- a/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 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 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 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 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 --- a/debian/control +++ b/debian/control @@@ -1,23 -1,25 +1,27 @@@ Source: live-boot Section: misc Priority: optional -Maintainer: Debian Live Maintainers -Uploaders: Iain R. Learmonth , Raphaël Hertzog , - Luca Boccassi +Maintainer: Grml Team ++Uploaders: Michael Prokop 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/rules index a5df4d6,96182a3..e19aca4 --- a/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