Merge branch 'wimpysworld:main' into test-ci-deprecation-chore

01-main/manifest

@@ -35,15 +35,13 @@ code
 codium
 com.github.tkashkin.gamehub
 copyq
-#corectrl
 cosign
 croc
 cronopete
 crossover
 crow-translate
 cryptomator
 dbeaver-ce
-#deadbeef
 deadbeef-static
 deborah
 deltachat-desktop
@@ -65,7 +63,6 @@ element-desktop
 emby-server
 enpass
 exifcleaner
-#exodus
 expressvpn
 fail2ban
 fastfetch
@@ -84,7 +81,6 @@ franz
 frostwire
 fsearch
 gcm
-#geforcenow-electron
 gh
 git-delta
 github-desktop
@@ -110,7 +106,6 @@ hyper
 hyperfine
 i3
 igdm
-#igdm-pro
 imhex
 indicator-sound-switcher
 influxdb
@@ -164,15 +159,13 @@ minikube
 motrix
 mpdevil
 ms-365-electron
-#ms-office-electron
 mullvad-vpn
 multimc
 nala
 nala-legacy
 nekoray
 nemo-mediainfo-tab
 neo4j
-#neovim
 nextcloud-desktop
 nodejs
 nomad
@@ -196,11 +189,9 @@ p3x-onenote
 pandoc
 papirus-folders
 papirus-icon-theme
-#parsec
 pdfsam-basic
 pdfsam-visual
 peazip
-#picocrypt
 plexmediaserver
 plow
 polychromatic
@@ -229,7 +220,6 @@ rstudio
 rstudio-server
 rustdesk
 sejda-desktop
-#sengi
 shutter-encoder
 signal-desktop
 simplenote
@@ -284,7 +274,6 @@ trivy
 typora
 ubuntu-make
 ulauncher
-#ungoogled-chromium
 urserver
 usbimager
 vagrant

01-main/packages/brave-browser

@@ -1,5 +1,5 @@
 DEFVER=1
-ASC_KEY_URL="https://brave-browser-apt-release.s3.brave.com/brave-core.asc"
+GPG_KEY_URL="https://brave-browser-apt-release.s3.brave.com/brave-browser-archive-keyring.gpg"
 APT_LIST_NAME="brave-browser-release"
 APT_REPO_URL="https://brave-browser-apt-release.s3.brave.com/ stable main"
 APT_REPO_OPTIONS="arch=amd64"

01-main/packages/doublecmd-gtk

@@ -1,8 +1,15 @@
-DEFVER=1
-CODENAMES_SUPPORTED="buster bullseye focal jammy kinetic lunar mantic noble"
-ASC_KEY_URL="https://download.opensuse.org/repositories/home:Alexx2000/xUbuntu_${UPSTREAM_RELEASE}/Release.key"
+DEFVER=2
+CODENAMES_SUPPORTED="buster bullseye bookworm focal jammy kinetic lunar mantic noble"
+LOCALID=""
+case ${UPSTREAM_ID} in
+    ubuntu)
+        LOCALID="x${UPSTREAM_ID^}" ;; 
+    debian)
+        LOCALID="${UPSTREAM_ID^}" ;; 
+esac
+ASC_KEY_URL="https://download.opensuse.org/repositories/home:Alexx2000/${LOCALID}_${UPSTREAM_RELEASE}/Release.key"
 APT_LIST_NAME="doublecmd"
-APT_REPO_URL="https://download.opensuse.org/repositories/home:/Alexx2000/xUbuntu_${UPSTREAM_RELEASE}/ /"
+APT_REPO_URL="https://download.opensuse.org/repositories/home:/Alexx2000/${LOCALID}_${UPSTREAM_RELEASE}/ /"
 PRETTY_NAME="doublecmd-gtk"
 WEBSITE="https://doublecmd.sourceforge.io/"
 SUMMARY="Doublecmd is a cross-platform open source file manager with two panels side by side. It is inspired by Total Commander and features new ideas."

01-main/packages/doublecmd-qt

@@ -1,8 +1,15 @@
-DEFVER=1
-CODENAMES_SUPPORTED="buster bullseye focal jammy kinetic lunar mantic noble"
-ASC_KEY_URL="https://download.opensuse.org/repositories/home:Alexx2000/xUbuntu_${UPSTREAM_RELEASE}/Release.key"
+DEFVER=2
+CODENAMES_SUPPORTED="buster bullseye bookworm focal jammy kinetic lunar mantic noble"
+LOCALID=""
+case ${UPSTREAM_ID} in
+    ubuntu)
+        LOCALID="x${UPSTREAM_ID^}" ;; 
+    debian)
+        LOCALID="${UPSTREAM_ID^}" ;; 
+esac
+ASC_KEY_URL="https://download.opensuse.org/repositories/home:Alexx2000/${LOCALID}_${UPSTREAM_RELEASE}/Release.key"
 APT_LIST_NAME="doublecmd"
-APT_REPO_URL="https://download.opensuse.org/repositories/home:/Alexx2000/xUbuntu_${UPSTREAM_RELEASE}/ /"
+APT_REPO_URL="https://download.opensuse.org/repositories/home:/Alexx2000/${LOCALID}_${UPSTREAM_RELEASE}/ /"
 PRETTY_NAME="doublecmd-qt"
 WEBSITE="https://doublecmd.sourceforge.io/"
 SUMMARY="Doublecmd is a cross-platform open source file manager with two panels side by side. It is inspired by Total Commander and features new ideas."

01-main/packages/nala

@@ -1,8 +1,8 @@
-DEFVER=1
+DEFVER=2
 ARCHS_SUPPORTED="amd64 arm64 armhf"
 CODENAMES_SUPPORTED="bookworm sid jammy lunar mantic noble"
-GPG_KEY_URL="https://deb.volian.org/volian/scar.key"
-APT_REPO_URL="http://deb.volian.org/volian/ scar main"
+GPG_KEY_URL="https://deb.volian.org/volian/nala.key"
+APT_REPO_URL="http://deb.volian.org/volian/ nala main"
 APT_REPO_OPTIONS="arch=${HOST_ARCH}"
 PRETTY_NAME="Nala"
 WEBSITE="https://gitlab.com/volian/nala"