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

X2go dev team git-admin at x2go.org
Wed Jul 13 23:11:46 CEST 2011


The branch, backport-lenny has been updated
       via  56b5ac06630ad2b615f7a4c9b8760099e4ded161 (commit)
      from  c85dc021233478fa99e0154cfd28af4e57152d20 (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 56b5ac06630ad2b615f7a4c9b8760099e4ded161
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Jul 13 23:12:00 2011 +0200

    fix for Conflicts stanzas

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

Summary of changes:
 debian/control |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

The diff of changes is:
diff --git a/debian/control b/debian/control
index 4ac8aee..1c24385 100644
--- a/debian/control
+++ b/debian/control
@@ -22,6 +22,8 @@ Architecture: any
 Depends:
  ${shlibs:Depends},
  ${misc:Depends}
+Conflicts:
+ nxcomp
 Description: NX X compression library
  NX provides a differential X compression library for X11.
  .
@@ -34,7 +36,7 @@ Depends:
  libxcomp3 (= ${binary:Version}),
  ${misc:Depends}
 Conflicts:
- nxcomp
+ 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).




More information about the x2go-commits mailing list