summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2019-11-14 21:40:50 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2019-11-14 21:41:01 +0000
commitbaf785d55965b1379a5277ce294e1592d1caed84 (patch)
tree16fe8ac20574e84136bb85e981f60f3da335dc07
parentUpdating to standards version 4.4.1. (diff)
downloadprogress-linux-metapackages-baf785d55965b1379a5277ce294e1592d1caed84.tar.xz
progress-linux-metapackages-baf785d55965b1379a5277ce294e1592d1caed84.zip
Adding conflicts against resolvconf in progress-linux-base.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/control2
1 files changed, 2 insertions, 0 deletions
diff --git a/debian/control b/debian/control
index f3101f3..f9e8758 100644
--- a/debian/control
+++ b/debian/control
@@ -55,6 +55,8 @@ Depends:
sudo,
vim,
wget,
+Conflicts:
+ resolvconf,
Enhances:
progress-linux,
Description: Progress Linux - Base System