The branch, master has been updated via c9af53b1a2373baf71282e65ba260171d2a22687 (commit) from de5e4c62a278547a610a0ab58aa4d2b76753271b (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 c9af53b1a2373baf71282e65ba260171d2a22687 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sun Jul 17 21:12:46 2011 +0200 Breaks/replaces nxcomp package. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 +- debian/control | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 53e150a..bc6aedc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,7 +7,7 @@ nxcomp (3.5.0-1-0~x2go1) UNRELEASED; urgency=low [ Mike Gabriel ] * User mkinstalldirs to create install paths. * Don't let Makefile run fail if ldconfig fails. - * Conflict with nxcomp package. + * Breaks/replaces nxcomp package. -- Reinhard Tartler <siretart@tauware.de> Wed, 29 Jun 2011 15:41:10 +0200 diff --git a/debian/control b/debian/control index c5ec5e3..4cefc39 100644 --- a/debian/control +++ b/debian/control @@ -23,8 +23,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. . @@ -34,10 +34,10 @@ Package: libxcomp-dev Section: libdevel Architecture: any Depends: - libxcomp3 (= ${binary:Version}), + libxcoBmp3 (= ${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).