The branch, master has been updated via 654dbf053c060043dcac953a0007a8f8495a622f (commit) from 62ed93b79d2e3880f6f837ecf9a4f033cd26bda5 (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 654dbf053c060043dcac953a0007a8f8495a622f Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Jul 12 00:29:26 2011 +0200 Conflict with package nxcompshad. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + debian/control | 12 ++++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index b504cb6..9b5c01e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +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. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 30 Jun 2011 17:51:34 +0200 diff --git a/debian/control b/debian/control index 457dd53..7da2db9 100644 --- a/debian/control +++ b/debian/control @@ -20,7 +20,11 @@ Vcs-Browser: http://code.x2go.org/gitweb?p=nxcompshad.git;a=summary Package: libxcompshad3 Section: x11 Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: + ${shlibs:Depends}, + ${misc:Depends} +Conflicts: + 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 @@ -31,7 +35,11 @@ Description: NX shadowing library Package: libxcompshad-dev Section: libdevel Architecture: any -Depends: libxcompshad3 (=${binary:Version}), ${misc:Depends} +Depends: + libxcompshad3 (=${binary:Version}), + ${misc:Depends} +Conflicts: + 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).