[X2go-Commits] nxcomp.git - backport-lenny (branch) updated: 3.4.0.8-12-gc85dc02
X2go dev team
git-admin at x2go.org
Tue Jul 12 00:23:24 CEST 2011
The branch, backport-lenny has been updated
via c85dc021233478fa99e0154cfd28af4e57152d20 (commit)
from d4c4191c5f65664d7a29b46d9f6f8820f61dc0c3 (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 c85dc021233478fa99e0154cfd28af4e57152d20
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Tue Jul 12 00:23:19 2011 +0200
conflict with nxcomp package
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 3 ++-
debian/control | 2 ++
2 files changed, 4 insertions(+), 1 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 6411da7..2868683 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
-nxcomp (3.5.0-1-0~x2go-bpo1) UNRELEASED; urgency=low
+nxcomp (3.5.0-1-0~x2go-bpo2) UNRELEASED; urgency=low
* Debian lenny backport.
+ * conflict with nxcomp package
-- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Mon, 04 Jul 2011 15:35:13 +0200
diff --git a/debian/control b/debian/control
index f53399e..4ac8aee 100644
--- a/debian/control
+++ b/debian/control
@@ -33,6 +33,8 @@ Architecture: any
Depends:
libxcomp3 (= ${binary:Version}),
${misc:Depends}
+Conflicts:
+ nxcomp
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