[X2go-Commits] nxcompext.git - master (branch) updated: 3.4.0.2-9-ge912462

[X2go dev team]

The branch, master has been updated
       via  e91246225ff2a69810120f157a880dd5364f9aa5 (commit)
      from  0e32b45f07db68ad7b48fc0dd2395601789532f6 (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 e91246225ff2a69810120f157a880dd5364f9aa5
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Jul 17 21:17:08 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 eba2ae2..8c87614 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,7 +6,7 @@ nxcompext (1:3.5.0-1-0~x2go1) UNRELEASED; urgency=low
   [ Mike Gabriel ]
   * Use mkinstalldirs to create installation dirs.
   * Don't let the Makefile run fail on ldconfig failure.
-  * Conflict with nxcompext.
+  * Breaks/replaces package nxcompext.
 
  -- Reinhard Tartler <siretart at tauware.de>  Wed, 29 Jun 2011 15:49:59 +0200
 
diff --git a/debian/control b/debian/control
index 0e596e8..1b33397 100644
--- a/debian/control
+++ b/debian/control
@@ -24,8 +24,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
@@ -43,8 +43,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).