aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2011-12-30 15:28:23 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2011-12-30 15:28:23 +0100
commitd6fa23c86ada56266981b3e873aa7da5e064cdff (patch)
treeafdb98faf563bd6f7e3a0d191405b2e24dd072dc /debian
parent290fdeddfa7e1ac8e8c291122f74a4c248feed3a (diff)
downloadnx-libs-d6fa23c86ada56266981b3e873aa7da5e064cdff.tar.gz
nx-libs-d6fa23c86ada56266981b3e873aa7da5e064cdff.tar.bz2
nx-libs-d6fa23c86ada56266981b3e873aa7da5e064cdff.zip
Break/conflict with nxlibs and nxlibs-dev (packages provided by freenx-team on Launchpad).
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog2
-rw-r--r--debian/control4
2 files changed, 6 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 511ec79f7..d15603d3b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -56,6 +56,8 @@ nx-libs (2:3.5.0-2) UNRELEASED; urgency=low
* Fix LD_LIBRARY_PATH export in wrapper scripts/patches.
* X2Go Packaging Team becomes maintainer, Mike Gabriel + Reinhard Tartler become uploaders.
* Make `breaks-without-version' lintian overrides needless.
+ * Break/conflict with nxlibs and nxlibs-dev (packages provided by
+ freenx-team on Launchpad).
-- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 28 Dec 2011 19:06:26 +0100
diff --git a/debian/control b/debian/control
index 47fa1d2f3..9389b5526 100644
--- a/debian/control
+++ b/debian/control
@@ -13,6 +13,8 @@ Build-Depends:
quilt (>= 0.46-7~),
libxmltok1-dev,
autoconf
+Breaks: nxlibs (<=3.5.1)
+Replaces: nxlibs
Build-Conflicts:
x11proto-core-dev,
x11proto-kb-dev,
@@ -30,6 +32,8 @@ Architecture: any
Depends:
${shlibs:Depends},
${misc:Depends}
+Breaks: nxlibs-dev (<=3.5.1)
+Replaces: nxlibs-dev
Description: nx-X11 (NoMachine)
X11 libraries customized for nxagent (NoMachine).