[X2go-Commits] nxcompext.git - master (branch) updated: 3.4.0.2-8-g0e32b45
X2go dev team
git-admin at x2go.org
Tue Jul 12 00:35:15 CEST 2011
The branch, master has been updated
via 0e32b45f07db68ad7b48fc0dd2395601789532f6 (commit)
from 31d18d973420050a6360ac4f8f84926c00f3663d (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 0e32b45f07db68ad7b48fc0dd2395601789532f6
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Tue Jul 12 00:35:11 2011 +0200
Conflict with nxcompext.
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 1 +
debian/control | 4 ++++
2 files changed, 5 insertions(+), 0 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index defc67e..eba2ae2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ nxcompext (1:3.5.0-1-0~x2go1) UNRELEASED; urgency=low
[ Mike Gabriel ]
* Use mkinstalldirs to create installation dirs.
* Don't let the Makefile run fail on ldconfig failure.
+ * Conflict with nxcompext.
-- Reinhard Tartler <siretart at tauware.de> Wed, 29 Jun 2011 15:49:59 +0200
diff --git a/debian/control b/debian/control
index 01aca75..0e596e8 100644
--- a/debian/control
+++ b/debian/control
@@ -24,6 +24,8 @@ Architecture: any
Depends:
${shlibs:Depends},
${misc:Depends}
+Conflicts:
+ nxcompext
Description: NX X11 protocol compression extensions library
NX is a software suite from NoMachine which implements very efficient
compression of the X11 protocol. This increases performance when
@@ -41,6 +43,8 @@ Depends:
libxcomp-dev,
x11proto-core-dev,
libx11-dev
+Conflicts:
+ nxcompext-dev
Description: NX X11 protocol compression extensions library
NX is a software suite from NoMachine which implements very efficient
compression of the X11 protocol. This increases performance when
hooks/post-receive
--
nxcompext.git (NX compext 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 "nxcompext.git" (NX compext library).
More information about the x2go-commits
mailing list