Changes for 4.2.3, start bookworm

6 files changed, 21 insertions, 12 deletions

diff --git a/README b/README
index 58e26af..a069236 100644
--- a/README
+++ b/README
@@ -15,7 +15,7 @@ Currently I am using the following setup:
   BUILDRESULT="/var/cache/pbuilder/$NAME/result/"
   APTCACHE="/var/cache/pbuilder/$NAME/aptcache/"
   MIRRORSITE="http://ftp.de.debian.org/debian/"
-  OTHERMIRROR="deb http://security.debian.org $DIST/updates main|deb http://ftp.de.debian.org/debian $DIST-backports main|deb http://localhost/r-cran $DIST-cran35/"
+  OTHERMIRROR="deb http://security.debian.org $DIST/updates main|deb http://ftp.de.debian.org/debian $DIST-backports main|deb http://localhost/r-cran $DIST-cran40/"
   COMPONENTS="main"
 
 This means I have the appropriate aptcache and buildresult directories set up
@@ -56,11 +56,20 @@ Then I add a new entry in /etc/schroot/schroot.conf like
   profile=default
   directory=/var/chroot/bullseye-amd64
 
-and use sudo schroot -c bullseye64 to enter it. Within the chroot I install vim
-and add the matching local r-cran repository to /etc/apt/sources.list like
+and use sudo schroot -c bullseye64 to enter it. Within the chroot I install
+some necessary or useful stuff
+
+  apt install vim gnupg build-essential devscripts
+
+add the matching local r-cran repository to /etc/apt/sources.list like
 
   deb http://localhost/r-cran bullseye-cran40/
   deb-src http://localhost/r-cran bullseye-cran40/
 
+and tell apt to trust my key (from my Debian CRAN page):
+
+  gpg --keyserver keyserver.ubuntu.com --recv-key '95C0FAF38DB3CCAD0C080A7BDC78B2DDEABC47B7'
+  gpg --armor --export '95C0FAF38DB3CCAD0C080A7BDC78B2DDEABC47B7' > /etc/apt/trusted.gpg.d/cran_debian_key.asc
+
 In the chroot, build-essential and devscripts have to be installed
 
diff --git a/backport b/backport
index 258dd6e..ed2f96c 100755
--- a/backport
+++ b/backport
@@ -22,7 +22,7 @@ rcrandir=/home/jranke/git/uni-bremen/website/www/ranke/r-cran
 
 usage()
 {
-echo "Usage: ./backport [options] sourcepackage stretch|buster|bullseye"
+echo "Usage: ./backport [options] sourcepackage buster|bullseye|bookworm"
 echo "Options:"
 echo " -k, --keep    Keep copied source package and directory used for package building"
 echo " -s, --skip    Skip apt-get update/upgrade and pbuilder update"
@@ -58,7 +58,7 @@ pkg=$1
 DIST=$2
 
 # Validate distribution argument
-if [ $DIST != "stretch" ] && [ $DIST != "buster" ] && [ $DIST != "bullseye" ]; then usage; exit 1; fi
+if [ $DIST != "bookworm" ] && [ $DIST != "buster" ] && [ $DIST != "bullseye" ]; then usage; exit 1; fi
 export DIST
 
 # Remove previously extracted sources
diff --git a/backport_others b/backport_others
index dacac7a..921ccf6 100755
--- a/backport_others
+++ b/backport_others
@@ -11,7 +11,7 @@ export ARCH
 
 usage()
 {
-echo "Usage: ./backport_others [options] stretch|buster|bullseye"
+echo "Usage: ./backport_others [options] buster|bullseye|bookworm"
 echo "Options:"
 echo " -s     Skip apt-get update/upgrade and pbuilder update"
 }
@@ -51,7 +51,7 @@ then
 fi
 
 # Validate distribution argument
-if [ $DIST != "stretch" ] && [ $DIST != "buster" ] && [ $DIST != "bullseye" ]; then usage; exit 1; fi
+if [ $DIST != "bookworm" ] && [ $DIST != "buster" ] && [ $DIST != "bullseye" ]; then usage; exit 1; fi
 export DIST
 
 # When doing a new repository, do lattice, r-cran-mass
diff --git a/build b/build
index 439eabb..95b2b84 100755
--- a/build
+++ b/build
@@ -54,7 +54,7 @@ then
   apt-get upgrade
 fi
 
-# stretch needs --only-source (at least for rkward source packages)
+# stretch needed --only-source (at least for rkward source packages)
 apt --only-source build-dep $pkg
 apt --only-source source $pkg
 
diff --git a/clean b/clean
index a2d5acb..ba43d85 100755
--- a/clean
+++ b/clean
@@ -4,14 +4,14 @@
 
 usage()
 {
-echo "Usage: ./clean [stretch|buster|bullseye]"
+echo "Usage: ./clean [buster|bullseye|bookworm]"
 }
 
 if [ $# -gt 1 ]; then usage; exit 1; fi
 if [ $# -eq 1 ]
 then
   DIST=$1
-  if [ $DIST != "stretch" ] && [ $DIST != "buster" ] && [ $DIST != "bullseye" ]; then usage; exit 1; fi
+  if [ $DIST != "bookworm" ] && [ $DIST != "buster" ] && [ $DIST != "bullseye" ]; then usage; exit 1; fi
   cd $DIST
 fi
 
diff --git a/move_debs b/move_debs
index 4dba960..17e9a50 100755
--- a/move_debs
+++ b/move_debs
@@ -4,7 +4,7 @@
 
 usage()
 {
-echo "Usage: ./move_debs stretch|buster|bullseye"
+echo "Usage: ./move_debs buster|bullseye|bookworm"
 }
 
 # Positional argument
@@ -12,7 +12,7 @@ if [ $# -lt 1 ]; then usage; exit 1; fi
 DIST=$1
 
 # Validate distribution argument
-if [ $DIST != "stretch" ] && [ $DIST != "buster" ] && [ $DIST != "bullseye" ]; then usage; exit 1; fi
+if [ $DIST != "bookworm" ] && [ $DIST != "buster" ] && [ $DIST != "bullseye" ]; then usage; exit 1; fi
 
 sudo chown jranke $DIST/*${DIST}cran*_amd64.{deb,build}
 mv -v $DIST/*${DIST}cran*_amd64.{deb,build} /home/jranke/git/uni-bremen/website/www/ranke/r-cran/$DIST-cran40