зеркало из https://github.com/docker/packaging.git
Merge pull request #194 from thaJeztah/simplify_conflicts
docker-cli, docker-engine: remove outdated "conflicts
This commit is contained in:
Коммит
3ac603d1bf
|
@ -20,10 +20,7 @@ Recommends: docker-buildx-plugin,
|
|||
docker-compose-plugin
|
||||
Conflicts: docker (<< 1.5~),
|
||||
docker-engine,
|
||||
docker-engine-cs,
|
||||
docker.io,
|
||||
lxc-docker,
|
||||
lxc-docker-virtual-package
|
||||
docker.io
|
||||
Replaces: docker-ce (<< 5:0)
|
||||
Breaks: docker-ce (<< 5:0)
|
||||
Description: Docker CLI: the open-source application container engine
|
||||
|
|
|
@ -33,7 +33,6 @@ BuildRequires: make
|
|||
|
||||
Conflicts: docker
|
||||
Conflicts: docker-io
|
||||
Conflicts: docker-engine-cs
|
||||
Conflicts: docker-ee
|
||||
Conflicts: docker-ee-cli
|
||||
|
||||
|
|
|
@ -38,10 +38,7 @@ Recommends: apparmor,
|
|||
Suggests: aufs-tools [amd64], cgroupfs-mount | cgroup-lite
|
||||
Conflicts: docker (<< 1.5~),
|
||||
docker-engine,
|
||||
docker-engine-cs,
|
||||
docker.io,
|
||||
lxc-docker,
|
||||
lxc-docker-virtual-package
|
||||
docker.io
|
||||
Replaces: docker-engine
|
||||
Description: Docker: the open-source application container engine
|
||||
Docker is a product for you to build, ship and run any application as a
|
||||
|
|
|
@ -57,7 +57,6 @@ BuildRequires: which
|
|||
|
||||
Conflicts: docker
|
||||
Conflicts: docker-io
|
||||
Conflicts: docker-engine-cs
|
||||
Conflicts: docker-ee
|
||||
|
||||
Obsoletes: docker-ce-selinux
|
||||
|
|
Загрузка…
Ссылка в новой задаче