[X2go-Commits] nxcomp.git - backport-lenny (branch) updated: 3.4.0.8-14-g5911145

[X2go dev team]

The branch, backport-lenny has been updated
       via  591114534f18b6f2feba64e13a3c1b4f299bc183 (commit)
      from  56b5ac06630ad2b615f7a4c9b8760099e4ded161 (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 591114534f18b6f2feba64e13a3c1b4f299bc183
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Jul 17 21:14:07 2011 +0200

    Breaks/replaces nxcomp package

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

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 2868683..15c3af5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
 nxcomp (3.5.0-1-0~x2go-bpo2) UNRELEASED; urgency=low
 
   * Debian lenny backport.
-  * conflict with nxcomp package
+  * Breaks/replaces nxcomp package
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Mon, 04 Jul 2011 15:35:13 +0200
 
diff --git a/debian/control b/debian/control
index 1c24385..1e6bc1a 100644
--- a/debian/control
+++ b/debian/control
@@ -22,8 +22,8 @@ Architecture: any
 Depends:
  ${shlibs:Depends},
  ${misc:Depends}
-Conflicts:
- nxcomp
+Breaks: nxcomp
+Replaces: nxcomp
 Description: NX X compression library
  NX provides a differential X compression library for X11.
  .
@@ -35,8 +35,8 @@ Architecture: any
 Depends:
  libxcomp3 (= ${binary:Version}),
  ${misc:Depends}
-Conflicts:
- nxcomp-dev
+Breaks: nxcomp-dev
+Replaces: 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).