From 27eba4ace1f4cde430f773c01a629c240b6bf207 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Wed, 7 Sep 2022 13:57:23 +0200 Subject: [PATCH 1/6] Replace egrep usage with grep -E grep 3.8 deprecated support for egrep + fgrep, and now prints a warning on stderr: | egrep: warning: egrep is obsolescent; using grep -E | fgrep: warning: fgrep is obsolescent; using grep -F --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index f83d809..7d696b5 100755 --- a/debian/rules +++ b/debian/rules @@ -10,7 +10,7 @@ VERSION:=$(shell dpkg-parsechangelog | awk '/Version: / { print $$2 }') override_dh_auto_build: dh_testdir - egrep -q '^PROG_VERSION = "\*\*\*UNKNOWN\*\*\*"' grml2usb || (echo "PROG_VERSION in grml2usb wrong." && exit 2) + grep -qE '^PROG_VERSION = "\*\*\*UNKNOWN\*\*\*"' grml2usb || (echo "PROG_VERSION in grml2usb wrong." && exit 2) $(MAKE) -C mbr $(MAKE) -- 2.1.4 From ec28a5006697e567fbc5496b05da9a50ce42d333 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Wed, 8 Feb 2023 08:27:47 +0100 Subject: [PATCH 2/6] Bump Standards-Version to 4.6.2 --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index d6cac4f..c60f8fb 100644 --- a/debian/control +++ b/debian/control @@ -16,7 +16,7 @@ Build-Depends: isort, vulture, xsltproc, -Standards-Version: 4.5.1 +Standards-Version: 4.6.2 Homepage: https://grml.org/grml2usb/ Vcs-git: git://git.grml.org/grml2usb.git Vcs-Browser: https://git.grml.org/?p=grml2usb.git -- 2.1.4 From 00ce55f518f6abc61c2ede0320bffc90ff3eb09a Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Wed, 8 Feb 2023 08:28:02 +0100 Subject: [PATCH 3/6] Release new version 0.19.1 --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index f712727..05f89ef 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +grml2usb (0.19.1) unstable; urgency=medium + + * [27eba4a] Replace egrep usage with grep -E + * [ec28a50] Bump Standards-Version to 4.6.2 + + -- Michael Prokop Wed, 08 Feb 2023 08:27:50 +0100 + grml2usb (0.19.0) unstable; urgency=medium [ Manuel Rom ] -- 2.1.4 From 2955aaf78a680a9c1a96ef5d3a4e03599b2dd670 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Mon, 20 Feb 2023 11:27:09 +0100 Subject: [PATCH 4/6] codecheck: reformat with black, version 23.1.0 Drop empty newline as expected by black >=23.1.0 See https://github.com/psf/black/blob/main/CHANGES.md Closes: #1031466 --- grml2usb | 1 - 1 file changed, 1 deletion(-) diff --git a/grml2usb b/grml2usb index 8f689a9..5ac6e76 100755 --- a/grml2usb +++ b/grml2usb @@ -1614,7 +1614,6 @@ def handle_syslinux_config(grml_flavour, target): new_grml_cfg = "%s/%s_grml.cfg" % (syslinux_target, flavour_filename) if os.path.isfile(defaults_file): - # remove default menu entry in menu remove_default_entry(new_default_with_path) -- 2.1.4 From 4bbd7a8a99e58c13ee09917fcb28caf720d85b86 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Mon, 20 Feb 2023 11:35:14 +0100 Subject: [PATCH 5/6] Release new version 0.19.2 --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 05f89ef..f818fc7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +grml2usb (0.19.2) unstable; urgency=medium + + * [2955aaf] codecheck: reformat with black, version 23.1.0 + (Closes: #1031466) + + -- Michael Prokop Mon, 20 Feb 2023 11:33:34 +0100 + grml2usb (0.19.1) unstable; urgency=medium * [27eba4a] Replace egrep usage with grep -E -- 2.1.4 From 5f40f1c76e15c5de09a8a42fc4700284781f5be5 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Wed, 13 Mar 2024 12:36:30 +0100 Subject: [PATCH 6/6] grml2usb docs: drop references to deprecated grml-medium grml-medium is gone since many years, so there's no point in further referring to it Thanks to Christoph Biedl for spotting --- grml2usb.8.txt | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/grml2usb.8.txt b/grml2usb.8.txt index 8e966ad..ec8a197 100644 --- a/grml2usb.8.txt +++ b/grml2usb.8.txt @@ -214,12 +214,6 @@ Directory layout on USB device | |-- grml64 | | |-- linux26 [Kernel] | | |-- initrd.gz [initramfs] - | |-- grml-medium - | | |-- linux26 [...] - | | |-- initrd.gz - | |-- grml64-medium - | | |-- linux26 - | | |-- initrd.gz | |-- grml-small | | |-- linux26 | | |-- initrd.gz @@ -256,11 +250,8 @@ Directory layout on USB device |-- grml/ | |-- filesystem.module [module specifying which squashfs should be used for grml] | `-- grml.squashfs [squashfs file for grml] - |-- grml-medium/ - | |-- filesystem.module [module specifying which squashfs should be used for grml-medium] - | `-- grml-medium.squashfs [squashfs file for grml-medium] |-- grml-small/ - | |-- filesystem.module [module specifying which squashfs should be used for grml-medium] + | |-- filesystem.module [module specifying which squashfs should be used for grml-small] | `-- grml-small.squashfs [squashfs file for grml-small] `-- ... -- 2.1.4