This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 6f73fbcf198f3e6666cdacfa42c30367e1673006 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Mar 4 09:04:59 2014 +0100 debian/rules: Copy debian/changelog into txt/ subfolder during dh_auto_configure. --- debian/changelog | 2 ++ debian/rules | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 5fc31c9..f73e782 100644 --- a/debian/changelog +++ b/debian/changelog @@ -27,6 +27,8 @@ x2goclient (4.0.2.0-0x2go1) UNRELEASED; urgency=low * debian/control: + Build-depend on libssh-dev (>= 0.5.4-2). + Bump Standards: to 3.9.5. No changes needed. + * debian/rules: + + Copy debian/changelog into txt/ subfolder during dh_auto_configure. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 22 Jan 2014 09:20:08 +0100 diff --git a/debian/rules b/debian/rules index 99a3a76..f32b3ce 100755 --- a/debian/rules +++ b/debian/rules @@ -8,10 +8,15 @@ export LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) %: dh $@ --parallel --with apache2 || dh $@ --parallel +override_dh_auto_configure: + cp debian/changelog txt/changelog + dh_auto_configure + override_dh_auto_clean: dh_auto_clean # clean stray .qm files that are not handled by clean rule in upstream Makefile rm -Rf x2goclient_*.qm + rm -f txt/changelog override_dh_auto_install: mv plugin_build/libx2goplugin.so plugin_build/libx2goplugin.so.unstripped -- 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 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

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit c3f9c78142340f698d46aae7120fb56f457f0b97 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Mar 4 09:08:24 2014 +0100 Drop create_text.sh again, implement changelog copying in distro build files. Implement Git history creation for nightly builds in build scripts. --- Makefile | 1 - create_text.sh | 7 ------- debian/changelog | 4 ++++ 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 2ac5307..d944801 100755 --- a/Makefile +++ b/Makefile @@ -30,7 +30,6 @@ LRELEASE_BINARY=lrelease-qt4 all: build build: build_man build_pluginprovider - ./create_text.sh $(MAKE) build_client $(MAKE) build_plugin diff --git a/create_text.sh b/create_text.sh deleted file mode 100755 index 417d611..0000000 --- a/create_text.sh +++ /dev/null @@ -1,7 +0,0 @@ -cp -ar debian/changelog txt/ - -echo "GIT info:" > txt/git -git branch >> txt/git -echo "=================================" >> txt/git -echo "GIT history:" >> txt/git -git log -n 10 >> txt/git diff --git a/debian/changelog b/debian/changelog index f91001d..359fac2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,6 +24,10 @@ x2goclient (4.0.2.0-0x2go1) UNRELEASED; urgency=low requests. (Fixes: #440, #138). [ Mike Gabriel ] + * New upstream version (4.0.2.0): + - Drop create_text.sh again, implement changelog copying + in distro build files. Implement Git history creation for + nightly builds in build scripts. * debian/control: + Build-depend on libssh-dev (>= 0.5.4-2). + Bump Standards: to 3.9.5. No changes needed. -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git