distros updated

scripts/bootstrap-to-docker.sh

@@ -39,22 +39,16 @@ fi
 excludes="precise-armhf stretch-armhf"
 no_universe="jessie sid wheezy"
 
-ubuntu_qt5="yakkety xenial wily vivid trusty"
-ubuntu_qt4="precise"
-debian_qt5="stretch jessie sid"
-debian_qt4="wheezy"
+ubuntu="zesty yakkety xenial trusty"
+debian="stretch jessie sid"
 # not yet successfully installable: ubuntu zesty, debian buster
 
-ubuntu=("${ubuntu_qt5}" "${ubuntu_qt4}")
-debian=("${debian_qt5}" "${debian_qt4}")
 distros=(${distros:-"${ubuntu[@]}" "${debian[@]}"})
 
 packages_qt5="libpoppler-qt5-dev libpodofo-dev libqt5designer5 libqt5svg5-dev libqt5webkit5-dev qt5-default qt5-qmake qtbase5-dev qtbase5-dev-tools qttools5-dev qttools5-dev-tools"
-packages_qt4="libqt4-core libqt4-designer libqt4-dev libqt4-webkit qt4-dev-tools qt4-qmake"
-# |libqtcore4 |libqtwebkit-dev |libp11-kit-dev|libgnutls-dev
 packages_base="apt-transport-https automake autotools-dev binutils-dev debhelper default-jdk-headless doxygen dpkg-dev g++ git graphviz libboost-thread-dev libcppunit-dev liblog4cxx-dev libpcsclite-dev libpkcs11-helper1-dev libproxy-dev libssl-dev libtool libz-dev lsb-release mscgen nodejs pandoc pkg-config software-properties-common subversion subversion-tools xvfb texinfo"
 package_not_in_stretch="libssl-dev"
-package_not_in_zesty="texinfo"
+package_not_in_zesty="texinfo libcppunit-dev liblog4cxx-dev mscgen nodejs pandoc xvfb libpodofo-dev libqt5designer5 qt5-default qttools5-dev-tools qttools5-dev"
 #package_not_in_yakkety="default-jdk-headless"
 package_not_in_wily="default-jdk-headless"
 package_not_in_vivid="default-jdk-headless liblog4cxx-dev"
@@ -63,14 +57,8 @@ package_not_in_jessie="default-jdk-headless liblog4cxx-dev"
 package_not_in_precise="default-jdk-headless liblog4cxx-dev"
 package_not_in_wheezy="default-jdk-headless liblog4cxx-dev nodejs"
 
-if test -z "${packages[@]}"; then
-    packages=("${packages_base} ${packages_qt5}" "${packages_base} ${packages_qt4}" "${packages_base} ${packages_qt5}" "${packages_base} ${packages_qt4}")
-fi
-if test -z "${index}" -a "${#distros[@]}" -ne "${#packages[@]}"; then
-    echo "**** ERROR: number of distribution lists doesn't match package lists" 1>&2
-    echo "            distribution lists: ${#distros[@]}" 1>&2
-    echo "            package lists:      ${#packages[@]}" 1>&2
-    exit 1
+if test -z "${packages}"; then
+    packages="${packages_base} ${packages_qt5}"
 fi
 
 fastmode=0;
@@ -100,10 +88,9 @@ error() {
 }
 
 for ((i=0; i<${#distros[@]}; ++i)); do
-    package="${packages[${index:-$i}]}"
     for distro in ${distros[$i]}; do
         prevent=package_not_in_${distro};
-        instpkgs=${package}
+        instpkgs=${packages}
         for pkg in ${!prevent}; do
             instpkgs=${instpkgs//${pkg}/}
         done