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 <github@gone.nl>
docker · May 10, 2024 · a218478 · a218478
1 parent 8deb73e
commit a218478
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 4 deletions.
diff --git a/deb/common/control b/deb/common/control
@@ -41,7 +41,6 @@ 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
@@ -64,7 +63,6 @@ Recommends: docker-buildx-plugin,
             docker-compose-plugin
 Conflicts: docker (<< 1.5~),
            docker-engine,
-           docker-engine-cs,
            docker.io,
            lxc-docker,
            lxc-docker-virtual-package

diff --git a/rpm/SPECS/docker-ce-cli.spec b/rpm/SPECS/docker-ce-cli.spec
@@ -35,7 +35,6 @@ BuildRequires: git
 # conflicting packages
 Conflicts: docker
 Conflicts: docker-io
-Conflicts: docker-engine-cs
 Conflicts: docker-ee
 Conflicts: docker-ee-cli
 

diff --git a/rpm/SPECS/docker-ce.spec b/rpm/SPECS/docker-ce.spec
@@ -58,7 +58,6 @@ BuildRequires: which
 # conflicting packages
 Conflicts: docker
 Conflicts: docker-io
-Conflicts: docker-engine-cs
 Conflicts: docker-ee
 
 # Obsolete packages