From 6d1c0a91f89887bd0d73b161b1ffe8b9cc10365e Mon Sep 17 00:00:00 2001
From: Tianon Gravi <admwiggin@gmail.com>
Date: Tue, 18 Feb 2014 11:24:33 -0700
Subject: [PATCH] Add "Conflicts" to our lxc-docker package to make it more
 clear that we can't/shouldn't be installed alongside either "docker" or
 "docker.io"

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
---
 hack/make/ubuntu | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/hack/make/ubuntu b/hack/make/ubuntu
index 1d309d2b5c..23af0ff7e0 100644
--- a/hack/make/ubuntu
+++ b/hack/make/ubuntu
@@ -119,6 +119,8 @@ EOF
 		    --deb-recommends xz-utils \
 		    --description "$PACKAGE_DESCRIPTION" \
 		    --maintainer "$PACKAGE_MAINTAINER" \
+		    --conflicts docker \
+		    --conflicts docker.io \
 		    --conflicts lxc-docker-virtual-package \
 		    --provides lxc-docker \
 		    --provides lxc-docker-virtual-package \