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

[X2go dev team]

The branch, master has been updated
       via  e1c116e2ad6958f86573da9bea2b0428608726e9 (commit)
      from  90f7556e461cd5f626f7a53e0d874a274a6c58da (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 e1c116e2ad6958f86573da9bea2b0428608726e9
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Jul 17 21:57:37 2011 +0200

    Breaks/replaces packages: x2goserver-one, x2goserver-home, x2goprint (instead of Conflicts).

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

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

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 7b83786..01aa4fd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ x2goserver (3.0.99.5-0~x2go3) UNRELEASED; urgency=low
     from perlsuid.
   * 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).
 
   [Martin Oehler]
   * Removes old debug code fragment, fixes x2golistsessions parsing.
diff --git a/debian/control b/debian/control
index 3919e2a..d8eabca 100644
--- a/debian/control
+++ b/debian/control
@@ -37,7 +37,11 @@ Recommends:
  x11-xserver-utils,
  xinit,
  x2goserver-extensions (= ${source:Version})
-Conflicts:
+Breaks:
+ x2goserver-one,
+ x2goserver-home,
+ x2goprint
+Replaces:
  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).