Merge branch 'fix-build-and-vlc' into 'master'

fix CI, makebuildserver, and VLC build

See merge request !204

.gitlab-ci.yml

@@ -3,6 +3,8 @@ image: fdroid/ci:server-20161223
 test:
   script:
     - mkdir -p /usr/lib/python3.4/site-packages/
+    # workaround https://github.com/pypa/setuptools/issues/937
+    - pip3 install setuptools==33.1.1
     - pip3 install -e .
     - cd tests
     - ./complete-ci-tests

buildserver/provision-apt-get-install

@@ -32,12 +32,13 @@ packages="
  ant-contrib
  autoconf
  autoconf2.13
- automake
+ automake/testing
  automake1.11
  autopoint
  bison
  bzr
- cmake
+ ca-certificates-java/jessie-backports
+ cmake/jessie-backports
  curl
  expect
  faketime
@@ -68,6 +69,7 @@ packages="
  mercurial
  nasm
  nodejs
+ openjdk-8-jre-headless
  openjdk-8-jdk-headless
  optipng
  p7zip

jenkins-build-makebuildserver

@@ -71,3 +71,5 @@ echo "build_server_always = True" > config.py
 ../fdroid build --verbose --stop info.guardianproject.checkey:101
 # building old versions should still work
 ../fdroid build --verbose --stop org.fdroid.fdroid:96150
+# VLC is important, and uses cmake
+../fdroid build --verbose --stop org.videolan.vlc:12000604

tests/complete-ci-tests

@@ -56,6 +56,8 @@ python3 setup.py sdist
 rm -rf $WORKSPACE/env
 pyvenv $WORKSPACE/env
 . $WORKSPACE/env/bin/activate
+# workaround https://github.com/pypa/setuptools/issues/937
+pip3 install setuptools==33.1.1
 pip3 install dist/fdroidserver-*.tar.gz
 
 # run tests in new pip+pyvenv install
@@ -68,6 +70,8 @@ cd $WORKSPACE
 rm -rf $WORKSPACE/env
 pyvenv $WORKSPACE/env
 . $WORKSPACE/env/bin/activate
+# workaround https://github.com/pypa/setuptools/issues/937
+pip3 install setuptools==33.1.1
 pip3 install -e $WORKSPACE
 python3 setup.py install