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

[X2go dev team]

The branch, backport-lenny has been updated
       via  4b45173e7c0739f549973357d5c3e5b50ef600a7 (commit)
      from  ed61dcc65993147a00deaa1039eeb77b95cfad3d (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 4b45173e7c0739f549973357d5c3e5b50ef600a7
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Jul 17 21:15:50 2011 +0200

    Breaks/replaces package nxcompext.

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

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

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index a9bd7a5..efd414e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
 nxcompext (1:3.5.0-1-0~x2go-bpo1) UNRELEASED; urgency=low
 
   * Debian lenny backport.
-  * Conflict with package nxcompext.
+  * Breaks/replaces 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 d1c6164..dfa0160 100644
--- a/debian/control
+++ b/debian/control
@@ -25,8 +25,8 @@ Architecture: any
 Depends:
  ${shlibs:Depends},
  ${misc:Depends}
-Conflicts:
- nxcompext
+Breaks: nxcompext
+Replaces: 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
@@ -44,8 +44,8 @@ Depends:
  libxcomp-dev,
  x11proto-core-dev,
  libx11-dev
-Conflicts:
- nxcompext-dev
+Breaks: nxcompext-dev
+Replaces: 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).