This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/cleanup in repository x2goclient. commit d7036f135b1f6c2e59e12a1397be69b42b59c64c Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Feb 13 22:19:22 2015 +0100 README.i18n: grammar fix. --- README.i18n | 4 ++-- debian/changelog | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/README.i18n b/README.i18n index 380414a..36b79bb 100644 --- a/README.i18n +++ b/README.i18n @@ -83,8 +83,8 @@ Next time... You will get informed on x2go-i18n if a translation update is necessary. So check your mails there regularly. -For updating a translation, either keep the X2Go Client source project folder and -read more about Git by yourself. +For updating a translation, keep the X2Go Client source project folder and read +more about Git by yourself. Alternatively, just remove the folder (once you have sent in the translation file) and start with this documentation all over again. diff --git a/debian/changelog b/debian/changelog index d6b8ad5..850fc76 100644 --- a/debian/changelog +++ b/debian/changelog @@ -112,6 +112,7 @@ x2goclient (4.0.3.2-0x2go1) UNRELEASED; urgency=medium - Replace backticks with $() and change spaces to tabs in Makefile.man2html. - Reformat README.OpenSSL-Exception. + - Grammar fix in README.i18n. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 27 Nov 2014 12:01:43 +0100 -- Alioth's /srv/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/cleanup in repository x2goclient. commit 171813df2beac4da29a03bbd12f38e87568ce8b9 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Feb 13 22:39:29 2015 +0100 x2goclient.pro: improve consistency: replace tabs with spaces, put quotes around messages, remove or add whitespace where applicable. --- debian/changelog | 2 ++ x2goclient.pro | 84 +++++++++++++++++++++++++++--------------------------- 2 files changed, 44 insertions(+), 42 deletions(-) diff --git a/debian/changelog b/debian/changelog index 416e945..0d95f10 100644 --- a/debian/changelog +++ b/debian/changelog @@ -114,6 +114,8 @@ x2goclient (4.0.3.2-0x2go1) UNRELEASED; urgency=medium - Reformat README.OpenSSL-Exception. - Grammar fix in README.i18n. - Update .gitignore with more temporary files. + - Make x2goclient.pro consistent: replace tabs with spaces, put quotes + around messages, remove or add whitespace where applicable. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 27 Nov 2014 12:01:43 +0100 diff --git a/x2goclient.pro b/x2goclient.pro index 447096c..f30b1a5 100644 --- a/x2goclient.pro +++ b/x2goclient.pro @@ -122,14 +122,14 @@ LIBS += -lssh win32:LIBS += -lAdvAPI32 -lshell32 -lUser32 plugin { - TARGET = x2goplugin + TARGET = x2goplugin } else { - RC_FILE = src/res/x2goclient.rc - SOURCES += src/x2goclient.cpp - TARGET = x2goclient - DEFINES += CFGCLIENT - message(if you want to build x2goplugin you should export X2GO_CLIENT_TARGET=plugin) + RC_FILE = src/res/x2goclient.rc + SOURCES += src/x2goclient.cpp + TARGET = x2goclient + DEFINES += CFGCLIENT + message("if you want to build x2goplugin you should export X2GO_CLIENT_TARGET=plugin") } !isEmpty(TRANSLATIONS) { @@ -148,66 +148,66 @@ else { QMAKE_EXTRA_COMPILERS += TSQM PRE_TARGETDEPS += compiler_TSQM_make_all } -else:message(No translation files in project) +else:message("No translation files in project") TEMPLATE = app DEPENDPATH += . INCLUDEPATH += . RESOURCES += src/res/resources.rcc -exists( txt/git-info ) { - message( "Configuring with --git-info" ) - RESOURCES += src/res/git.rcc +exists(txt/git-info) { + message("Configuring with --git-info") + RESOURCES += src/res/git.rcc } -exists( txt/changelog ) { - message( "Configuring with --changelog" ) - RESOURCES += src/res/changelog.rcc +exists(txt/changelog) { + message("Configuring with --changelog") + RESOURCES += src/res/changelog.rcc } linux-g++ { - message(building $$TARGET with ldap and cups) - LIBS += -lldap -lcups -lX11 -lXpm - DEFINES += __linux__ + message("building $$TARGET with ldap and cups") + LIBS += -lldap -lcups -lX11 -lXpm + DEFINES += __linux__ } linux-g++-64 { - message(building $$TARGET with ldap and cups) - LIBS += -lldap -lcups -lX11 -lXpm - DEFINES += __linux__ + message("building $$TARGET with ldap and cups") + LIBS += -lldap -lcups -lX11 -lXpm + DEFINES += __linux__ } x2go_linux_static { - message (linking all libs statically) - DEFINES += __linux__ - LIBS -= -lssh - LIBS += -lssh_static -lssl -lXpm - QMAKE_LFLAGS = -Bstatic $$QMAKE_LFLAGS + message("linking all libs statically") + DEFINES += __linux__ + LIBS -= -lssh + LIBS += -lssh_static -lssl -lXpm + QMAKE_LFLAGS = -Bstatic $$QMAKE_LFLAGS } macx { - message(building $$TARGET with ldap and cups) - LIBS += -framework LDAP -lcups -lcrypto -lssl -lz + message("building $$TARGET with ldap and cups") + LIBS += -framework LDAP -lcups -lcrypto -lssl -lz } win32-* { - message(building $$TARGET for windows without ldap and cups) - LIBS += -lwinspool -lws2_32 - CONFIG += static release + message("building $$TARGET for windows without ldap and cups") + LIBS += -lwinspool -lws2_32 + CONFIG += static release } QT += svg network ICON = icons/x2go-mac.icns QMAKE_INFO_PLIST = Info.plist plugin { - DEFINES += CFGPLUGIN - linux-g++ { - include(x2gobrowserplugin-2.4_1/src/qtbrowserplugin.pri) - } - linux-g++-64 { - include(x2gobrowserplugin-2.4_1/src/qtbrowserplugin.pri) - } - win32-* { - DEFINES += QT_NODLL - CONFIG += qaxserver - include(x2gobrowserplugin-2.4_1/src/qtbrowserplugin.pri) - } - RC_FILE = x2gobrowserplugin-2.4_1/src/res/x2goplugin.rc + DEFINES += CFGPLUGIN + linux-g++ { + include(x2gobrowserplugin-2.4_1/src/qtbrowserplugin.pri) + } + linux-g++-64 { + include(x2gobrowserplugin-2.4_1/src/qtbrowserplugin.pri) + } + win32-* { + DEFINES += QT_NODLL + CONFIG += qaxserver + include(x2gobrowserplugin-2.4_1/src/qtbrowserplugin.pri) + } + RC_FILE = x2gobrowserplugin-2.4_1/src/res/x2goplugin.rc } -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git