From 7c17f64517ab750e6c16631eba14bdd42b2d8a93 Mon Sep 17 00:00:00 2001
From: Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>
Date: Fri, 2 Sep 2022 09:33:54 +0000
Subject: [PATCH] CI: target bookworm for "future" job

Bookworm will be the basis for the next PureOS.
Plus, there was some persistent network error when running sid jobs.
---
 .gitlab-ci.yml   | 2 +-
 Cargo.deps.newer | 2 +-
 debian/rules     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f3767469..618d13fb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -76,7 +76,7 @@ build_deb:arm64:
     - cp ../*.deb .
 
 build_deb:future:
-  image: debian:sid
+  image: debian:bookworm
   allow_failure: true
   tags:
     - aarch64
diff --git a/Cargo.deps.newer b/Cargo.deps.newer
index 5c0750f7..914cc6aa 100644
--- a/Cargo.deps.newer
+++ b/Cargo.deps.newer
@@ -1,7 +1,7 @@
 # Dependencies which change based on build flags
 # For the newer-than-Byzantium config
 bitflags = "1.3.*"
-clap = { version = "3.1.*", features=["std"], default-features = false }
+clap = { version = "3.2.*", features=["std"], default-features = false }
 zbus = "1.9.*"
 zvariant = "2.10.*"
 # Newer versions seem to confuse the version of Cargo on Debian Bullseye
diff --git a/debian/rules b/debian/rules
index c9ca998c..625a2dc4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,7 +25,7 @@ export RUSTFLAGS = --remap-path-prefix=$(CURDIR)=/remap-pwd $(xgot)
 
 
 distrel := $(shell lsb_release --codename --short)
-ifneq (,$(filter $(distrel),sid))
+ifneq (,$(filter $(distrel),bookworm))
 	newer = true
 else
 	newer = false