The branch, master has been updated via e0c24c7d40918090ffa5094a396c3ca660db20a1 (commit) from 654dbf053c060043dcac953a0007a8f8495a622f (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 e0c24c7d40918090ffa5094a396c3ca660db20a1 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sun Jul 17 21:19:24 2011 +0200 Breaks/replaces package nxcompshad. ----------------------------------------------------------------------- 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 9b5c01e..9325ded 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,7 +2,7 @@ nxcompshad (3.5.0-2-0~x2go2) UNRELEASED; urgency=low * Add dh-autoreconf as build-dep * Don't let the Makefile run fail on ldconfig failure. - * Conflict with package nxcompshad. + * Breaks/replaces package nxcompshad. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 30 Jun 2011 17:51:34 +0200 diff --git a/debian/control b/debian/control index 7da2db9..73b7eff 100644 --- a/debian/control +++ b/debian/control @@ -23,8 +23,8 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Conflicts: - nxcompshad +Breaks: nxcompshad +Replaces: 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 @@ -38,8 +38,8 @@ Architecture: any Depends: libxcompshad3 (=${binary:Version}), ${misc:Depends} -Conflicts: - nxcompshad-dev +Breaks: nxcompshad-dev +Replaces: 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).