From: LaMont Jones <lamont@debian.org>
Date: Mon, 19 Nov 2007 04:16:48 +0000 (-0700)
Subject: cal comes from bsdmainutils as well.
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9112e6ca9905270f77a58f0ffa4344b62cc4ddaa;p=util-linux

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 f948870b..69b5b4b6 100644
--- 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 94d21a95..5907e66e 100755
--- 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