projects / feed / telephony.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c0e1c65)
asterisk-13.x: use conflicts only in asterisk11 makefile
authorJiri Slachta <slachta@cesnet.cz>
Tue, 5 Apr 2016 08:42:02 +0000 (10:42 +0200)
committerJiri Slachta <slachta@cesnet.cz>
Tue, 5 Apr 2016 08:42:02 +0000 (10:42 +0200)
Signed-off-by: Jiri Slachta <slachta@cesnet.cz>
net/asterisk-13.x/Makefile patch | blob | history

diff --git a/net/asterisk-13.x/Makefile b/net/asterisk-13.x/Makefile
index 0ac479a7cede532cb865dd8297d495758e898dde..3b931cdbbe55ff4583a45e9e9c99e54221ea5172 100644 (file)
--- a/net/asterisk-13.x/Makefile
+++ b/net/asterisk-13.x/Makefile
@@ -94,7 +94,6 @@ $(call Package/asterisk13/Default)
   TITLE:=Complete open source PBX, v$(PKG_VERSION)
   MENU:=1
   DEPENDS:=+jansson +libncurses +libopenssl +libpopt +libsqlite3 +libstdcpp +libuuid +libxml2 +libxslt +zlib
-  CONFLICTS:=asterisk11
 endef
 
 define Package/asterisk13/description
Mirror of telephony feed