From: Alexander Barton <alex@barton.de>
Date: Sat, 27 Jan 2018 16:21:19 +0000 (+0100)
Subject: Current versions of molly-guard and usrmerge can coexist
X-Git-Tag: rel-7~2
X-Git-Url: https://arthur.ath.cx/gitweb/?a=commitdiff_plain;h=a2d32735fc46a9ff5c05f379039ab49d6a4c652e;p=ax-debian.git

Current versions of molly-guard and usrmerge can coexist
---

diff --git a/ax-debian b/ax-debian
index d666ebf..7cf7123 100644
--- a/ax-debian
+++ b/ax-debian
@@ -30,7 +30,7 @@ Depends:
  lsb-release,
  manpages,
  members,
- molly-guard | usrmerge,
+ molly-guard,
  mtr-tiny | mtr,
  needrestart,
  ntpdate | systemd,
@@ -76,6 +76,7 @@ Recommends:
  systemd-container,
  systemd-coredump,
  unattended-upgrades,
+ usrmerge,
  virt-what,
 Suggests:
  ax-debian-devel,
diff --git a/debian/changelog b/debian/changelog
index 7eb6565..d71dd70 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
 ax-debian (7) UNRELEASED; urgency=medium
 
   * Add/update dependencies to the following packages:
-    - Depends:
-       molly-guard | usrmerge
+    - Recommends:
+       usrmerge
     - Suggests:
        software-properties-common