[X2go-Commits] x2goserver.git - backport-lenny (branch) updated: 3.0.99-2-72-g0e7d4ea

[X2go dev team]

The branch, backport-lenny has been updated
       via  0e7d4eacdaa09c0bcbaef8d0185e6a27e3d44e94 (commit)
      from  ca1cf7fb4b7a0ce415998dbc768da382283d9556 (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 0e7d4eacdaa09c0bcbaef8d0185e6a27e3d44e94
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Jul 13 23:04:40 2011 +0200

    Conflict with old x2goserver-* packages (-home, -one) and x2goprint package.

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

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

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 5061f5b..20a241b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ x2goserver (3.0.99.5-0~x2go-bpo1) UNRELEASED; urgency=low
   * Debian lenny backport.
   * Fix for x2gomountdirs, now also usernames containing blanks can use local
     folder sharing.
+  * Conflict with old x2goserver-* packages (-home, -one) and x2goprint package.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Mon, 04 Jul 2011 14:50:35 +0200
 
diff --git a/debian/control b/debian/control
index cd555b4..bf30438 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).