Integrate dpkg-multicd into dselect

The `multicd' package was initially written by Heiko Schlittermann
<heiko@lotte.sax.de> based on builtin access methods written by Ian
Jackson <ian@chiark.greenend.org.uk>.  The final packaging as well as
cleanups were made by Martin Schulze <joey@infodrom.north.de> who also
put this package together for the slink release (Debian GNU/Linux
2.1).

This commit includes the raw files as provided in version 0.21 of dpkg-multicd
(except for a few whitespaces cleanups).

The dpkg-scanpackages fork has been left out since the required features
have been merged in the official dpkg-scanpackages. Closes: #516631

4 files changed, 7 insertions, 2 deletions

diff --git a/debian/changelog b/debian/changelog
index e37975a56..7c471291e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -49,6 +49,8 @@ dpkg (1.15.5) UNRELEASED; urgency=low
   * dpkg-scanpackages now supports a new --medium option as needed to
     generate Packages.cd file for consumption by the multicd dselect access
     method. Closes: #402527
+  * Integrate dpkg-multicd into dselect. Add the required Replaces and
+    Conflicts. The dpkg-scanpackages fork is dropped. Closes: #516631
 
   [ Updated dpkg translations ]
   * German (Sven Joachim).
diff --git a/debian/control b/debian/control
index 27e1b6351..01d259536 100644
--- a/debian/control
+++ b/debian/control
@@ -58,8 +58,8 @@ Priority: optional
 Architecture: any
 Depends: ${shlibs:Depends}, dpkg (>= 1.13.1)
 Suggests: perl
-Conflicts: dpkg-ftp
-Replaces: dpkg (<< 1.10.3), dpkg-ftp
+Conflicts: dpkg-ftp, dpkg-multicd
+Replaces: dpkg (<< 1.10.3), dpkg-ftp, dpkg-multicd
 Description: Debian package management front-end
  dselect is a high-level interface for managing the installation and
  removal of Debian software packages.
diff --git a/debian/copyright b/debian/copyright
index 11255d8cd..6f39403da 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -13,6 +13,8 @@ Copyright © 1994-1999 Ian Jackson <ian@chiark.greenend.org.uk>
 Copyright © 1999 Richard Kettlewell <rjk@sfere.greenend.org.uk>
 Copyright © 1999 Ben Collins <bcollins@debian.org>
 Copyright © 1999 Roderick Shertler <roderick@argon.org>
+Copyright © 1998-1999 Martin Schulze <joey@infodrom.north.de>
+Copyright © 1998 Heiko Schlittermann <heiko@lotte.sax.de>
 Copyright © 1996-1998 Miquel van Smoorenburg <miquels@cistron.nl>
 Copyright © 1997-1998 Juho Vuori <javuori@cc.helsinki.fi>
 Copyright © 1997-1998 Charles Briscoe-Smith <cpbs@debian.org>
diff --git a/debian/dpkg.docs b/debian/dpkg.docs
index f22987e5a..438b0b6bc 100644
--- a/debian/dpkg.docs
+++ b/debian/dpkg.docs
@@ -4,3 +4,4 @@ debian/usertags
 doc/README.api
 doc/README.feature-removal-schedule
 doc/triggers.txt
+dselect/methods/multicd/README.multicd