[X2go-Commits] x2goserver.git - master (branch) updated: 3.0.99-2-203-g91df3ab

[X2go dev team]

The branch, master has been updated
       via  91df3abe9a3d7a4d52682ae02945b86a38fec9f4 (commit)
       via  f72964ba00aa53c2dd67a23dbb37827c1b73997c (commit)
      from  e1b0751932f8194863331db0d7729c90db4497c7 (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 -----------------------------------------------------------------
commit 91df3abe9a3d7a4d52682ae02945b86a38fec9f4
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Aug 30 09:29:02 2011 +0200

    Man pages of compat package moved to section 8, add man page for compat script x2gosuspend-agent, fix man page header of x2gosuspend man page.

commit f72964ba00aa53c2dd67a23dbb37827c1b73997c
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Aug 30 09:26:41 2011 +0200

    Lintian fix: debian-changelog-line-too long.

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                                   |    5 +++--
 debian/rules                                       |    1 -
 .../x2gosuspend.1 => man8/x2gosuspend-agent.8}     |    6 +++---
 .../man/{man1/x2gosuspend.1 => man8/x2gosuspend.8} |    2 +-
 .../{man1/x2goterminate.1 => man8/x2goterminate.8} |    0
 .../man/{man1/x2goumount.1 => man8/x2goumount.8}   |    0
 6 files changed, 7 insertions(+), 7 deletions(-)
 copy x2goserver-compat/man/{man1/x2gosuspend.1 => man8/x2gosuspend-agent.8} (70%)
 rename x2goserver-compat/man/{man1/x2gosuspend.1 => man8/x2gosuspend.8} (89%)
 rename x2goserver-compat/man/{man1/x2goterminate.1 => man8/x2goterminate.8} (100%)
 rename x2goserver-compat/man/{man1/x2goumount.1 => man8/x2goumount.8} (100%)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 18f0c53..c7cb3f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,7 +14,7 @@ x2goserver (3.0.99.5-0~x2go3) UNRELEASED; urgency=low
   * Use source format 3.0 (native).
   * Fix of Debian clean rules, fix of Makefile's clean rules.
   * Breaks/replaces packages: x2goserver-one, x2goserver-home, x2goprint
-    (instead of Conflicts).
+    (instead ofB Conflicts).
   * Switch to setgid instead of setuid for SQLite wrapper.
   * Tab'ified postinst/postrm scripts.
   * Store SQLite db in /var/lib/x2go to comply to latest FHS.
@@ -32,7 +32,8 @@ x2goserver (3.0.99.5-0~x2go3) UNRELEASED; urgency=low
   * Fix for TERMINAL command execution if konsole (KDE4) is installed on the
     server (closes upstream issue #87).
   * Silence x2golistsessions on missing session.log files.
-  * Create x2goprint user/group on package installation, add same info to INSTALL howto.
+  * Create x2goprint user/group on package installation, add same info to 
+    INSTALL howto.
   * Change permissions on x2goprint, using 2755:root:x2goprint (setgid).
   * Change X2go printing concept: use setgit and a sgid wrapper instead of sudo.
   * Makefile update for x2goprint setgid wrapper.
diff --git a/debian/rules b/debian/rules
index 2af70c1..b32e08d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,4 +11,3 @@ override_dh_auto_clean:
 	rm -Rfv x2goserver/.build_html
 	rm -Rfv x2goserver-extensions/.build_html
 	dh_auto_clean
-
diff --git a/x2goserver-compat/man/man1/x2gosuspend.1 b/x2goserver-compat/man/man8/x2gosuspend-agent.8
similarity index 70%
copy from x2goserver-compat/man/man1/x2gosuspend.1
copy to x2goserver-compat/man/man8/x2gosuspend-agent.8
index 44d0fa9..e6e8116 100644
--- a/x2goserver-compat/man/man1/x2gosuspend.1
+++ b/x2goserver-compat/man/man8/x2gosuspend-agent.8
@@ -5,14 +5,14 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH x2gomount 1 "18 May 2011" "Version 3.0.99.x" "X2go Server Tool"
+.TH x2gosuspend-agent 1 "18 May 2011" "Version 3.0.99.x" "X2go Server Tool"
 .SH NAME
-x2gosuspend \- X2go Server Script (deprecated, shipped for compatibility with old clients)
+x2gosuspend-agent \- X2go Server Script (deprecated, shipped for compatibility with old clients)
 .SH SYNOPSIS
 'nh
 .fi
 .ad l
-x2gosuspend <session-name>
+x2gosuspend-agent <session-name>
 
 .SH DESCRIPTION
 \fBx2gosuspend\fR is a deprecated script belonging to X2go Server. The availability of this script
diff --git a/x2goserver-compat/man/man1/x2gosuspend.1 b/x2goserver-compat/man/man8/x2gosuspend.8
similarity index 89%
rename from x2goserver-compat/man/man1/x2gosuspend.1
rename to x2goserver-compat/man/man8/x2gosuspend.8
index 44d0fa9..af119ee 100644
--- a/x2goserver-compat/man/man1/x2gosuspend.1
+++ b/x2goserver-compat/man/man8/x2gosuspend.8
@@ -5,7 +5,7 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH x2gomount 1 "18 May 2011" "Version 3.0.99.x" "X2go Server Tool"
+.TH x2gosuspend 1 "18 May 2011" "Version 3.0.99.x" "X2go Server Tool"
 .SH NAME
 x2gosuspend \- X2go Server Script (deprecated, shipped for compatibility with old clients)
 .SH SYNOPSIS
diff --git a/x2goserver-compat/man/man1/x2goterminate.1 b/x2goserver-compat/man/man8/x2goterminate.8
similarity index 100%
rename from x2goserver-compat/man/man1/x2goterminate.1
rename to x2goserver-compat/man/man8/x2goterminate.8
diff --git a/x2goserver-compat/man/man1/x2goumount.1 b/x2goserver-compat/man/man8/x2goumount.8
similarity index 100%
rename from x2goserver-compat/man/man1/x2goumount.1
rename to x2goserver-compat/man/man8/x2goumount.8


hooks/post-receive
-- 
x2goserver.git (X2go Server)

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 "x2goserver.git" (X2go Server).