Drop stretch

config/config

@@ -10,7 +10,7 @@ REPO_URL="forge.yunohost.org"
 
 # Codenames, components and architectures
 
-AVAILABLE_CODENAMES="stretch buster bullseye"
+AVAILABLE_CODENAMES="buster bullseye"
 AVAILABLE_COMPONENTS="stable testing unstable extra"
 AVAILABLE_ARCH="amd64 i386 armel armhf arm64"
 

config/distributions

@@ -1,17 +1,3 @@
-Origin: YunoHost
-Label: YunoHost for Stretch
-Suite: stable
-Codename: stretch
-Version: 9.0
-Architectures: i386 amd64 armel armhf arm64 source
-Components: stable testing unstable extra
-AlsoAcceptFor: stretch-stable stretch-testing stretch-unstable stable testing unstable
-Description: YunoHost repository for Debian Stretch
-SignWith: 59A3E6FF
-Tracking: all includechanges keepsources
-Log: logfile
- --changes --via=include /home/vinaigrette/scripts/repo/process-include
-
 Origin: YunoHost
 Label: YunoHost for Buster
 Suite: stable

config/pbuilder/pbuilder.conf

@@ -6,7 +6,7 @@
 # read pbuilderrc.5 document for notes on specific options.
 
 # default distribution
-DISTRIBUTION="stretch"
+DISTRIBUTION="buster"
 
 # default location for the user hooks directory
 HOOKDIR="/home/vinaigrette/scripts/pbuilder/hooks/"

config/rebuildd.conf

@@ -6,7 +6,7 @@ kill_timeout = 90
 source_cmd = /home/vinaigrette/scripts/rebuildd/get-sources ${d} ${p} ${v}
 build_cmd = /home/vinaigrette/scripts/rebuildd/build-binaries ${d} ${p} ${v} ${a}
 post_build_cmd = /home/vinaigrette/scripts/rebuildd/upload-binaries ${d} ${p} ${v} ${a} ${j}
-dists = stretch buster bullseye
+dists = buster bullseye
 work_dir = /var/cache/rebuildd/build
 database_uri = sqlite:///var/lib/rebuildd/rebuildd.db
 build_more_recent = 1

config/rebuildd.default

@@ -4,5 +4,5 @@ PBUILDER_BIN=/usr/sbin/pbuilder
 PBUILDER_CACHE_PATH="/var/cache/pbuilder"
 PBUILDER_MIRROR=https://ftp.debian.org/debian
 ARCHS="amd64 i386 armel armhf arm64"
-DISTS="stretch buster bullseye"
+DISTS="buster bullseye"
 ENABLE_BUILDER_MAINT=1

init.sh

@@ -28,10 +28,6 @@ git clone https://github.com/yunohost/metronome
 git clone https://github.com/YunoHost/rspamd
 git clone https://git.donarmstrong.com/unscd.git
 
-cd yunohost
-git checkout stretch  && git symbolic-ref refs/heads/stretch-unstable refs/heads/stretch
-cd ..
-
 mkdir -p /var/www/repo/debian/conf/
 ln -s $VINAIGRETTE_HOME/config/distributions /var/www/repo/debian/conf/distributions
 

scripts/build_deb

@@ -26,7 +26,7 @@ Usage:
   $THISSCRIPT <distrib> <branch> <folder>
 
 Arguments:
-  <distrib>     stretch or buster or bullseye
+  <distrib>     buster or bullseye
   <branch>      stable, testing, or unstable
   <folder>      the folder in which to build...
 EOF
@@ -50,7 +50,7 @@ function main()
 
 function validate_arguments()
 {
-    [[ $DISTRIB =~ ^stretch|buster|bullseye$ ]] || critical "Invalid distribution $DISTRIB"
+    [[ $DISTRIB =~ ^buster|bullseye$ ]] || critical "Invalid distribution $DISTRIB"
     [[ $BRANCH =~ ^testing|stable|unstable$ ]] || critical "Invalid branch $BRANCH"
     [[ ! -z "$FOLDER" ]] || critical "Need a folder in which to build"
 }

scripts/ynh-custom-builds

@@ -5,7 +5,6 @@ readonly PACKAGE=$1
 readonly BRANCH=$2
 readonly DISTRIB="bullseye"
 #readonly DISTRIB="buster"
-#readonly DISTRIB="stretch"
 readonly DISTRIB_N="11"
 
 source /home/vinaigrette/config/config
@@ -43,8 +42,7 @@ function main()
 
 function validate_arguments()
 {
-    [[ $PACKAGE =~ ^metronome|miniupnpc|gevent-websocket|python-zeroconf$ ]] || critical "Invalid package $PACKAGE"
+    [[ $PACKAGE =~ ^metronome|miniupnpc|gevent-websocket|python-zeroconf|lexicon$ ]] || critical "Invalid package $PACKAGE"
-    #[[ $PACKAGE =~ ^metronome|rspamd|unscd|python-toml$ ]] || critical "Invalid package $PACKAGE" # (These are the old stuff for which we had custom builds in stretch)
     [[ $BRANCH =~ ^testing|stable|unstable$ ]] || critical "Invalid branch $BRANCH"
     [[ "$(tty)" != "not a tty" ]] || critical "You aint in a tty (are you in a 'lxc exec' ?) The script can't run because pbuilder won't be happy :|"
 }
@@ -58,6 +56,11 @@ function tweak_python-zeroconf()
     readonly VERSION="$(dpkg-parsechangelog -S Version 2>/dev/null)+ynh$DISTRIB_N"
 }
 
+function tweak_lexicon()
+{
+    readonly VERSION="$(dpkg-parsechangelog -S Version 2>/dev/null)+ynh$DISTRIB_N-1"
+}
+
 function tweak_miniupnpc()
 {
     readonly VERSION="$(dpkg-parsechangelog -S Version 2>/dev/null)+ynh$DISTRIB_N"
@@ -70,25 +73,9 @@ function tweak_gevent-websocket()
 
 function tweak_metronome()
 {
-    readonly VERSION="$(dpkg-parsechangelog -S Version 2>/dev/null)+ynh$DISTRIB_N"
+    readonly VERSION="$(dpkg-parsechangelog -S Version 2>/dev/null)+ynh$DISTRIB_N-1"
 }
 
-# (These are the old stuff for which we had custom builds in stretch)
-#function tweak_unscd()
-#{
-#    readonly VERSION="$(dpkg-parsechangelog -S Version 2>/dev/null)+yunohost"
-#}
-#
-#function tweak_rspamd()
-#{
-#    readonly VERSION="$(dpkg-parsechangelog -S Version 2>/dev/null)+yunohost"
-#}
-#
-#function tweak_python-toml()
-#{
-#    readonly VERSION="$(dpkg-parsechangelog -S Version 2>/dev/null)+yunohost"
-#}
-
 function build()
 {
     # SVERSION is VERSION without the -1 at the end ...