[X2go-Commits] x2gognomebindings.git - master (branch) updated: 2.0.1.6-6-g062d7c7

[X2Go dev team]

The branch, master has been updated
       via  062d7c765bca0c396283e07463a7637cab486c03 (commit)
      from  6a117ff7e29605b0368d52a67896fd8fe86543c8 (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 062d7c765bca0c396283e07463a7637cab486c03
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Oct 24 15:41:47 2012 +0200

    This package is a GNOME2-only package, so conflicting with gnome-session (>= 3).

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

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

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 2ab6edb..c03afa0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ x2gognomebindings (2.0.1.7-0~x2go1) UNRELEASED; urgency=low
   * /debian/control:
     + Maintainer change in package: X2Go Developers <x2go-dev at lists.berlios.de>.
     + Priorty: optional.
+    + This package is a GNOME2-only package, so conflicting with gnome-session
+      (>= 3).
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Mon, 02 Jul 2012 14:34:20 +0200
 
diff --git a/debian/control b/debian/control
index dfbd70b..77ae26b 100644
--- a/debian/control
+++ b/debian/control
@@ -33,6 +33,8 @@ Depends:
  gnome-menus,
  gnome-colors-common,
  desktop-file-utils
+Conflicts:
+ gnome-session (>= 3)
 Description: Description: x2gognomebindings (GNOME mimetypes for X2go)
  X2go is a server based computing environment with
     - session resuming


hooks/post-receive
-- 
x2gognomebindings.git (GNOME bindings for X2Go)

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 "x2gognomebindings.git" (GNOME bindings for X2Go).