From 1a754b3d95c80f54304939e4529488914f76512c Mon Sep 17 00:00:00 2001 From: Andrew Hsu Date: Tue, 20 Jun 2017 03:55:08 +0000 Subject: [PATCH] also have deb pkg conflict docker-engine Signed-off-by: Andrew Hsu Upstream-commit: f7ad018c91316588a756e4e97cd48c246b2c1419 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 ce6a86f43b..a3285cd0cf 100644 --- a/components/packaging/deb/common/control +++ b/components/packaging/deb/common/control @@ -16,7 +16,7 @@ Recommends: aufs-tools, git, xz-utils, ${apparmor:Recommends} -Conflicts: docker (<< 1.5~), docker.io, lxc-docker, lxc-docker-virtual-package, docker-engine-cs, docker-ee +Conflicts: docker (<< 1.5~), docker.io, lxc-docker, lxc-docker-virtual-package, docker-engine, docker-engine-cs, docker-ee Replaces: docker-engine Description: Docker: the open-source application container engine Docker is an open source project to build, ship and run any application as a