From bc477123cbb336156a973aca725db1060ab2aed2 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Thu, 5 Dec 2013 19:03:47 -0700 Subject: [PATCH] Revert "Add cgroup-bin dependency to our Ubuntu package" This reverts commit c81bb20f5b2b5d86059c6004e60ba23b03d30fe0. After re-reading the documentation: "The Recommends field should list packages that would be found together with this one in all but unusual installations." Thus, "Recommends" is an acceptable place for this dep, and anyone disabling that gets to keep the pieces. The main crux of why this needs to be reverted is because it breaks Debian completely because "lxc" and "cgroup-bin" can't be installed concurrently. Upstream-commit: e01732f85769ac434e2614652aa25cd0ace7a4df Component: engine --- components/engine/hack/make/ubuntu | 1 - 1 file changed, 1 deletion(-) diff --git a/components/engine/hack/make/ubuntu b/components/engine/hack/make/ubuntu index 258a869c24..578f254558 100644 --- a/components/engine/hack/make/ubuntu +++ b/components/engine/hack/make/ubuntu @@ -96,7 +96,6 @@ EOF --depends lxc \ --depends aufs-tools \ --depends iptables \ - --depends cgroup-bin \ --description "$PACKAGE_DESCRIPTION" \ --maintainer "$PACKAGE_MAINTAINER" \ --conflicts lxc-docker-virtual-package \