diff options
-rw-r--r-- | core/modules/beamergui/module.conf.ubuntu | 7 | ||||
-rw-r--r-- | core/modules/printergui/module.conf.ubuntu | 2 | ||||
-rw-r--r-- | core/modules/pvs2/module.conf | 1 | ||||
-rw-r--r-- | core/modules/pvs2/module.conf.ubuntu | 6 | ||||
-rw-r--r-- | core/modules/pvs2/module.conf.ubuntu.17 | 13 | ||||
-rw-r--r-- | core/modules/speedcheck/module.conf.debian | 4 | ||||
-rw-r--r-- | core/modules/speedcheck/module.conf.opensuse | 5 | ||||
-rw-r--r-- | core/modules/speedcheck/module.conf.ubuntu | 4 | ||||
-rw-r--r-- | core/modules/vmchooser2/module.conf.ubuntu | 5 | ||||
-rw-r--r-- | core/modules/vmchooser2/module.conf.ubuntu.17 | 7 |
10 files changed, 34 insertions, 20 deletions
diff --git a/core/modules/beamergui/module.conf.ubuntu b/core/modules/beamergui/module.conf.ubuntu index c7c4e2c1..044381e1 100644 --- a/core/modules/beamergui/module.conf.ubuntu +++ b/core/modules/beamergui/module.conf.ubuntu @@ -1,9 +1,8 @@ #!/bin/bash REQUIRED_INSTALLED_PACKAGES=" -libqt4-dev -libxrandr-dev + libqt5gui5 + libxrandr-dev " REQUIRED_CONTENT_PACKAGES=" -libqt4-dev -libxrandr-dev + libxrandr-dev " diff --git a/core/modules/printergui/module.conf.ubuntu b/core/modules/printergui/module.conf.ubuntu index e6d9d864..dc98d2d6 100644 --- a/core/modules/printergui/module.conf.ubuntu +++ b/core/modules/printergui/module.conf.ubuntu @@ -1,6 +1,6 @@ #!/bin/bash REQUIRED_INSTALLED_PACKAGES=" libcups2-dev - libqt4-dev + libqt5gui5 " diff --git a/core/modules/pvs2/module.conf b/core/modules/pvs2/module.conf index a9a57bfb..bbac8a80 100644 --- a/core/modules/pvs2/module.conf +++ b/core/modules/pvs2/module.conf @@ -8,7 +8,6 @@ REQUIRED_BINARIES=" " REQUIRED_DIRECTORIES=" /opt/openslx/pvs2/ - /usr/lib/ " REQUIRED_LIBRARIES=" " diff --git a/core/modules/pvs2/module.conf.ubuntu b/core/modules/pvs2/module.conf.ubuntu index 2a938b43..05a233bc 100644 --- a/core/modules/pvs2/module.conf.ubuntu +++ b/core/modules/pvs2/module.conf.ubuntu @@ -1,13 +1,13 @@ #!/bin/bash REQUIRED_INSTALLED_PACKAGES=" - libqt4-dev + libqt5gui5 + libqt5x11extras5-dev + qttools5-dev libvncserver-dev xinput wmctrl " REQUIRED_CONTENT_PACKAGES=" - libqt4-svg - libqtgui4 xinput wmctrl " diff --git a/core/modules/pvs2/module.conf.ubuntu.17 b/core/modules/pvs2/module.conf.ubuntu.17 new file mode 100644 index 00000000..19ab75f1 --- /dev/null +++ b/core/modules/pvs2/module.conf.ubuntu.17 @@ -0,0 +1,13 @@ +#!/bin/bash +REQUIRED_INSTALLED_PACKAGES=" + libqt5gui5 + libqt5x11extras5-dev + qttools5-dev-tools + libvncserver-dev + xinput + wmctrl +" +REQUIRED_CONTENT_PACKAGES=" + xinput + wmctrl +" diff --git a/core/modules/speedcheck/module.conf.debian b/core/modules/speedcheck/module.conf.debian index 1e09c702..600d3ab3 100644 --- a/core/modules/speedcheck/module.conf.debian +++ b/core/modules/speedcheck/module.conf.debian @@ -1,5 +1,5 @@ #!/bin/bash -REQUIRED_INSTALLED_PACKAGES=" +REQUIRED_INSTALLED_PACKAGES=" cmake - libqt4-dev + libqt5gui5 " diff --git a/core/modules/speedcheck/module.conf.opensuse b/core/modules/speedcheck/module.conf.opensuse deleted file mode 100644 index d3bd2b76..00000000 --- a/core/modules/speedcheck/module.conf.opensuse +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -REQUIRED_INSTALLED_PACKAGES=" - cmake - libqt4-devel -" diff --git a/core/modules/speedcheck/module.conf.ubuntu b/core/modules/speedcheck/module.conf.ubuntu index 1e09c702..4c2251ad 100644 --- a/core/modules/speedcheck/module.conf.ubuntu +++ b/core/modules/speedcheck/module.conf.ubuntu @@ -1,5 +1,5 @@ #!/bin/bash REQUIRED_INSTALLED_PACKAGES=" - cmake - libqt4-dev + cmake + libqt5gui5 " diff --git a/core/modules/vmchooser2/module.conf.ubuntu b/core/modules/vmchooser2/module.conf.ubuntu index 1e09c702..286d01f1 100644 --- a/core/modules/vmchooser2/module.conf.ubuntu +++ b/core/modules/vmchooser2/module.conf.ubuntu @@ -1,5 +1,6 @@ #!/bin/bash REQUIRED_INSTALLED_PACKAGES=" - cmake - libqt4-dev + cmake + libqt5gui5 + qttools5-dev " diff --git a/core/modules/vmchooser2/module.conf.ubuntu.17 b/core/modules/vmchooser2/module.conf.ubuntu.17 new file mode 100644 index 00000000..597eb825 --- /dev/null +++ b/core/modules/vmchooser2/module.conf.ubuntu.17 @@ -0,0 +1,7 @@ +#!/bin/bash +REQUIRED_INSTALLED_PACKAGES=" + cmake + libqt5gui5 + libqt5x11extras5-dev + qttools5-dev-tools +" |