summaryrefslogtreecommitdiffstats
path: root/x11
diff options
context:
space:
mode:
authorVlad Glagolev2019-05-24 02:37:09 +0000
committerVlad Glagolev2019-05-24 14:52:24 +0000
commit43b6fa654b370eb1efc087acb11795dfa1e0dcd0 (patch)
tree4aca3baea4236613985b6969fcaa69115d903c65 /x11
parent523e906a790e7a2c22487154422485c184dc14f0 (diff)
tightvnc: conflicts turbovnc
Diffstat (limited to 'x11')
-rwxr-xr-xx11/tightvnc/CONFLICTS3
-rw-r--r--x11/tightvnc/HISTORY1
2 files changed, 3 insertions, 1 deletions
diff --git a/x11/tightvnc/CONFLICTS b/x11/tightvnc/CONFLICTS
index afdce2441d..0ec661001a 100755
--- a/x11/tightvnc/CONFLICTS
+++ b/x11/tightvnc/CONFLICTS
@@ -1 +1,2 @@
-conflicts vnc
+conflicts vnc &&
+conflicts turbovnc
diff --git a/x11/tightvnc/HISTORY b/x11/tightvnc/HISTORY
index 3e024cda6b..5c1368c755 100644
--- a/x11/tightvnc/HISTORY
+++ b/x11/tightvnc/HISTORY
@@ -1,5 +1,6 @@
2019-05-23 Vlad Glagolev <stealth@sourcemage.org>
* PROVIDES: added, provides Xvnc
+ * CONFLICTS: conflicts turbovnc
2015-05-25 Thomas Orgis <sobukus@sourcemage.org>
* DETAILS: remove SOURCEFORGE_URL usage (automated)