This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/cleanup in repository x2goclient. commit a530e163e7098825d10414cf3cefb782a92a3cd0 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Feb 13 21:04:20 2015 +0100 general: reference changes in shipped Makefile. --- Makefile | 8 ++++---- debian/changelog | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index c7e5b73..916716f 100755 --- a/Makefile +++ b/Makefile @@ -51,10 +51,10 @@ build_man: ${MAKE} -f Makefile.man2html build clean: clean_client clean_plugin clean_man clean_pluginprovider - find . -maxdepth 2 -name '*.o' -exec rm -vf {} + -type f - find . -maxdepth 2 -name 'moc_*.cpp' -exec rm -vf {} + -type f - find . -maxdepth 2 -name 'ui_*.h' -exec rm -vf {} + -type f - find . -maxdepth 2 -name 'qrc_*.cpp' -exec rm -vf {} + -type f + find . -maxdepth 3 -name '*.o' -exec rm -vf {} + -type f + find . -maxdepth 3 -name 'moc_*.cpp' -exec rm -vf {} + -type f + find . -maxdepth 3 -name 'ui_*.h' -exec rm -vf {} + -type f + find . -maxdepth 3 -name 'qrc_*.cpp' -exec rm -vf {} + -type f rm -f x2goclient rm -f x2goclient.tag rm -f txt/changelog diff --git a/debian/changelog b/debian/changelog index 18ce527..1034975 100644 --- a/debian/changelog +++ b/debian/changelog @@ -99,6 +99,7 @@ x2goclient (4.0.3.2-0x2go1) UNRELEASED; urgency=medium - Add x2goclientconfig.pri only containing a comment to override specific entries in x2goclient.pro in x2goclientconfig.pri. - Move resource files to src/res/ and reference in x2goclient.pro. + - Reference changes in shipped Makefile. -- 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 503db1ba08f07e17543c78428d79635d28333e53 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Feb 13 21:09:38 2015 +0100 general: rename qtbrowserplugin-<ver>-opensource to x2gobrowserplugin-<ver> and reference in x2goclient.pro. --- debian/changelog | 2 ++ .../src/qtbrowserplugin.cpp | 0 .../src/qtbrowserplugin.def | 0 .../src/qtbrowserplugin.h | 0 .../src/qtbrowserplugin.pri | 0 .../src/qtbrowserplugin_mac.cpp | 0 .../src/qtbrowserplugin_p.h | 0 .../src/qtbrowserplugin_win.cpp | 0 .../src/qtbrowserplugin_x11.cpp | 0 .../src/qtbrowserpluginax.def | 0 .../src/qtnpapi.h | 0 x2goclient.pro | 6 +++--- 12 files changed, 5 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index aee2e70..e6ab718 100644 --- a/debian/changelog +++ b/debian/changelog @@ -101,6 +101,8 @@ x2goclient (4.0.3.2-0x2go1) UNRELEASED; urgency=medium - Move resource files to src/res/ and reference in x2goclient.pro. - Reference changes in shipped Makefile. - Rename SRC_DIR to TOP_DIR in shipped Makefile. + - Rename qtbrowserplugin-<ver>-opensource to x2gobrowserplugin-<ver> and + reference in x2goclient.pro. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 27 Nov 2014 12:01:43 +0100 diff --git a/qtbrowserplugin-2.4_1-opensource/src/qtbrowserplugin.cpp b/x2gobrowserplugin-2.4_1/src/qtbrowserplugin.cpp similarity index 100% rename from qtbrowserplugin-2.4_1-opensource/src/qtbrowserplugin.cpp rename to x2gobrowserplugin-2.4_1/src/qtbrowserplugin.cpp diff --git a/qtbrowserplugin-2.4_1-opensource/src/qtbrowserplugin.def b/x2gobrowserplugin-2.4_1/src/qtbrowserplugin.def similarity index 100% rename from qtbrowserplugin-2.4_1-opensource/src/qtbrowserplugin.def rename to x2gobrowserplugin-2.4_1/src/qtbrowserplugin.def diff --git a/qtbrowserplugin-2.4_1-opensource/src/qtbrowserplugin.h b/x2gobrowserplugin-2.4_1/src/qtbrowserplugin.h similarity index 100% rename from qtbrowserplugin-2.4_1-opensource/src/qtbrowserplugin.h rename to x2gobrowserplugin-2.4_1/src/qtbrowserplugin.h diff --git a/qtbrowserplugin-2.4_1-opensource/src/qtbrowserplugin.pri b/x2gobrowserplugin-2.4_1/src/qtbrowserplugin.pri similarity index 100% rename from qtbrowserplugin-2.4_1-opensource/src/qtbrowserplugin.pri rename to x2gobrowserplugin-2.4_1/src/qtbrowserplugin.pri diff --git a/qtbrowserplugin-2.4_1-opensource/src/qtbrowserplugin_mac.cpp b/x2gobrowserplugin-2.4_1/src/qtbrowserplugin_mac.cpp similarity index 100% rename from qtbrowserplugin-2.4_1-opensource/src/qtbrowserplugin_mac.cpp rename to x2gobrowserplugin-2.4_1/src/qtbrowserplugin_mac.cpp diff --git a/qtbrowserplugin-2.4_1-opensource/src/qtbrowserplugin_p.h b/x2gobrowserplugin-2.4_1/src/qtbrowserplugin_p.h similarity index 100% rename from qtbrowserplugin-2.4_1-opensource/src/qtbrowserplugin_p.h rename to x2gobrowserplugin-2.4_1/src/qtbrowserplugin_p.h diff --git a/qtbrowserplugin-2.4_1-opensource/src/qtbrowserplugin_win.cpp b/x2gobrowserplugin-2.4_1/src/qtbrowserplugin_win.cpp similarity index 100% rename from qtbrowserplugin-2.4_1-opensource/src/qtbrowserplugin_win.cpp rename to x2gobrowserplugin-2.4_1/src/qtbrowserplugin_win.cpp diff --git a/qtbrowserplugin-2.4_1-opensource/src/qtbrowserplugin_x11.cpp b/x2gobrowserplugin-2.4_1/src/qtbrowserplugin_x11.cpp similarity index 100% rename from qtbrowserplugin-2.4_1-opensource/src/qtbrowserplugin_x11.cpp rename to x2gobrowserplugin-2.4_1/src/qtbrowserplugin_x11.cpp diff --git a/qtbrowserplugin-2.4_1-opensource/src/qtbrowserpluginax.def b/x2gobrowserplugin-2.4_1/src/qtbrowserpluginax.def similarity index 100% rename from qtbrowserplugin-2.4_1-opensource/src/qtbrowserpluginax.def rename to x2gobrowserplugin-2.4_1/src/qtbrowserpluginax.def diff --git a/qtbrowserplugin-2.4_1-opensource/src/qtnpapi.h b/x2gobrowserplugin-2.4_1/src/qtnpapi.h similarity index 100% rename from qtbrowserplugin-2.4_1-opensource/src/qtnpapi.h rename to x2gobrowserplugin-2.4_1/src/qtnpapi.h diff --git a/x2goclient.pro b/x2goclient.pro index dbb934c..25fc895 100755 --- a/x2goclient.pro +++ b/x2goclient.pro @@ -199,15 +199,15 @@ QMAKE_INFO_PLIST = Info.plist plugin { DEFINES += CFGPLUGIN linux-g++ { - include(qtbrowserplugin-2.4_1-opensource/src/qtbrowserplugin.pri) + include(x2gobrowserplugin-2.4_1/src/qtbrowserplugin.pri) } linux-g++-64 { - include(qtbrowserplugin-2.4_1-opensource/src/qtbrowserplugin.pri) + include(x2gobrowserplugin-2.4_1/src/qtbrowserplugin.pri) } win32-* { DEFINES += QT_NODLL CONFIG += qaxserver - include(qtbrowserplugin-2.4_1-opensource/src/qtbrowserplugin.pri) + include(x2gobrowserplugin-2.4_1/src/qtbrowserplugin.pri) } RC_FILE = x2goplugin.rc } -- 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 8b413f1266c80ed2ccb68e66e892baf3484dd143 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Feb 13 21:26:54 2015 +0100 x2goclient.pro: remove executability. --- debian/changelog | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/changelog b/debian/changelog index a1d3c58..12ddfb3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -105,6 +105,7 @@ x2goclient (4.0.3.2-0x2go1) UNRELEASED; urgency=medium reference in x2goclient.pro. - Move x2goplugin.rc to x2gobrowserplugin-*/src/res/ and reference in x2goclient.pro. + - Remove executability from x2goclient.pro. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 27 Nov 2014 12:01:43 +0100 diff --git a/x2goclient.pro b/x2goclient.pro old mode 100755 new mode 100644 -- 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 a2ccf85f14285c268b41d804efe8941f0f8f214a Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Feb 13 21:43:41 2015 +0100 HOWTO.GPGCARD: fix typos and grammar. --- HOWTO.GPGCARD | 12 ++++++------ debian/changelog | 1 + 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/HOWTO.GPGCARD b/HOWTO.GPGCARD index ff56a41..39cc88f 100644 --- a/HOWTO.GPGCARD +++ b/HOWTO.GPGCARD @@ -100,7 +100,7 @@ IMPORTANT: login Name is a name of user on remote system 2.1 start gpg-agent with ssh support Be sure, that pinentry-x2go is installed. For test purposes you can use other pinentry program, but for -x2goclient pinentry-x2go is requered (pinentry-x2go-gtk if you are using gtk version of x2goclient) +x2goclient pinentry-x2go is required (pinentry-x2go-gtk if you are using the gtk-version of x2goclient) user@x2goclient$ gpg-agent --enable-ssh-support --daemon --pinentry-program /usr/bin/pinentry-x2go GPG_AGENT_INFO=/tmp/gpg-Xh4lY7/S.gpg-agent:24620:1; export GPG_AGENT_INFO; @@ -112,18 +112,18 @@ user@x2goclient$ GPG_AGENT_INFO=/tmp/gpg-Xh4lY7/S.gpg-agent:24620:1; export GPG_ user@x2goclient$ SSH_AUTH_SOCK=/tmp/gpg-LO41WU/S.gpg-agent.ssh; export SSH_AUTH_SOCK; user@x2goclient$ SSH_AGENT_PID=24620; export SSH_AGENT_PID; -2.3 You can check the key on your smartcard with command: +2.3 You can check the key on your smartcard with: user@x2goclient$ ssh-add -l 1024 ef:d5:8c:37:cb:38:01:8d:c2:30:00:ac:93:a2:43:98 cardno:000000000042 (RSA) -2.4 Copy public part of your key to remote computer +2.4 Copy the public part of your key to the remote computer user@x2goclient$ ssh-copy-id beispielb@x2goserver beispielb@x2goserver's password: -Now try logging into the machine, with "ssh 'beispielb@x2goserver'", and check in: +Now try logging in into the machine, e.g., via "ssh 'beispielb@x2goserver'", and check: - .ssh/authorized_keys + ~/.ssh/authorized_keys to make sure we haven't added extra keys that you weren't expecting. 2.5 Testing ssh connection - +TBD diff --git a/debian/changelog b/debian/changelog index 61f9b0d..b744c1a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -107,6 +107,7 @@ x2goclient (4.0.3.2-0x2go1) UNRELEASED; urgency=medium x2goclient.pro. - Remove executability from x2goclient.pro. - Fix typos and update URL's in INSTALL file. + - Fix typos and grammar in HOWTO.GPGCARD. -- 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 e89bb3d74f22d8f6c96593cb19ce155dd61c3c04 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Feb 13 22:08:53 2015 +0100 Makefile.man2html: replace backticks with $() and change spaces to tabs. --- Makefile.man2html | 8 ++++---- debian/changelog | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Makefile.man2html b/Makefile.man2html index 3412768..36fb984 100644 --- a/Makefile.man2html +++ b/Makefile.man2html @@ -5,7 +5,7 @@ MAN2HTML_SRC = man BUILD_DIR = .build_man2html MAN2HTML_DEST = $(BUILD_DIR)/html -man_pages = `cd $(MAN2HTML_SRC) && find * -type f` +man_pages = $(cd $(MAN2HTML_SRC) && find * -type f) all: build @@ -13,9 +13,9 @@ build: build_man2html build_man2html: if [ -n "$(MAN2HTML_BIN)" ]; then \ - mkdir -p $(MAN2HTML_DEST); \ - for man_page in $(man_pages); do mkdir -p `dirname $(MAN2HTML_DEST)/$$man_page`; done; \ - for man_page in $(man_pages); do $(MAN2HTML_BIN) $(MAN2HTML_SRC)/$$man_page > $(MAN2HTML_DEST)/$$man_page.html; done; \ + mkdir -p $(MAN2HTML_DEST); \ + for man_page in $(man_pages); do mkdir -p $$(dirname $(MAN2HTML_DEST)/$$man_page); done; \ + for man_page in $(man_pages); do $(MAN2HTML_BIN) $(MAN2HTML_SRC)/$$man_page > $(MAN2HTML_DEST)/$$man_page.html; done; \ fi clean: clean_man2html diff --git a/debian/changelog b/debian/changelog index d1f7e14..149239e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -109,6 +109,8 @@ x2goclient (4.0.3.2-0x2go1) UNRELEASED; urgency=medium - Fix typos and update URL's in INSTALL file. - Fix typos and grammar in HOWTO.GPGCARD. - Add "X2Go Project" copyright to LICENSE file. + - Replace backticks with $() and change spaces to tabs in + Makefile.man2html. -- 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