[X2go-Commits] nxcompshad.git - backport-lenny (branch) updated: 3.4.0.4-7-gc16e989

[X2go dev team]

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

    Conflict with package nxcompshad.

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

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

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 0e333d6..0603dd3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 nxcompshad (3.5.0-2-0~x2go-bpo1) UNRELEASED; urgency=low
 
   * Debian lenny backport.
+  * Conflict with package nxcompshad.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Mon, 04 Jul 2011 17:38:18 +0200
 
diff --git a/debian/control b/debian/control
index 82134b6..7968c46 100644
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,11 @@ Vcs-Browser: http://code.x2go.org/gitweb?p=nxcompshad.git;a=summary
 Package: libxcompshad3
 Section: x11
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends}
+Conflicts:
+ nxcompshad
 Description: NX shadowing library
  NX is a software suite from NoMachine which implements very efficient
  compression of the X11 protocol. This increases performance when
@@ -31,7 +35,11 @@ Description: NX shadowing library
 Package: libxcompshad-dev
 Section: libdevel
 Architecture: any
-Depends: libxcompshad3 (=${binary:Version}), ${misc:Depends}
+Depends:
+ libxcompshad3 (=${binary:Version}),
+ ${misc:Depends}
+Conflicts:
+ nxcompshad-dev
 Description: NX shadowing library
  NX is a software suite from NoMachine which implements very efficient
  compression of the X11 protocol. This increases performance when


hooks/post-receive
-- 
nxcompshad.git (NX compshad 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 "nxcompshad.git" (NX compshad library).