cal comes from bsdmainutils as well.

Drop the Replaces:, too, since we don't replace anything anymore.

diff --git a/debian/control b/debian/control
index f948870bb20ec697268461dd3f061f74bd8c8518..69b5b4b6230a7888166b1e9e54cf1c203ed83857 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -53,7 +53,7 @@ Essential: yes
 Section: utils
 Depends: ${shlibs:Depends}
 Recommends: bsdmainutils
-Replaces: bsdmainutils
+Conflicts: bsdmainutils (<<6.1.9)
 Description: Basic utilities from 4.4BSD-Lite
  This package contains the bare minimum number of BSD utilities needed
  to boot a Debian system.  You should probably also install

diff --git a/debian/rules b/debian/rules
index 94d21a95a8c7e8d6b29dee9f1ef223c4e51ac888..5907e66e7bd3a5a5317c4d0e3a4b71bf1d87e63c 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -92,6 +92,7 @@ endif
        # and it's less pain to just let bsmainutils deliver col for now.
        rm -f debian/bsdutils/usr/bin/col* debian/bsdutils/usr/share/man/man1/col*.1
        rm -f debian/bsdutils/usr/bin/ul debian/bsdutils/usr/share/man/man1/ul*.1
+       rm -f debian/bsdutils/usr/bin/cal debian/bsdutils/usr/share/man/man1/cal.1
        # perl gets to do rename, not us.
        mv debian/util-linux/usr/bin/rename debian/util-linux/usr/bin/rename.ul
        mv debian/util-linux/usr/share/man/man1/rename.1 debian/util-linux/usr/share/man/man1/rename.ul.1