[neon/neon/livecd-rootfs/Neon/release] live-build/auto: gpg not gpg1 - signing hasn't worked got gosh only knows

[Carlos De Maine]

Git commit 8caaa59c29cf23f67297705ec9ae45db51a1e4ec by Carlos De Maine.
Committed on 05/08/2024 at 11:09.
Pushed by carlosdem into branch 'Neon/release'.

gpg not gpg1 - signing hasn't worked got gosh only knows

M  +1    -1    live-build/auto/build
M  +1    -1    live-build/auto/config

https://invent.kde.org/neon/neon/livecd-rootfs/-/commit/8caaa59c29cf23f67297705ec9ae45db51a1e4ec

diff --git a/live-build/auto/build b/live-build/auto/build
index 7f10253e..caad1246 100755
--- a/live-build/auto/build
+++ b/live-build/auto/build
@@ -131,7 +131,7 @@ Name-Real: Ubuntu Local Archive One-Time Signing Key
 Name-Email: cdimage at ubuntu.com
 Expire-Date: 0
 @@EOF
-		gpg1 --home config/gnupg --gen-key --batch < config/gnupg/NEWKEY \
+		gpg --home config/gnupg --gen-key --batch < config/gnupg/NEWKEY \
 			> config/gnupg/generate.log 2>&1 &
 		GPG_PROCESS=$!
 	fi
diff --git a/live-build/auto/config b/live-build/auto/config
index 70e19276..392fb256 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -1659,7 +1659,7 @@ if [ "$EXTRA_PPAS" ]; then
 	      config/archives/extra-ppas.key.chroot
 	gpg_tmpdir="$(mktemp -d)"
 	run_gpg () {
-		gpg1 --no-default-keyring --no-options --homedir "$gpg_tmpdir" \
+		gpg --no-default-keyring --no-options --homedir "$gpg_tmpdir" \
 			--secret-keyring "$gpg_tmpdir/secring.gpg" \
 			--keyserver hkp://keyserver.ubuntu.com:80/ \
 			"$@"