[X2go-Commits] nxcompext.git - backport-lenny (branch) updated: 3.4.0.2-10-ged61dcc

[X2go dev team]

The branch, backport-lenny has been updated
       via  ed61dcc65993147a00deaa1039eeb77b95cfad3d (commit)
      from  83b6a4e47bdb42529d61d47069af97157bdb0f8e (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 ed61dcc65993147a00deaa1039eeb77b95cfad3d
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Jul 12 00:36:33 2011 +0200

    Conflict with package nxcompext.

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

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

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 1855b05..a9bd7a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 nxcompext (1:3.5.0-1-0~x2go-bpo1) UNRELEASED; urgency=low
 
   * Debian lenny backport.
+  * Conflict with package nxcompext.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Mon, 04 Jul 2011 17:17:16 +0200
 
diff --git a/debian/control b/debian/control
index d3cc697..d1c6164 100644
--- a/debian/control
+++ b/debian/control
@@ -25,6 +25,8 @@ Architecture: any
 Depends:
  ${shlibs:Depends},
  ${misc:Depends}
+Conflicts:
+ nxcompext
 Description: NX X11 protocol compression extensions library
  NX is a software suite from NoMachine which implements very efficient
  compression of the X11 protocol. This increases performance when
@@ -42,6 +44,8 @@ Depends:
  libxcomp-dev,
  x11proto-core-dev,
  libx11-dev
+Conflicts:
+ nxcompext-dev
 Description: NX X11 protocol compression extensions library
  NX is a software suite from NoMachine which implements very efficient
  compression of the X11 protocol. This increases performance when


hooks/post-receive
-- 
nxcompext.git (NX compext library)

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 "nxcompext.git" (NX compext library).