[X2go-Commits] nxcomp.git - master (branch) updated: 3.4.0.8-7-gde5e4c6

[X2go dev team]

The branch, master has been updated
       via  de5e4c62a278547a610a0ab58aa4d2b76753271b (commit)
      from  109f5bf285c1610f9ff7431524d821dd0332941f (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 de5e4c62a278547a610a0ab58aa4d2b76753271b
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Jul 12 00:25:13 2011 +0200

    Conflict with nxcomp package.

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

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

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 3b9eb3a..53e150a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,13 @@
 nxcomp (3.5.0-1-0~x2go1) UNRELEASED; urgency=low
 
+  [ Reinhard Tartler ]
   [Reinhard Tartler]
   * New upstream version
 
-  [Mike Gabriel]
+  [ Mike Gabriel ]
   * User mkinstalldirs to create install paths.
   * Don't let Makefile run fail if ldconfig fails.
+  * Conflict with nxcomp package.
 
  -- Reinhard Tartler <siretart at tauware.de>  Wed, 29 Jun 2011 15:41:10 +0200
 
diff --git a/debian/control b/debian/control
index 83f2d63..c5ec5e3 100644
--- a/debian/control
+++ b/debian/control
@@ -23,6 +23,8 @@ Architecture: any
 Depends:
  ${shlibs:Depends},
  ${misc:Depends}
+Conflicts:
+ nxcomp
 Description: NX X compression library
  NX provides a differential X compression library for X11.
  .
@@ -34,6 +36,8 @@ Architecture: any
 Depends:
  libxcomp3 (= ${binary:Version}),
  ${misc:Depends}
+Conflicts:
+ nxcomp-dev
 Description: NX X compression library-headers
  NX provides a differential X compression library for X11.
  .


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