The branch, build-main has been updated via 034186dfcffa008e40cf3c2ec58df1aa82861f2d (commit) via 756e2fc2ca76a46d69883ab4cdd999d0102a2ac1 (commit) via b4ee8079b4f3f0fbf1d1dfd1b701238aace7f4fe (commit) via 8fefd5263dd350b62a339ccbca339a009bc4ad4d (commit) via d52a4690750ad3b69be998fff9ed2c2b32fb3a00 (commit) via 4d8ec8f9dc91f16b03d1a858cb3cd3ede3b391f3 (commit) via faaa1383a0999941e4d7404755b5b6576213b1b2 (commit) via 2e71dcbfdc8647bb432018050ef703ea8f36808e (commit) via a838f81224a278fb1b01a6f3e200860436bdb760 (commit) from 00a42cb5fd5abad78d8d7361b864dfeb5c7379fa (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: Makefile | 7 +++++-- Makefile.man2html | 8 +++++++- cupsprint.h | 3 ++- debian/changelog | 11 +++++++++-- debian/control | 1 + debian/menu | 2 +- debian/rules | 4 ---- sshprocess.cpp | 2 ++ version.h | 2 +- x2goplugin.rc | 10 +++++----- 10 files changed, 33 insertions(+), 17 deletions(-) The diff of changes is: diff --git a/Makefile b/Makefile index b4a5c6d..57ca900 100755 --- a/Makefile +++ b/Makefile @@ -25,7 +25,7 @@ MOZPLUGDIR=$(PREFIX)/lib/mozilla/plugins all: build -build: build_client build_plugin +build: build_client build_plugin build_man build_client: mkdir -p $(CLIENT_DIR) && cd $(CLIENT_DIR) && qmake-qt4 ../x2goclient.pro @@ -35,6 +35,9 @@ build_plugin: mkdir -p $(PLUGIN_DIR) && cd $(PLUGIN_DIR) && X2GO_CLIENT_TARGET=plugin qmake-qt4 ../x2goclient.pro cd $(PLUGIN_DIR) && $(MAKE) +build_man: + make -f Makefile.man2html build + clean: clean_client clean_plugin clean_man find . -type f -name '*.o' -exec rm -vf {} + find . -type f -name 'moc_*.cpp' -exec rm -vf {} + @@ -50,7 +53,7 @@ clean_plugin: rm -fr $(PLUGIN_DIR) clean_man: - rm -Rfv .build_man2html + make -f Makefile.man2html clean install: install_client install_plugin install_man diff --git a/Makefile.man2html b/Makefile.man2html index 0b9f91d..97af6fe 100644 --- a/Makefile.man2html +++ b/Makefile.man2html @@ -2,7 +2,8 @@ MAN2HTML_BIN = man2html MAN2HTML_SRC = man -MAN2HTML_DEST = .build_man2html/html +BUILD_DIR = .build_man2html +MAN2HTML_DEST = $(BUILD_DIR)/html man_pages = `cd $(MAN2HTML_SRC) && find * -type f` @@ -14,3 +15,8 @@ build_man2html: 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) -r $(MAN2HTML_SRC)/$$man_page > $(MAN2HTML_DEST)/$$man_page.html; done + +clean: clean_man2html + +clean_man2html: + rm -Rf $(BUILD_DIR) \ No newline at end of file diff --git a/cupsprint.h b/cupsprint.h index 8a32d6f..85eb2b4 100644 --- a/cupsprint.h +++ b/cupsprint.h @@ -15,6 +15,7 @@ #ifndef Q_OS_WIN #include <QStringList> #include <cups/cups.h> +#include <cups/ppd.h> /** @author Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> */ @@ -51,7 +52,7 @@ class CUPSPrint private: cups_dest_t *dests; int num_dests; - ppd_file_t* ppd; + ppd_file_t *ppd; QString currentPrinter; private: void loadUserOptions(); diff --git a/debian/changelog b/debian/changelog index 48de32c..264bf6a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,16 @@ -x2goclient (3.99.0.0-0~x2go2) UNRELEASED; urgency=low +x2goclient (3.99.0.1-0~x2go1) unstable; urgency=low + * New upstream version (3.99.0.1): + - Set TCP_NODELAY (equals: turn Nagle off) for SSH graphical port forwarding + tunnel. + - Include cups/ppd.h in cupsprint.h, fixes build on Debian wheezy/sid. + - Add build_man/clean_man stanzas to Makefile. * Explicitly use source format 3.0 (native). * Build-depend on libssh-dev (>=0.4.7). + * Update menu file in /debian folder (rename title to ,,X2go Client (Qt)''). + * Do not run man2html from rules file anymore. - -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 26 Jul 2011 14:37:20 +0200 + -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 12 Oct 2011 11:11:50 +0200 x2goclient (3.99.0.0-0~x2go1) unstable; urgency=low diff --git a/debian/control b/debian/control index 3ddbcf0..155f5ad 100644 --- a/debian/control +++ b/debian/control @@ -24,6 +24,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ssh, + libssh-4 (>= 0.4.7), nxproxy Suggests: pinentry-x2go diff --git a/debian/menu b/debian/menu index 117bdcc..2ce9d6c 100644 --- a/debian/menu +++ b/debian/menu @@ -1,6 +1,6 @@ ?package(x2goclient):\ needs="X11"\ section="Applications/Network/Communication"\ - title="X2GO QT Client"\ + title="X2GO Client (Qt)"\ icon="/usr/share/x2goclient/icons/x2goclient.xpm"\ command="/usr/bin/x2goclient" diff --git a/debian/rules b/debian/rules index 9605613..d82f357 100755 --- a/debian/rules +++ b/debian/rules @@ -9,10 +9,6 @@ override_dh_auto_build: mkdir -p .build_doxygen/man doxygen -override_dh_installdocs: - make -f Makefile.man2html build - dh_installdocs - override_dh_auto_install: override_dh_auto_clean: diff --git a/sshprocess.cpp b/sshprocess.cpp index 9e72e8f..41d150c 100644 --- a/sshprocess.cpp +++ b/sshprocess.cpp @@ -22,6 +22,7 @@ #ifndef Q_OS_WIN #include <arpa/inet.h> +#include <netinet/tcp.h> #endif #undef DEBUG @@ -88,6 +89,7 @@ void SshProcess::tunnelLoop() const char y=1; #endif setsockopt(serverSocket, SOL_SOCKET, SO_REUSEADDR,&y, sizeof(int)); + setsockopt(serverSocket, IPPROTO_TCP, TCP_NODELAY,&y, sizeof(int)); address.sin_family=AF_INET; address.sin_addr.s_addr=INADDR_ANY; diff --git a/version.h b/version.h index bc0e097..2179fd0 100644 --- a/version.h +++ b/version.h @@ -1 +1 @@ -#define VERSION "3.99.0.0" +#define VERSION "3.99.0.1" diff --git a/x2goplugin.rc b/x2goplugin.rc index 2d2b352..e0cf6ac 100644 --- a/x2goplugin.rc +++ b/x2goplugin.rc @@ -1,8 +1,8 @@ 1 TYPELIB "x2goplugin.rc" 1 VERSIONINFO - FILEVERSION 3,99,0,0 - PRODUCTVERSION 3,99,0,0 + FILEVERSION 3,99,0,1 + PRODUCTVERSION 3,99,0,1 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -21,13 +21,13 @@ BEGIN VALUE "FileDescription", "Allows you to start X2Go session in a webbrowser\0" VALUE "FileExtents", "x2go\0" VALUE "FileOpenName", "Configuration File for X2Go Session (*.x2go)\0" - VALUE "FileVersion", "3, 99, 0 ,0\0" + VALUE "FileVersion", "3, 99, 0 ,1\0" VALUE "InternalName", "x2goplugin\0" VALUE "LegalCopyright", "Copyright � 2010 Obviously Nice\0" VALUE "MIMEType", "application/x2go\0" VALUE "OriginalFilename", "npx2goplugin.dll\0" - VALUE "ProductName", "X2GoClient Plug-in 3.99.0.0\0" - VALUE "ProductVersion", "3, 99, 0, 0\0" + VALUE "ProductName", "X2GoClient Plug-in 3.99.0.1\0" + VALUE "ProductVersion", "3, 99, 0, 1\0" END END BLOCK "VarFileInfo" hooks/post-receive -- x2goclient.git (X2go Client) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goclient.git" (X2go Client).