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

[X2go dev team]

The branch, master has been updated
       via  9a543cfb8912f47916595a50174b76188a1372c3 (commit)
      from  86bdb10a909b6fc0264a719e1f5356e43ab42230 (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 9a543cfb8912f47916595a50174b76188a1372c3
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Jul 12 00:20:42 2011 +0200

    really conflict with x2goserver-* and x2goprint packages

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

Summary of changes:
 debian/control |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

The diff of changes is:
diff --git a/debian/control b/debian/control
index 7a64da7..8fcc957 100644
--- a/debian/control
+++ b/debian/control
@@ -37,7 +37,7 @@ Recommends:
  x11-xserver-utils,
  xinit,
  x2goserver-extensions (= ${source:Version})
-Replaces:
+Conflicts:
  x2goserver-one,
  x2goserver-home,
  x2goprint


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