This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch feature/focal-ppa in repository x2goclient. from f18c58a add build dependencies for qt5 and testing on own remote branch new 185d2fc Prefer qt5 new 7c3c5a0 Look for qmake-qt4, if not in PATH, then set QMAKE and LRELEASE to qt without suffix The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: Makefile | 9 +++++++-- debian/control | 8 ++++---- 2 files changed, 11 insertions(+), 6 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/focal-ppa in repository x2goclient. commit 185d2fc059d2af39c7a90b3578673ca4ba505f7a Author: Juri Grabowski <git-commit@jugra.de> Date: Wed May 20 15:05:49 2020 +0000 Prefer qt5 --- debian/control | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/control b/debian/control index 75a8cee..fb9dd74 100644 --- a/debian/control +++ b/debian/control @@ -8,10 +8,10 @@ Uploaders: Mihai Moldovan <ionic@ionic.de>, Build-Depends: debhelper (>= 7.0.50~), - libqt4-dev | qtbase5-dev, - libqt4-dev | qttools5-dev-tools, - libqt4-dev | libqt5svg5-dev, - libqt4-dev | libqt5x11extras5-dev, + qtbase5-dev | libqt4-dev, + qttools5-dev-tools | libqt4-dev, + libqt5svg5-dev | libqt4-dev, + libqt5x11extras5-dev | libqt4-dev, libldap2-dev, libssh-dev (>= 0.5.4-2~), libcups2-dev, -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/focal-ppa in repository x2goclient. commit 7c3c5a0773cf022ba9c52df2adc620b79ad6f789 Author: Juri Grabowski <git-commit@jugra.de> Date: Wed May 20 15:07:25 2020 +0000 Look for qmake-qt4, if not in PATH, then set QMAKE and LRELEASE to qt without suffix It should save capability to build new releases on old Platforms with qt4. --- Makefile | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 15ddac1..2b8276f 100755 --- a/Makefile +++ b/Makefile @@ -20,8 +20,13 @@ ETCDIR=/etc/x2go BINDIR=$(PREFIX)/bin SHAREDIR=$(PREFIX)/share MANDIR=$(SHAREDIR)/man -QMAKE_BINARY=qmake-qt4 -LRELEASE_BINARY=lrelease-qt4 +ifeq ($(shell type -a qmake-qt4 ; echo $? ),0) + QMAKE_BINARY=qmake-qt4 + LRELEASE_BINARY=lrelease-qt4 +else + QMAKE_BINARY=qmake + LRELEASE_BINARY=lrelease +endif QMAKE_OPTS= LDFLAGS= -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
-
git-admin＠x2go.org