This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/cleanup in repository x2goclient. commit afedea142248472035d741917b22353a952160ea Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Mar 5 00:51:21 2015 +0100 x2goclient.pro.maemo: cleanup. - Reorder sections so that they match x2goclient.pro. - Adapt to new directory structure. - Various whitespace fixes. --- debian/changelog | 4 ++ x2goclient.pro.maemo | 134 +++++++++++++++++++++++++------------------------- 2 files changed, 72 insertions(+), 66 deletions(-) diff --git a/debian/changelog b/debian/changelog index 114be2f..ffa0d70 100644 --- a/debian/changelog +++ b/debian/changelog @@ -166,6 +166,10 @@ x2goclient (4.0.4.0-0x2go1) UNRELEASED; urgency=low architecture to either exclusively x86_64 (UNIVERSAL=0) or both x86_64 and x86 (UNIVERSAL=1). - Add usage message to macbuild.sh obtainable via -h or --help. + - x2goclient.pro.maemo: cleanup. + + Reorder sections so that they match x2goclient.pro. + + Adapt to new directory structure. + + Various whitespace fixes. -- X2Go Release Manager <git-admin@x2go.org> Thu, 19 Feb 2015 13:25:28 +0100 diff --git a/x2goclient.pro.maemo b/x2goclient.pro.maemo index cf09e02..c900228 100644 --- a/x2goclient.pro.maemo +++ b/x2goclient.pro.maemo @@ -1,73 +1,75 @@ -# Diese Datei wurde mit dem qmake-Manager von KDevelop erstellt. -# ------------------------------------------- -# Unterordner relativ zum Projektordner: . -# Das Target ist eine Anwendung: +# This file was created by KDevelop. +# ------------------------------------------- +# +FORMS += src/ui/cupsprintsettingsdialog.ui \ + src/ui/cupsprintwidget.ui \ + src/ui/printwidget.ui \ + src/ui/printercmddialog.ui \ + src/ui/printdialog.ui + +TRANSLATIONS += res/i18n/x2goclient_de.ts \ + res/i18n/x2goclient_ru.ts + +HEADERS += src/configdialog.h \ + src/editconnectiondialog.h \ + src/exportdialog.h \ + src/imgframe.h \ + src/LDAPSession.h \ + src/onmainwindow.h \ + src/sessionbutton.h \ + src/sessionmanagedialog.h \ + src/sshprocess.h \ + src/SVGFrame.h \ + src/userbutton.h \ + src/x2goclientconfig.h \ + src/x2gologdebug.h \ + src/printprocess.h \ + src/printwidget.h \ + src/printercmddialog.h \ + src/printdialog.h \ + src/embedwidget.h \ + src/wapi.h \ + src/sessionwidget.h \ + src/configwidget.h \ + src/connectionwidget.h \ + src/settingswidget.h \ + src/sharewidget.h \ + src/clicklineedit.h + +SOURCES += src/sharewidget.cpp \ + src/settingswidget.cpp \ + src/configwidget.cpp \ + src/sessionwidget.cpp \ + src/connectionwidget.cpp \ + src/configdialog.cpp \ + src/editconnectiondialog.cpp \ + src/exportdialog.cpp \ + src/imgframe.cpp \ + src/LDAPSession.cpp \ + src/ongetpass.cpp \ + src/onmainwindow.cpp \ + src/sessionbutton.cpp \ + src/sessionmanagedialog.cpp \ + src/sshprocess.cpp \ + src/SVGFrame.cpp \ + src/userbutton.cpp \ + src/x2gologdebug.cpp \ + src/printprocess.cpp \ + src/printwidget.cpp \ + src/printercmddialog.cpp \ + src/printdialog.cpp \ + src/embedwidget.cpp \ + src/wapi.cpp \ + src/clicklineedit.cpp -TRANSLATIONS += x2goclient_de.ts -TRANSLATIONS += x2goclient_ru.ts -HEADERS += configdialog.h \ - editconnectiondialog.h \ - exportdialog.h \ - imgframe.h \ - LDAPSession.h \ - onmainwindow.h \ - sessionbutton.h \ - sessionmanagedialog.h \ - sshprocess.h \ - SVGFrame.h \ - userbutton.h \ - x2goclientconfig.h \ - x2gologdebug.h \ - printprocess.h \ - printwidget.h \ - printercmddialog.h \ - printdialog.h \ - embedwidget.h \ - wapi.h \ - sessionwidget.h \ - configwidget.h \ - connectionwidget.h \ - settingswidget.h \ - sharewidget.h \ - clicklineedit.h -SOURCES += sharewidget.cpp \ - settingswidget.cpp\ - configwidget.cpp \ - sessionwidget.cpp \ - connectionwidget.cpp \ - configdialog.cpp \ - editconnectiondialog.cpp \ - exportdialog.cpp \ - imgframe.cpp \ - LDAPSession.cpp \ - ongetpass.cpp \ - onmainwindow.cpp \ - sessionbutton.cpp \ - sessionmanagedialog.cpp \ - sshprocess.cpp \ - SVGFrame.cpp \ - userbutton.cpp \ - x2gologdebug.cpp \ - printprocess.cpp \ - printwidget.cpp \ - printercmddialog.cpp \ - printdialog.cpp \ - embedwidget.cpp \ - wapi.cpp \ - clicklineedit.cpp TEMPLATE = app TARGET = DEPENDPATH += . INCLUDEPATH += . -RESOURCES += resources.rcc -RC_FILE = x2goclient.rc +RESOURCES += res/resources.rcc +RC_FILE = res/x2goclient.rc QT += svg network -ICON =icons/x2go-mac.icns -QMAKE_MAC_SDK =/Developer/SDKs/MacOSX10.5.sdk -CONFIG +=x86 ppc -FORMS += cupsprintsettingsdialog.ui \ -cupsprintwidget.ui \ -printwidget.ui \ -printercmddialog.ui \ -printdialog.ui +ICON = $${PWD}/res/img/icons/x2go-mac.icns +QMAKE_MAC_SDK = /Developer/SDKs/MacOSX10.5.sdk +CONFIG += x86 ppc -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git