Take over /bin/mountpoint from initscripts

TODO: make the Replaces versioned and add a (versioned) Breaks
      once initscripts has a version which no longer ships
      /bin/mountpoint.

Note: putting this in util-linux (vs mount) package
      after discussion with Adam Conrad.

diff --git a/debian/control b/debian/control
index c8a6919..f8d9e93 100644
--- a/debian/control
+++ b/debian/control
@@ -38,7 +38,7 @@ Essential: yes
 Pre-Depends: ${misc:Pre-Depends}, ${shlibs:Depends}
 Depends: initscripts, lsb-base (>= 3.0-6), tzdata (>=2006c-2), ${misc:Depends}
 Suggests: dosfstools, kbd | console-tools, util-linux-locales
-Replaces: bash-completion (<< 1:2.1-3)
+Replaces: bash-completion (<< 1:2.1-3), initscripts
 Breaks: bash-completion (<< 1:2.1-3)
 Multi-Arch: foreign
 Description: Miscellaneous system utilities
diff --git a/debian/rules b/debian/rules
index 64c827f..a29211d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,8 +31,6 @@ CONFOPTS += --disable-su
 CONFOPTS += --disable-sulogin
 CONFOPTS += --disable-last
 CONFOPTS += --disable-mesg
-# => initscripts
-CONFOPTS += --disable-mountpoint
 # => procps
 CONFOPTS += --disable-kill
 # => eject
diff --git a/debian/util-linux.install b/debian/util-linux.install
index 2fb55ee..fa4ebf1 100755
--- a/debian/util-linux.install
+++ b/debian/util-linux.install
@@ -10,6 +10,7 @@ debian/tmp/usr/bin/rename => /usr/bin/rename.ul
 [linux-any] sbin/mkswap
 [!linux-any] debian/tmp/sbin/mkswap => /sbin/mkswap.linux
 bin/more
+bin/mountpoint
 sbin/agetty
 sbin/blkid
 sbin/cfdisk
diff --git a/debian/util-linux.manpages b/debian/util-linux.manpages
index 62dcddc..d3c4e2e 100755
--- a/debian/util-linux.manpages
+++ b/debian/util-linux.manpages
@@ -18,6 +18,7 @@ debian/tmp/usr/share/man/man1/ipcs.1
 debian/tmp/usr/share/man/man1/line.1
 debian/tmp/usr/share/man/man1/mcookie.1
 debian/tmp/usr/share/man/man1/more.1
+debian/tmp/usr/share/man/man1/mountpoint.1
 debian/tmp/usr/share/man/man1/namei.1
 debian/tmp/usr/share/man/man1/pg.1
 debian/tmp/usr/share/man/man1/rev.1