Merge branch 'OpenCPN:master' into master

.circleci/config.yml

@@ -1,6 +1,24 @@
 ---
+# Buildpack images found at: https://hub.docker.com/_/buildpack-deps/
+
 version: 2
 jobs:
+  build-bookworm:
+    docker:
+      - image: leamas/debian-git:bookworm
+      # bookworm-scm fails on non-existing /etc/apt/sources.list
+      # - image: buildpack-deps:bookworm-scm
+        auth:
+          username: $DOCKER_USER
+          password: $DOCKER_PW
+    environment:
+      - OCPN_TARGET: bookworm
+    steps:
+      - checkout
+      - run: cat /etc/apt/sources.list
+      - run: ci/generic-build-debian.sh
+      - run: ci/generic-upload.sh
+
   build-bionic:
     docker:
       - image: circleci/buildpack-deps:bionic-scm
@@ -14,20 +32,24 @@ jobs:
       - run: cat /etc/apt/sources.list
       - run: ci/generic-build-debian.sh
       - run: ci/generic-upload.sh
-  build-focal:
+
+  build-jammy:
     docker:
-      - image: circleci/buildpack-deps:focal-scm
+      - image: leamas/ubuntu-git:jammy
+      # jammy-scm fails on missing sudo
+      # - image: buildpack-deps:jammy-scm
         auth:
           username: $DOCKER_USER
           password: $DOCKER_PW
     environment:
-      - OCPN_TARGET: focal-gtk3
+      - OCPN_TARGET: jammy
       - CMAKE_BUILD_PARALLEL_LEVEL: 2
     steps:
       - checkout
       - run: cat /etc/apt/sources.list
       - run: ci/generic-build-debian.sh
       - run: ci/generic-upload.sh
+
   build-flatpak:
     working_directory: ~/OpenCPN
     machine:
@@ -126,38 +148,36 @@ jobs:
            - /usr/local/lib
       - run: ci/generic-upload.sh
 
+std-filters: &std-filters
+  filters:
+    branches:
+     only:
+        - master
+        - build
+        - flatpak
+
+
 workflows:
   version: 2
   build_all:
     jobs:
+      - build-bookworm:
+          <<: *std-filters
+
       - build-bionic:
-          filters:
-            branches:
-              only:
-                - master
-      - build-focal:
-          filters:
-            branches:
-              only:
-                - master
+          <<: *std-filters
+
+      - build-jammy:
+          <<: *std-filters
+
       - build-flatpak:
-          filters:
-            branches:
-              only:
-                - flatpak
-                - master
+          <<: *std-filters
+
       - build-android-armhf:
-          filters:
-            branches:
-              only:
-                - master
+          <<: *std-filters
+
       - build-macos-universal:
-          filters:
-            branches:
-              only:
-                - master
+          <<: *std-filters
+
       - build-macos-intel-legacy:
-          filters:
-            branches:
-              only:
-                - master
+          <<: *std-filters