From 85b90ee2668f4ac91081c62894476019d1ec2bfd Mon Sep 17 00:00:00 2001
From: Marcus Hoffmann <bubu@bubu1.eu>
Date: Tue, 27 Nov 2018 00:40:42 +0100
Subject: [PATCH 1/4] provision-apt: add DEBIAN_FRONTEND=noninteractive

This should fix #591 and related issues.
---
 buildserver/provision-apt-get-install | 1 +
 1 file changed, 1 insertion(+)

diff --git a/buildserver/provision-apt-get-install b/buildserver/provision-apt-get-install
index 0b02d4c5..b3e8fd7c 100644
--- a/buildserver/provision-apt-get-install
+++ b/buildserver/provision-apt-get-install
@@ -5,6 +5,7 @@ set -e
 set -x
 
 debian_mirror=$1
+export DEBIAN_FRONTEND=noninteractive 
 
 printf 'APT::Install-Recommends "0";\nAPT::Install-Suggests "0";\n' \
        > /etc/apt/apt.conf.d/99no-install-recommends

From 3c1a5873ab233ce127c8a63878d68c505c102ced Mon Sep 17 00:00:00 2001
From: Marcus Hoffmann <bubu@bubu1.eu>
Date: Tue, 27 Nov 2018 00:41:43 +0100
Subject: [PATCH 2/4] provision-apt: don't use automake/libtool from testing

This was set up when running jessie and shouldn;t be requried for now.
---
 buildserver/provision-apt-get-install | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/buildserver/provision-apt-get-install b/buildserver/provision-apt-get-install
index b3e8fd7c..4239b2eb 100644
--- a/buildserver/provision-apt-get-install
+++ b/buildserver/provision-apt-get-install
@@ -42,7 +42,7 @@ packages="
  ant-contrib
  autoconf
  autoconf2.13
- automake/testing
+ automake
  automake1.11
  autopoint
  bison
@@ -73,8 +73,8 @@ packages="
  libsaxonb-java
  libssl-dev
  libstdc++6:i386
- libtool/testing
- libtool-bin/testing
+ libtool
+ libtool-bin
  make
  maven
  mercurial

From 90a1703ccc6538f8d4cb02974b500c9304eeaecd Mon Sep 17 00:00:00 2001
From: Marcus Hoffmann <bubu@bubu1.eu>
Date: Tue, 27 Nov 2018 01:00:58 +0100
Subject: [PATCH 3/4] makebuildserver: remove packages that should be installed
 per app

Or these are otherwise old cruft
---
 buildserver/provision-apt-get-install | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/buildserver/provision-apt-get-install b/buildserver/provision-apt-get-install
index 4239b2eb..a5ef58d8 100644
--- a/buildserver/provision-apt-get-install
+++ b/buildserver/provision-apt-get-install
@@ -58,15 +58,11 @@ packages="
  git-core
  git-svn
  gperf
- graphviz
- imagemagick
- inkscape
  javacc
  libarchive-zip-perl
  libexpat1-dev
  libgcc1:i386
  libglib2.0-dev
- liblwp-protocol-https-perl
  liblzma-dev
  libncurses5:i386
  librsvg2-bin
@@ -79,13 +75,10 @@ packages="
  maven
  mercurial
  nasm
- nodejs
  openjdk-8-jre-headless
  openjdk-8-jdk-headless
  optipng
  p7zip
- pandoc
- perlmagick
  pkg-config
  python-gnupg
  python-lxml
@@ -105,16 +98,12 @@ packages="
  python3-yaml
  python3-ruamel.yaml
  quilt
- realpath
  rsync
  scons
  sqlite3
  subversion
  swig
- texinfo
- transfig
  unzip
- vorbis-tools
  xsltproc
  yasm
  zip

From e3a25ad3f2368c7d89ba8c69ba72b8223377d07d Mon Sep 17 00:00:00 2001
From: Marcus Hoffmann <bubu@bubu1.eu>
Date: Tue, 27 Nov 2018 04:03:33 +0100
Subject: [PATCH 4/4] buildserver: remove provision-pip

This was installing one python(2!) module. pip is installed in
provision-apt-get-install now.
---
 buildserver/Vagrantfile   |  2 --
 buildserver/provision-pip | 14 --------------
 2 files changed, 16 deletions(-)
 delete mode 100644 buildserver/provision-pip

diff --git a/buildserver/Vagrantfile b/buildserver/Vagrantfile
index 8418d53b..013b5382 100644
--- a/buildserver/Vagrantfile
+++ b/buildserver/Vagrantfile
@@ -80,8 +80,6 @@ Vagrant.configure("2") do |config|
   config.vm.provision "shell", path: "provision-android-sdk"
   config.vm.provision "shell", path: "provision-android-ndk",
     args: ["/home/vagrant/android-ndk"]
-  config.vm.provision "shell", path: "provision-pip",
-    args: ["compare-locales"]
   config.vm.provision "shell", path: "provision-gradle"
 
 end
diff --git a/buildserver/provision-pip b/buildserver/provision-pip
deleted file mode 100644
index b0984dec..00000000
--- a/buildserver/provision-pip
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-echo $0
-set -e
-set -x
-
-# cache pypi downloads
-if [ -z $PIP_DOWNLOAD_CACHE ]; then
-    export PIP_DOWNLOAD_CACHE=$HOME/.pip_download_cache
-fi
-
-apt-get install --yes --no-install-recommends python-pip
-
-pip install --upgrade $@