Skip to content

Commit a218478

Browse files
committed
deb, rpm: remove "Conflicts: docker-engine-cs"
This was added in [a15b67b] (2015), at which time this package was already deprecated / replaced: > Add old docker-engine-cs name to package conflicts [a15b67b]: moby/moby@a15b67b Signed-off-by: Sebastiaan van Stijn <[email protected]>
1 parent 8deb73e commit a218478

File tree

3 files changed

+0
-4
lines changed

3 files changed

+0
-4
lines changed

deb/common/control

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ Recommends: apparmor,
4141
Suggests: aufs-tools [amd64], cgroupfs-mount | cgroup-lite
4242
Conflicts: docker (<< 1.5~),
4343
docker-engine,
44-
docker-engine-cs,
4544
docker.io,
4645
lxc-docker,
4746
lxc-docker-virtual-package
@@ -64,7 +63,6 @@ Recommends: docker-buildx-plugin,
6463
docker-compose-plugin
6564
Conflicts: docker (<< 1.5~),
6665
docker-engine,
67-
docker-engine-cs,
6866
docker.io,
6967
lxc-docker,
7068
lxc-docker-virtual-package

rpm/SPECS/docker-ce-cli.spec

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ BuildRequires: git
3535
# conflicting packages
3636
Conflicts: docker
3737
Conflicts: docker-io
38-
Conflicts: docker-engine-cs
3938
Conflicts: docker-ee
4039
Conflicts: docker-ee-cli
4140

rpm/SPECS/docker-ce.spec

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ BuildRequires: which
5858
# conflicting packages
5959
Conflicts: docker
6060
Conflicts: docker-io
61-
Conflicts: docker-engine-cs
6261
Conflicts: docker-ee
6362

6463
# Obsolete packages

0 commit comments

Comments
 (0)