Merge pull request #4206 from tianon/ubuntu-conflicts

Add "Conflicts" to our lxc-docker package
This commit is contained in:
Tianon Gravi 2014-02-18 11:49:47 -07:00
commit b10cfaef62
1 changed files with 2 additions and 0 deletions

View File

@ -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 \