docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
parent 6af6b72023 6d1c0a91f8
commit b10cfaef62
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hack/make/ubuntu
View File

@ -119,6 +119,8 @@ EOF
--deb-recommends xz-utils \ --deb-recommends xz-utils \
--description "$PACKAGE_DESCRIPTION" \ --description "$PACKAGE_DESCRIPTION" \
--maintainer "$PACKAGE_MAINTAINER" \ --maintainer "$PACKAGE_MAINTAINER" \
--conflicts docker \
--conflicts docker.io \
--conflicts lxc-docker-virtual-package \ --conflicts lxc-docker-virtual-package \
--provides lxc-docker \ --provides lxc-docker \
--provides lxc-docker-virtual-package \ --provides lxc-docker-virtual-package \