[X2go-Commits] x2goclient.git - build-main (branch) updated: 3.99.2.2-3-gc75080d

[X2Go dev team]

The branch, build-main has been updated
       via  c75080d0571c29aa8a75b52e02a7a90610144739 (commit)
       via  9435e0168786933381c4d805e7a1fff60ada5185 (commit)
       via  462dcfefe3013bdd4c10fd4614eb884e5017ee4a (commit)
      from  a0461e289073d223db2f486fa171f7fbd3be7707 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

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

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index deb8d65..28dec6a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+x2goclient (3.99.2.2-0~x2go2) unstable; urgency=low
+
+  * Add Conflicts/Replaces for x2goclient-gtk.
+
+ -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Mon, 20 Aug 2012 09:58:47 +0200
+
 x2goclient (3.99.2.2-0~x2go1) unstable; urgency=low
 
   [ Mike Gabriel ]
diff --git a/debian/control b/debian/control
index e522b31..f58d02b 100644
--- a/debian/control
+++ b/debian/control
@@ -30,7 +30,11 @@ Depends:
 Recommends:
  openssh-server
 Suggests:
- pinentry-x2go 
+ pinentry-x2go
+Conflicts:
+ x2goclient-gtk
+Replaces:
+ x2goclient-gtk
 Description: X2Go Client application (Qt4)
  X2Go is a serverbased computing environment with
     - session resuming


hooks/post-receive
-- 
x2goclient.git (X2Go Client)

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 "x2goclient.git" (X2Go Client).