build: don't deliver col* and ul as part of bsdutils for now. Closes: #446939

Bsdmainutils delivers these files, so we'll not conflict with them for now.

diff --git a/debian/rules b/debian/rules
index 7b610cd88a8945421e62709d3d60b78dce8616cc..94d21a95a8c7e8d6b29dee9f1ef223c4e51ac888 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -89,6 +89,9 @@ endif
        # the version in bsdmainutils seems newer.
        rm -f debian/bsdutils/usr/bin/look debian/bsdutils/usr/share/man/man1/look.1
        rm -f debian/bsdutils/usr/bin/hexdump debian/bsdutils/usr/share/man/man1/hexdump.1
+       # 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
        # 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