summaryrefslogtreecommitdiffstats
path: root/x11
diff options
context:
space:
mode:
authorVlad Glagolev2019-05-24 02:36:30 +0000
committerVlad Glagolev2019-05-24 14:52:24 +0000
commit523e906a790e7a2c22487154422485c184dc14f0 (patch)
treea057897f03346758eac4ba3d7b1da6fed6fce25c /x11
parent02e2893d22815a56729dae3017325670813c1ceb (diff)
vnc: conflicts turbovnc
Diffstat (limited to 'x11')
-rwxr-xr-xx11/vnc/CONFLICTS3
-rw-r--r--x11/vnc/HISTORY1
2 files changed, 3 insertions, 1 deletions
diff --git a/x11/vnc/CONFLICTS b/x11/vnc/CONFLICTS
index 744ffa074b..908a439d71 100755
--- a/x11/vnc/CONFLICTS
+++ b/x11/vnc/CONFLICTS
@@ -1 +1,2 @@
-conflicts tightvnc
+conflicts tightvnc &&
+conflicts turbovnc
diff --git a/x11/vnc/HISTORY b/x11/vnc/HISTORY
index cb03d887b8..daa5102f8e 100644
--- a/x11/vnc/HISTORY
+++ b/x11/vnc/HISTORY
@@ -1,5 +1,6 @@
2019-05-23 Vlad Glagolev <stealth@sourcemage.org>
* PROVIDES: added, provides Xvnc
+ * CONFLICTS: conflicts turbovnc
2013-08-19 Remko van der Vossen <wich@sourcemage.org>
* DEPENDS: replace xorg-libs by individual libs