diff options
| -rwxr-xr-x | bin/chroot-installation.sh | 4 | ||||
| -rwxr-xr-x | job-cfg/chroot-installation.yaml.py | 14 |
2 files changed, 13 insertions, 5 deletions
diff --git a/bin/chroot-installation.sh b/bin/chroot-installation.sh index 17acdc17..d05cc493 100755 --- a/bin/chroot-installation.sh +++ b/bin/chroot-installation.sh @@ -167,6 +167,10 @@ if [ "$2" != "" ] ; then ;; lxde) install_packages lxde lxde desktop-base ;; + qt4) install_packages qt4 qt4-x11 qtwebkit + ;; + qt5) install_packages qt5 qtbase-opensource-src qtchooser qtimageformats-opensource-src qtx11extras-opensource-src qtscript-opensource-src qtxmlpatterns-opensource-src qtdeclarative-opensource-src qtconnectivity-opensource-src qtsensors-opensource-src qt3d-opensource-src qtlocation-opensource-src qtwebkit-opensource-src qtquick1-opensource-src qtwebkit-examples-opensource-src qttools-opensource-src qtdoc-opensource-src qtgraphicaleffects-opensource-src qtquickcontrols-opensource-src qtserialport-opensource-src qtsvg-opensource-src qtmultimedia-opensource-src qtenginio-opensource-src qtwebsockets-opensource-src qttranslations-opensource-src qtcreator + ;; full_desktop) install_packages full_desktop $FULL_DESKTOP ;; haskell) install_packages haskell 'haskell-platform.*' 'libghc-.*' diff --git a/job-cfg/chroot-installation.yaml.py b/job-cfg/chroot-installation.yaml.py index 95916448..a6519dda 100755 --- a/job-cfg/chroot-installation.yaml.py +++ b/job-cfg/chroot-installation.yaml.py @@ -29,6 +29,8 @@ targets = """ lxde xfce full_desktop + qt4 + qt5 haskell developer education-tasks @@ -69,11 +71,11 @@ targets = """ def get_targets_in_distro(distro, targets): targets_in_distro = [] for target in targets: - # haskell, cinnamon and edu tests not in squeeze - if distro == 'squeeze' and ( target == 'haskell' or target[:10] == 'education-' or target == 'cinnamon' ): + # haskell, cinnamon, qt5 and edu tests not in squeeze + if distro == 'squeeze' and ( target == 'haskell' or target[:10] == 'education-' or target == 'cinnamon' or target == 'qt5' ): continue - # education-desktop-mate and cinnamon weren't in wheezy - if distro == 'wheezy' and ( target == 'education-desktop-mate' or target == 'cinnamon' ): + # qt5, education-desktop-mate and cinnamon weren't in wheezy + if distro == 'wheezy' and ( target == 'education-desktop-mate' or target == 'cinnamon' or target == 'qt5' ): continue targets_in_distro.append(target) return targets_in_distro @@ -88,7 +90,7 @@ def get_recipients(target): return 'jenkins+debian-haskell holger@layer-acht.org pkg-haskell-maintainers@lists.alioth.debian.org' elif target == 'cinnamon': return 'jenkins+debian-cinnamon pkg-cinnamon-team@lists.alioth.debian.org holger@layer-acht.org' - elif target[:3] == 'kde': + elif target[:3] == 'kde' or target[:2] == 'qt': return 'jenkins+debian-qa debian-qt-kde@lists.debian.org holger@layer-acht.org' elif target[:10] == 'education-': return 'jenkins+debian-edu debian-edu-commits@lists.alioth.debian.org' @@ -121,6 +123,8 @@ spoken_names = { 'gnome': 'GNOME', 'cinnamon': 'Cinnamon', 'lxde': 'LXDE', 'xfce': 'Xfce', + 'qt4': 'Qt4 cross-platform C++ application framework', + 'qt5': 'Qt5 cross-platform C++ application framework', 'full_desktop': 'four desktop environments and the most commonly used applications and packages', 'haskell': 'all Haskell related packages', 'developer': 'four desktop environments and the most commonly used applications and packages - and the build depends for all of these' } |