[X2go-Commits] x2goclient.git - build-main (branch) updated: 3.99.0.0-6-g00a42cb
X2go dev team
git-admin at x2go.org
Mon Aug 1 22:59:21 CEST 2011
The branch, build-main has been updated
via 00a42cb5fd5abad78d8d7361b864dfeb5c7379fa (commit)
via eeeb64ec0357edbb0393e796bd6ec5e7c87ff2be (commit)
via aab8c693ff951bb28fb07bf1e8ffa86fdb43da68 (commit)
via 7b3aff4aea00c440a4cda011b784c92f2b54f185 (commit)
via cfea20d61e3dee68ab5e4031d3ddd299779f9a6e (commit)
via 74bb099f641ca6393efffd1f81fef0ffa57734d7 (commit)
from acdb1da43cb0d50655730f98e8bf1e6a4305b57d (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:
.build_man2html/html/man1/x2goclient.1.html | 145 ---------------------------
Makefile | 11 ++-
Makefile.docupload | 20 ++++
debian/changelog | 7 ++
debian/control | 2 +-
debian/rules | 4 +
debian/source/format | 1 +
7 files changed, 43 insertions(+), 147 deletions(-)
delete mode 100644 .build_man2html/html/man1/x2goclient.1.html
create mode 100644 Makefile.docupload
create mode 100644 debian/source/format
The diff of changes is:
diff --git a/.build_man2html/html/man1/x2goclient.1.html b/.build_man2html/html/man1/x2goclient.1.html
deleted file mode 100644
index 1e6d7c4..0000000
--- a/.build_man2html/html/man1/x2goclient.1.html
+++ /dev/null
@@ -1,145 +0,0 @@
-Content-type: text/html
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML><HEAD><TITLE>Man page of x2goclient</TITLE>
-</HEAD><BODY>
-<H1>x2goclient</H1>
-Section: X2go Client (Qt4) (1)<BR>Updated: July 2011<BR><A HREF="#index">Index</A>
-<A HREF="../index.html">Return to Main Contents</A><HR>
-
-<A NAME="lbAB"> </A>
-<H2>NAME</H2>
-
-x2goclient - Client application to launch server-side X2go sessions.
-<A NAME="lbAC"> </A>
-<H2>SYNOPSIS</H2>
-
-
-
-
-<B>x2goclient</B> <options>
-<P>
-<A NAME="lbAD"> </A>
-<H2>DESCRIPTION</H2>
-
-<B>x2goclient</B> is a GUI application for launching server-side X2go sessions.
-<P>
-
-<A NAME="lbAE"> </A>
-<H2>OPTIONS</H2>
-
-<B>x2goclient</B> has the following options:
-<DL COMPACT>
-<DT><B>--help-pack</B><DD>
-Show available pack methods and exit.
-<DT><B>--no-menu</B><DD>
-Hide menu-/toolbar (default: false).
-<DT><B>--maximize</B><DD>
-Start client maximized (default: false).
-<DT><B>--hide</B><DD>
-Hide client (start hidden, default: false).
-<DT><B>--client-ssh-port</B><DD>
-Local ssh port (for filesystem export, default: 22).
-<DT><B>--user</B><DD>
-Pre-selection of user at client startup (LDAP mode).
-</DL>
-<A NAME="lbAF"> </A>
-<H2>PROFILING SESSIONS GLOBALLY</H2>
-
-You can pre-profile sessions globally using the following options. They will override the options in the session profiles.
-<DL COMPACT>
-<DT><B>--command</B><DD>
-Default command for session startup.
-<DT><B>--sessionid</B><DD>
-Pre-selection of session ID at client startup.
-<DT><B>--ssh-port</B><DD>
-Use this TCP/IP port for connection (default: 22).
-<DT><B>--link</B><DD>
-Set default link type (modem,isdn,adsl,wan or lan, default: adsl).
-<DT><B>--pack</B><DD>
-Set default pack method (default: '16m-jpeg').
-<DT><B>--quality</B><DD>
-Set default image quality(0-9, default: 9).
-<DT><B>--set-kbd</B><DD>
-Overwrite current keyboard settings, no override by default.
-<DT><B>--kbd-layout</B><DD>
-Set keyboard layout (default: 'de').
-<DT><B>--kbd-type</B><DD>
-Set keyboard type (default: pc105/de).
-<DT><B>--fullscreen</B><DD>
-Start session in fullscreen mode.
-<DT><B>--width</B><DD>
-Start session with this width (default: 800).
-<DT><B>--sound</B><DD>
-Activate sound for session, not enabled by default.
-<DT><B>--sound-system</B><DD>
-Which soundsystem to use: arts, esd, pulse (default: arts).
-</DL>
-<A NAME="lbAG"> </A>
-<H2>THIN CLIENT OPTIONS</H2>
-
-The following command line options are primarily interesting if <B>x2goclient</B> is used
-as a login manager on X2go thin clients.
-<DL COMPACT>
-<DT><B>--session=<session-profile-name></B><DD>
-Pre-selection of session at client startup.
-<DT><B>--no-session-edit</B><DD>
-Disable session editing.
-<DT><B>--pgp-card</B><DD>
-Use openPGP Card authentication (default: false).
-<DT><B>--external-login=<smartcard-logins></B><DD>
-Authenticate via SMART card, path to login notification file.
-<DT><B>--add-to-known-hosts</B><DD>
-Add DSA/RSA host key fingerprint to .ssh/known_hosts in case of "authenticity of server can't be established".
-<DT><B>--read-exports-from</B><DD>
-Specifies a directory where some external mechanism (e.g. script) can notify <B>x2goclient</B> on
-new block devices (CD/DVDs, USB sticks, etc.).
-</DL>
-<A NAME="lbAH"> </A>
-<H2>LDAP OPTIONS</H2>
-
-In case you want to provide <B>x2goclient</B> session profiles from LDAP use the following options:
-<DL COMPACT>
-<DT><B>--ldap</B><DD>
-Start with LDAP support (disabled by default).
-<DT><B>--basedn</B><DD>
-Base DN to search in LDAP.
-<DT><B>--ldap-server</B><DD>
-LDAP Server hostname.
-<DT><B>--ldap-port</B><DD>
-LDAP Server portnumber (default: 389).
-<DT><B>--ldap-server1</B><DD>
-Failover LDAP Server hostname.
-<DT><B>--ldap-port1</B><DD>
-Failover LDAP Server portnumber (default: 389).
-<DT><B>--ldap-server2</B><DD>
-Failover LDAP Server hostname.
-</DL>
-<P>
-
-<A NAME="lbAI"> </A>
-<H2>AUTHOR</H2>
-
-This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel at das-netzwerkteam.de">mike.gabriel at das-netzwerkteam.de</A>> for the X2go project
-(<A HREF="http://www.x2go.org).">http://www.x2go.org).</A>
-<P>
-
-<HR>
-<A NAME="index"> </A><H2>Index</H2>
-<DL>
-<DT><A HREF="#lbAB">NAME</A><DD>
-<DT><A HREF="#lbAC">SYNOPSIS</A><DD>
-<DT><A HREF="#lbAD">DESCRIPTION</A><DD>
-<DT><A HREF="#lbAE">OPTIONS</A><DD>
-<DT><A HREF="#lbAF">PROFILING SESSIONS GLOBALLY</A><DD>
-<DT><A HREF="#lbAG">THIN CLIENT OPTIONS</A><DD>
-<DT><A HREF="#lbAH">LDAP OPTIONS</A><DD>
-<DT><A HREF="#lbAI">AUTHOR</A><DD>
-</DL>
-<HR>
-This document was created by
-<A HREF="/cgi-bin/man/man2html">man2html</A>,
-using the manual pages.<BR>
-Time: 19:44:02 GMT, July 11, 2011
-</BODY>
-</HTML>
diff --git a/Makefile b/Makefile
index cf1f9cc..b4a5c6d 100755
--- a/Makefile
+++ b/Makefile
@@ -35,7 +35,13 @@ build_plugin:
mkdir -p $(PLUGIN_DIR) && cd $(PLUGIN_DIR) && X2GO_CLIENT_TARGET=plugin qmake-qt4 ../x2goclient.pro
cd $(PLUGIN_DIR) && $(MAKE)
-clean: clean_client clean_plugin
+clean: clean_client clean_plugin clean_man
+ find . -type f -name '*.o' -exec rm -vf {} +
+ find . -type f -name 'moc_*.cpp' -exec rm -vf {} +
+ find . -type f -name 'ui_*.h' -exec rm -vf {} +
+ find . -type f -name 'qrc_*.cpp' -exec rm -vf {} +
+ rm -f x2goclient
+ rm -f x2goclient.tag
clean_client:
rm -fr $(CLIENT_DIR)
@@ -43,6 +49,9 @@ clean_client:
clean_plugin:
rm -fr $(PLUGIN_DIR)
+clean_man:
+ rm -Rfv .build_man2html
+
install: install_client install_plugin install_man
install_client:
diff --git a/Makefile.docupload b/Makefile.docupload
new file mode 100644
index 0000000..fa2190f
--- /dev/null
+++ b/Makefile.docupload
@@ -0,0 +1,20 @@
+#!/usr/bin/make -f
+# Makefile.docupload file - for x2goclient
+# Copyright 2010-2011 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>, GPLv3 applies to this file
+
+VERSION=`head -n1 debian/changelog | sed 's,.*(\(.*\)).*,\1,' | cut -d"-" -f1`
+DOC_HOST=code.x2go.org
+DOC_PATH=/srv/sites/x2go.org/packages/doc/x2goclient/man/
+DOC_USER=x2go-admin
+
+doc: docbuild docupload
+
+docbuild:
+ make -f Makefile.man2html build_man2html
+
+docupload:
+
+ ssh -l${DOC_USER} ${DOC_HOST} "{ mkdir -p ${DOC_PATH}; rm -Rfv ${DOC_PATH}/*; }"
+ scp -r .build_man2html/html/* ${DOC_USER}@${DOC_HOST}:${DOC_PATH}/
+
+
diff --git a/debian/changelog b/debian/changelog
index d6ca411..48de32c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+x2goclient (3.99.0.0-0~x2go2) UNRELEASED; urgency=low
+
+ * Explicitly use source format 3.0 (native).
+ * Build-depend on libssh-dev (>=0.4.7).
+
+ -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Tue, 26 Jul 2011 14:37:20 +0200
+
x2goclient (3.99.0.0-0~x2go1) unstable; urgency=low
[ Oleksandr Shneyder ]
diff --git a/debian/control b/debian/control
index ec189fa..3ddbcf0 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends:
debhelper (>= 7.0.50~),
libqt4-dev,
libldap2-dev,
- libssh-dev,
+ libssh-dev (>= 0.4.7),
libcups2-dev,
libx11-dev,
doxygen,
diff --git a/debian/rules b/debian/rules
index ced449f..9605613 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,3 +14,7 @@ override_dh_installdocs:
dh_installdocs
override_dh_auto_install:
+
+override_dh_auto_clean:
+ rm -Rfv .build_doxygen
+ dh_auto_clean
\ No newline at end of file
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..89ae9db
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (native)
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).
More information about the x2go-commits
mailing list