This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 41673c14b765ce8ae9e04094e77f07d01902ac24 Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Dec 1 20:57:39 2022 +0100 x2goclient.pro: also select on win32 and not just win32-*, fix whitespace. --- debian/changelog | 2 ++ x2goclient.pro | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 082288b..e443554 100644 --- a/debian/changelog +++ b/debian/changelog @@ -142,6 +142,8 @@ x2goclient (4.1.2.3-0x2go1) UNRELEASED; urgency=medium - config_linux_static.sh: also switch from -config to CONFIG+='...'. - {handle_mxe.sh,x2goclient.pro}: make mxe selectable via CONFIG option and prepare selector in x2goclient.pro. + - x2goclient.pro: also select on win32 and not just win32-*, fix + whitespace. * debian/control: + Move to debian/control.in. * debian/control.in: diff --git a/x2goclient.pro b/x2goclient.pro index 6174371..fb6c88a 100644 --- a/x2goclient.pro +++ b/x2goclient.pro @@ -272,17 +272,17 @@ macx { PRE_TARGETDEPS += $${TARGET}.app/Contents/Info.plist QMAKE_POST_LINK += $${PWD}/res/osxbundle/postbuild.sh \"$${TARGET}\" \"$${VERSION}\" \"$${QMAKE_INFO_PLIST_OUT}\" \"$${QMAKE_COPY}\" \"$${ICON}\" \"$${OUT_PWD}/$${TARGET}.app/Contents/Resources/\" } -win32-* { +win32|win32-* { message("building $$TARGET for windows without ldap and cups") LIBS += -lwinspool -lws2_32 CONFIG += static release } QT += svg network linux|linux-* { -greaterThan(QT_MAJOR_VERSION, 4): QT += x11extras + greaterThan(QT_MAJOR_VERSION, 4): QT += x11extras } -win32-* { -greaterThan(QT_MAJOR_VERSION, 4): QT += winextras +win32|win32-* { + greaterThan(QT_MAJOR_VERSION, 4): QT += winextras } mxe:QMAKE_CXXFLAGS += -std=c++11 -Wno-deprecated-declarations -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git