From d0d5b8bd0495aaa845b8da6c0e316075d19f1028 Mon Sep 17 00:00:00 2001 From: Eli Uriegas Date: Thu, 16 Aug 2018 22:50:16 +0000 Subject: [PATCH] Do not conflict with docker-ee-cli docker-ee-cli will obsolete docker-ce-cli Signed-off-by: Eli Uriegas Upstream-commit: e6e563fc93f86bc17a61858ac755e74af1691081 Component: packaging --- components/packaging/deb/common/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/packaging/deb/common/control b/components/packaging/deb/common/control index 57d83f05ff..6b3e3532a6 100644 --- a/components/packaging/deb/common/control +++ b/components/packaging/deb/common/control @@ -39,7 +39,7 @@ Description: Docker: the open-source application container engine Package: docker-ce-cli Architecture: linux-any Depends: ${shlibs:Depends} -Conflicts: docker (<< 1.5~), docker.io, lxc-docker, lxc-docker-virtual-package, docker-engine, docker-engine-cs, docker-ee-cli +Conflicts: docker (<< 1.5~), docker.io, lxc-docker, lxc-docker-virtual-package, docker-engine, docker-engine-cs Replaces: Description: Docker CLI: the open-source application container engine Docker is an open source project to build, ship and run any application as a