plugins: fix PLUGIN_CONFLICTS

This commit is contained in:
Franco Fichtner
2019-02-05 08:11:48 +01:00
parent f6ec7803a8
commit 9da212edd9
3 changed files with 2 additions and 2 deletions
+1
View File
@@ -2,6 +2,7 @@ PLUGIN_NAME= zabbix-proxy
PLUGIN_VERSION= 1.1
PLUGIN_COMMENT= Zabbix Proxy enables decentralized monitoring
PLUGIN_DEPENDS= zabbix3-proxy
PLUGIN_CONFLICTS= zabbix4-proxy
PLUGIN_MAINTAINER= m.muenz@gmail.com
.include "../../Mk/plugins.mk"
+1 -1
View File
@@ -2,7 +2,7 @@ PLUGIN_NAME= zabbix4-proxy
PLUGIN_VERSION= 0.1
PLUGIN_COMMENT= Zabbix Proxy enables decentralized monitoring
PLUGIN_DEPENDS= zabbix4-proxy
PLUGIN_CONFLICTS= os-zabbix-proxy
PLUGIN_CONFLICTS= zabbix-proxy
PLUGIN_MAINTAINER= m.muenz@gmail.com
.include "../../Mk/plugins.mk"
-1
View File
@@ -2,7 +2,6 @@ PLUGIN_NAME= frr
PLUGIN_VERSION= 1.7
PLUGIN_COMMENT= The FRRouting Protocol Suite
PLUGIN_DEPENDS= frr5 ruby
PLUGIN_CONFLICTS= quagga
PLUGIN_MAINTAINER= franz.fabian.94@gmail.com
.include "../../Mk/plugins.mk"