]> arthur.barton.de Git - ax-debian.git/commitdiff
Current versions of molly-guard and usrmerge can coexist
authorAlexander Barton <alex@barton.de>
Sat, 27 Jan 2018 16:21:19 +0000 (17:21 +0100)
committerAlexander Barton <alex@barton.de>
Sat, 27 Jan 2018 16:21:19 +0000 (17:21 +0100)
ax-debian
debian/changelog

index d666ebff7991e0a3b06e171db987c275129894cb..7cf7123dcd3c4cf389073f414824d25c7edef63f 100644 (file)
--- 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,
index 7eb656531bd66c6e4afafa5087a8dc4493bb9366..d71dd708863d30ec4f36078107b390b54696be71 100644 (file)
@@ -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