Discontinue jessie, support buster

7 files changed, 16 insertions, 38 deletions

diff --git a/README b/README
index 9f4a759..dcd0450 100644
--- a/README
+++ b/README
@@ -9,8 +9,8 @@ Currently I am using the following setup:
   APTCACHEHARDLINK=yes
   DISTRIBUTION="$DIST"
   DEBOOTSTRAPOPTS=("--arch" "$ARCH" 
-    "--keyring=/usr/share/keyrings/debian-archive-keyring.gpg"
     "${DEBOOTSTRAPOPTS[@]}")
+  APTKEYRINGS="/home/jranke/.gnupg/pubring.gpg"
   BASETGZ="`dirname $BASETGZ`/$NAME-base.tgz"
   BUILDRESULT="/var/cache/pbuilder/$NAME/result/"
   APTCACHE="/var/cache/pbuilder/$NAME/aptcache/"
@@ -22,31 +22,18 @@ This means I have the appropriate aptcache and buildresult directories set up
 under /var/cache/pbuilder. I have several pbuilder images used for package
 creation under /var/cache/pbuilder, among others:
 
-  /var/cache/pbuilder/jessie-i386-base.tgz
+  /var/cache/pbuilder/buster-i386-base.tgz
 
 With the pbuilderrc mentioned above, this can be created as a normal user with
 
   export ARCH=i386
-  export DIST=jessie
+  export DIST=buster
   sudo -E pbuilder create
 
-Then, using
-
-  sudo -E pbuilder login --save-after-login
-
-these have a standard Debian mirror, the security sources setup in their
-/etc/apt/sources.list, as well as my local http package source where the r-base
-package build results are available. I have also imported the apt key of my
-repository inside the pbuilder chroots.
-
-For some reason, the keyring option to debootstrap is not used (necessary on
-Ubuntu) so I needed to pass this on the commandline when building the pbuilder
-chroot for wheezy-i386.
-
 When using these scripts on Debian, I used to configure sudo to allow my normal
 user to use pbuilder, apt-get and the backporting scripts. Currently, I have 
-set up my jessie installation using the Ubuntu like sudo configuration that
-I selected during the original installation of wheezy.
+set up my Debian installations using the Ubuntu like sudo configuration that
+I select during the installation.
 
 I am building other architectures on different machines (raspi: armxx) or in a
 local chroot (amd64).
diff --git a/backport b/backport
index 2f4d93d..4a0e023 100755
--- a/backport
+++ b/backport
@@ -26,7 +26,7 @@ rcrandir=/home/jranke/git/uni/website/www/ranke/r-cran
 
 usage()
 {
-echo "Usage: ./backport [options] sourcepackage stretch|jessie"
+echo "Usage: ./backport [options] sourcepackage stretch|buster"
 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"
@@ -62,7 +62,7 @@ pkg=$1
 DIST=$2
 
 # Validate distribution argument
-if [ $DIST != "stretch" ] && [ $DIST != "jessie" ]; then usage; exit 1; fi
+if [ $DIST != "stretch" ] && [ $DIST != "buster" ]; then usage; exit 1; fi
 export DIST
 
 # Remove previously extracted sources
diff --git a/backport_others b/backport_others
index d391c8f..dab6139 100755
--- a/backport_others
+++ b/backport_others
@@ -11,7 +11,7 @@ export ARCH
 
 usage()
 {
-echo "Usage: ./backport_others [options] stretch|jessie"
+echo "Usage: ./backport_others [options] stretch|buster"
 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 != "jessie" ]; then usage; exit 1; fi
+if [ $DIST != "stretch" ] && [ $DIST != "buster" ]; then usage; exit 1; fi
 export DIST
 
 # When doing a new repository, do lattice, r-cran-mass
diff --git a/build b/build
index 800c86a..1e84502 100755
--- a/build
+++ b/build
@@ -54,17 +54,9 @@ then
   apt-get upgrade
 fi
 
-# stretch needs --only-source (at least for rkward source packages), jessie
-# does not know this argument
-if [ $DIST == "jessie" ]; then
-  apt-get build-dep $pkg
-  apt-get source $pkg
-fi
-if [ $DIST == "stretch" ]; then
-  apt --only-source build-dep $pkg
-  apt --only-source source $pkg
-fi
-
+# stretch needs --only-source (at least for rkward source packages)
+apt --only-source build-dep $pkg
+apt --only-source source $pkg
 
 # Move sources to $DIST directory to enable parallel builds
 mkdir -p $DIST
diff --git a/build_others b/build_others
index 285ed0f..658bd6a 100755
--- a/build_others
+++ b/build_others
@@ -35,7 +35,6 @@ then
   apt-get upgrade
 fi
 
-# wheezy/jessie/stretch
 #for i in  lattice r-cran-mass; do
 #for i in  rmatrix nlme; do
 #for i in  survival; do
diff --git a/clean b/clean
index 741202b..b23428c 100755
--- a/clean
+++ b/clean
@@ -4,14 +4,14 @@
 
 usage()
 {
-echo "Usage: ./clean [stretch|jessie]"
+echo "Usage: ./clean [stretch|buster]"
 }
 
 if [ $# -gt 1 ]; then usage; exit 1; fi
 if [ $# -eq 1 ]
 then
   DIST=$1
-  if [ $DIST != "stretch" ] && [ $DIST != "jessie" ]; then usage; exit 1; fi
+  if [ $DIST != "stretch" ] && [ $DIST != "buster" ]; then usage; exit 1; fi
   cd $DIST
 fi
 
diff --git a/move_debs b/move_debs
index 603f675..ad91384 100755
--- a/move_debs
+++ b/move_debs
@@ -4,7 +4,7 @@
 
 usage()
 {
-echo "Usage: ./move_debs stretch|jessie"
+echo "Usage: ./move_debs stretch|buster"
 }
 
 # Positional argument
@@ -12,7 +12,7 @@ if [ $# -lt 1 ]; then usage; exit 1; fi
 DIST=$1
 
 # Validate distribution argument
-if [ $DIST != "stretch" ] && [ $DIST != "jessie" ]; then usage; exit 1; fi
+if [ $DIST != "stretch" ] && [ $DIST != "buster" ]; 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/website/www/ranke/r-cran/$DIST-cran35