[X2Go-Commits] x2goserver.git - master (branch) updated: 3.1.1.3-338-g83dad53

X2Go dev team git-admin at x2go.org
Fri Jan 3 18:00:37 CET 2014


The branch, master has been updated
       via  83dad53cce8c1ba9dc61441cf0cb944cf86ceb61 (commit)
      from  57251fd77eb59f2150fb68bee93571c38ced6a93 (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 83dad53cce8c1ba9dc61441cf0cb944cf86ceb61
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Jan 3 11:36:04 2014 +0100

    release 4.0.1.10 (cherry-picked from release/4.0.1.x branch)
    
    Conflicts (resolved by Mike Gabriel):
    	debian/changelog

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

Summary of changes:
 debian/changelog |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 38d2174..ba72550 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -96,7 +96,7 @@ x2goserver (4.1.0.0-0x2go1) UNRELEASED; urgency=low
 
  -- Reinhard Tartler <siretart at tauware.de>  Thu, 20 Dec 2012 10:15:26 +0100
 
-x2goserver (4.0.1.10-0x2go1) UNRELEASED; urgency=low
+x2goserver (4.0.1.10-0x2go1) unstable; urgency=low
 
   * New upstream version (4.0.1.10):
     - Fix x2goresume-session. The several parameters placed into the NX options
@@ -108,9 +108,9 @@ x2goserver (4.0.1.10-0x2go1) UNRELEASED; urgency=low
     - x2goserver-printing/Makefile: create feature.d directory before installing
       files into it.
     - Handle TCP listening of x2goagent in x2goagent.options. (Fixes: #354).
-    - Clean up Makefiles, remove commented out line.
+    - Clean up Makefiles, remove commented out lines.
     - Use xkb ruleset 'base' rather than xfree86 as on RHEL systems the
-      xfree86 symlink to base rulset does not exist.
+      xfree86 symlink to base ruleset does not exist.
     - Grab systemd service file from Fedora and ship it upstream.
     - Provide RHEL/Fedora support in x2goserver-xsession.
     - Only sanity check for existence of /etc/x2go/Xsession.d on Debian
@@ -123,7 +123,7 @@ x2goserver (4.0.1.10-0x2go1) UNRELEASED; urgency=low
       package.
     + Clear (Fedora package) changelog.
 
- -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Thu, 28 Nov 2013 16:16:22 +0100
+ -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Fri, 03 Jan 2014 11:34:36 +0100
 
 x2goserver (4.0.1.9-0x2go1) unstable; urgency=low
 


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).




More information about the x2go-commits mailing list