This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit a579338e71ab2f82c74b8c36dda7d222e3fa4558 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Mar 4 09:33:38 2014 +0100 Rename txt/git to txt/git-info (make it compliant with cmdline options). --- Makefile | 2 +- debian/changelog | 2 ++ git.rcc | 2 +- onmainwindow.cpp | 6 +++--- x2goclient.pro | 2 +- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index d944801..48db8e0 100755 --- a/Makefile +++ b/Makefile @@ -56,7 +56,7 @@ clean: clean_client clean_plugin clean_man clean_pluginprovider rm -f x2goclient rm -f x2goclient.tag rm -f txt/changelog - rm -f txt/git + rm -f txt/git-info clean_client: rm -fr $(CLIENT_DIR) diff --git a/debian/changelog b/debian/changelog index bb91c74..8980bab 100644 --- a/debian/changelog +++ b/debian/changelog @@ -28,6 +28,8 @@ x2goclient (4.0.2.0-0x2go1) UNRELEASED; urgency=low - Drop create_text.sh again, implement changelog copying in distro build files. Implement Git history creation for nightly builds in build scripts. + - Rename txt/git to txt/git-info (make it compliant with cmdline + options). * debian/control: + Build-depend on libssh-dev (>= 0.5.4-2). + Bump Standards: to 3.9.5. No changes needed. diff --git a/git.rcc b/git.rcc index 7f4d6ba..542aec4 100644 --- a/git.rcc +++ b/git.rcc @@ -1,5 +1,5 @@ <RCC> <qresource> - <file>txt/git</file> + <file>txt/git-info</file> </qresource> </RCC> diff --git a/onmainwindow.cpp b/onmainwindow.cpp index f66b1b5..461ab76 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -7192,7 +7192,7 @@ void ONMainWindow::showHelp() { helpMsg+="--changelog\t\t\t show changelog\n"; } - if(QFile::exists(":/txt/git")) + if(QFile::exists(":/txt/git-info")) { helpMsg+= "--git-info\t\t\t show GIT info\n"; @@ -7313,12 +7313,12 @@ void ONMainWindow::showChangelog() void ONMainWindow::showGit() { - if(!QFile::exists(":/txt/git")) + if(!QFile::exists(":/txt/git-info")) { qCritical()<<tr("Option is not availabel in this build"); return; } - showTextFile(":/txt/git", tr("Git Info")); + showTextFile(":/txt/git-info", tr("Git Info")); } void ONMainWindow::showVersion() diff --git a/x2goclient.pro b/x2goclient.pro index 3a100fd..99d0fb7 100755 --- a/x2goclient.pro +++ b/x2goclient.pro @@ -146,7 +146,7 @@ DEPENDPATH += . INCLUDEPATH += . RESOURCES += resources.rcc -exists( txt/git ) { +exists( txt/git-info ) { message( "Configuring with --git-info" ) RESOURCES += git.rcc } -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git