[X2go-Commits] nxcompshad.git - backport-lenny (branch) updated: 3.4.0.4-8-g541c10a
X2go dev team
git-admin at x2go.org
Sun Jul 17 21:19:29 CEST 2011
The branch, backport-lenny has been updated
via 541c10a979477e20c651513c10004677e174f154 (commit)
from c16e989b78fc5703f9b5db6f7c8f2f8487a4f205 (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 541c10a979477e20c651513c10004677e174f154
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Sun Jul 17 21:18:23 2011 +0200
Breaks/replaces package nxcompshad.
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 2 +-
debian/control | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 0603dd3..9645009 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
nxcompshad (3.5.0-2-0~x2go-bpo1) UNRELEASED; urgency=low
* Debian lenny backport.
- * Conflict with package nxcompshad.
+ * Breaks/replaces package nxcompshad.
-- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Mon, 04 Jul 2011 17:38:18 +0200
diff --git a/debian/control b/debian/control
index 7968c46..00e94aa 100644
--- a/debian/control
+++ b/debian/control
@@ -23,8 +23,8 @@ Architecture: any
Depends:
${shlibs:Depends},
${misc:Depends}
-Conflicts:
- nxcompshad
+Breaks: nxcompshad
+Replaces: 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
@@ -38,8 +38,8 @@ Architecture: any
Depends:
libxcompshad3 (=${binary:Version}),
${misc:Depends}
-Conflicts:
- nxcompshad-dev
+Breaks: nxcompshad-dev
+Replaces: 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).
More information about the x2go-commits
mailing list