toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4206 from tianon/ubuntu-conflicts

Browse Source 
Add "Conflicts" to our lxc-docker package
Upstream-commit: b10cfaef62e7cad53e300ae3640c846bef8831f6
Component: engine
This commit is contained in:
Tianon Gravi
2014-02-18 11:49:47 -07:00
parent 618b40aae5 27672a2f55
commit 25d282a4de
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/engine/hack/make/ubuntu
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 \