13 files changed, 101 insertions, 116 deletions
diff --git a/debian/apt-doc.dhelp b/debian/apt-doc.dhelp
deleted file mode 100644
index 091c49956..000000000
--- a/debian/apt-doc.dhelp
+++ /dev/null
@@ -1,21 +0,0 @@
-<item>
-<directory>debian
-<dirtitle>Debian Utilities
-<linkname>APT User's Guide
-<filename>guide.html/index.html
-<description>
-The APT User's Guide provides an overview of how to use the the APT package
-manager, and provides a detailed look at the apt-get tool.
-</description>
-</item>
-
-<item>
-<directory>debian
-<dirtitle>Debian Utilities
-<linkname>APT Offline Usage Guide
-<filename>offline.html/index.html
-<description>
-The APT Offline Usage Guide provides detailed instructions and examples
-of how to use APT on an unconnected computer.
-</description>
-</item>
diff --git a/debian/apt-doc.doc-base.guide b/debian/apt-doc.doc-base.guide
new file mode 100644
index 000000000..bce689a51
--- /dev/null
+++ b/debian/apt-doc.doc-base.guide
@@ -0,0 +1,13 @@
+Document: apt-user-guide
+Title: APT User's Guide
+Author: Jason Gunthorpe
+Abstract: The APT User's Guide provides an overview of how to use the the
+ APT package manager, and provides a detailed look at the apt-get tool.
+Section: Debian
+
+Format: html
+Index: /usr/share/doc/apt-doc/guide.html/index.html
+Files: /usr/share/doc/apt-doc/guide.html/*.html
+
+Format: text
+Files: /usr/share/doc/apt-doc/guide.text.gz
diff --git a/debian/apt-doc.doc-base.offline b/debian/apt-doc.doc-base.offline
new file mode 100644
index 000000000..f67ec739a
--- /dev/null
+++ b/debian/apt-doc.doc-base.offline
@@ -0,0 +1,13 @@
+Document: apt-offline-usage-guide
+Title: APT Offline Usage Guide
+Author: Jason Gunthorpe
+Abstract: The APT Offline Usage Guide provides detailed instructions and
+ examples of how to use APT on an unconnected computer.
+Section: Debian
+
+Format: html
+Index: /usr/share/doc/apt-doc/offline.html/index.html
+Files: /usr/share/doc/apt-doc/offline.html/*.html
+
+Format: text
+Files: /usr/share/doc/apt-doc/offline.text.gz
diff --git a/debian/changelog b/debian/changelog
index c72c5c3c2..9492565eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -92,6 +92,7 @@ apt (0.5.4.9) unstable; urgency=low
   * Split offline and guide documentation into apt-doc.  This was done so
     that binary-arch builds do not require documention deps.  Note, that 
     apt-doc is not installed on upgrades.
+  * Use doc-base, instead of dhelp directly.  Closes: #110389
 
  -- Adam Heath <doogie@debian.org>  Sun, 02 Feb 2003 02:54:45 -0600
 
diff --git a/debian/libapt-pkg-doc.dhelp b/debian/libapt-pkg-doc.dhelp
deleted file mode 100644
index 1ac9d25f7..000000000
--- a/debian/libapt-pkg-doc.dhelp
+++ /dev/null
@@ -1,61 +0,0 @@
-<item>
-<directory>devel
-<dirtitle>Development Tools
-<linkname>APT Cache Specification
-<filename>cache.html/index.html
-<description>
-The APT Cache Specification describes the complete implementation and 
-format of the APT Cache file. The APT Cache file is a way for APT to parse 
-and store a large number of package files for display in the UI. It's primary
-design goal is to make display of a single package in the tree very
-fast by pre-linking important things like dependencies and provides.
-The specification doubles as documentation for one of the in-memory
-structures used by the package library and the APT GUI.
-</description>
-</item>
-
-<item>
-<directory>devel
-<dirtitle>Development Tools
-<linkname>APT Design Document
-<filename>design.html/index.html
-<description>
-The APT Design Document is an overview of the specifications and design goals 
-of the APT project. It also attempts to give a broad descriptiontion of the
-implementation as well.
-</description>
-</item>
-
-<item>
-<directory>devel
-<dirtitle>Development Tools
-<linkname>DPkg Technical Manual
-<filename>dpkg-tech.html/index.html
-<description>
-The DPkg Technical Manual gives an overview of dpkg's external functions
-and describes how it views the world.
-</description>
-</item>
- 
-<item>
-<directory>devel
-<dirtitle>Development Tools
-<linkname>APT Files
-<filename>files.html/index.html
-<description>
-The APT Files document describes the complete implementation and format of 
-the installed APT directory structure. It also serves as guide to how
-APT views the Debian archive.     
-</description>
-</item>
- 
-<item>
-<directory>devel
-<dirtitle>Development Tools
-<linkname>APT Method Interface
-<filename>method.html/index.html
-<description>
-The APT Method Interface document describes the interface that APT uses to 
-the archive access methods.
-</description>
-</item>
diff --git a/debian/libapt-pkg-doc.doc-base.cache b/debian/libapt-pkg-doc.doc-base.cache
new file mode 100644
index 000000000..b58b79bd1
--- /dev/null
+++ b/debian/libapt-pkg-doc.doc-base.cache
@@ -0,0 +1,18 @@
+Document: libapt-pkg-doc-cache
+Title: APT Cache Specification
+Author: Jason Gunthorpe
+Abstract: The APT Cache Specification describes the complete implementation
+ and format of the APT Cache file. The APT Cache file is a way for APT to
+ parse and store a large number of package files for display in the UI.
+ It's primary�design goal is to make display of a single package in the
+ tree very fast by pre-linking important things like dependencies and
+ provides. The specification doubles as documentation for one of the
+ in-memory structures used by the package library and the APT GUI.
+Section: Devel
+
+Format: html
+Index: /usr/share/doc/libapt-pkg-doc/cache.html/index.html
+Files: /usr/share/doc/libapt-pkg-doc/cache.html/*.html
+
+Format: text
+Files: /usr/share/doc/libapt-pkg-doc/cache.text.gz
diff --git a/debian/libapt-pkg-doc.doc-base.design b/debian/libapt-pkg-doc.doc-base.design
new file mode 100644
index 000000000..ce5e0cecb
--- /dev/null
+++ b/debian/libapt-pkg-doc.doc-base.design
@@ -0,0 +1,14 @@
+Document: libapt-pkg-doc-design
+Title: APT Design Document
+Author: Jason Gunthorpe
+Abstract: The APT Design Document is an overview of the specifications and
+ design goals of the APT project. It also attempts to give a broad
+ description of the implementation as well.
+Section: Debian
+
+Format: html
+Index: /usr/share/doc/libapt-pkg-doc/design.html/index.html
+Files: /usr/share/doc/libapt-pkg-doc/design.html/*.html
+
+Format: text
+Files: /usr/share/doc/libapt-pkg-doc/design.text.gz
diff --git a/debian/libapt-pkg-doc.doc-base.dpkg-tech b/debian/libapt-pkg-doc.doc-base.dpkg-tech
new file mode 100644
index 000000000..3afc262e9
--- /dev/null
+++ b/debian/libapt-pkg-doc.doc-base.dpkg-tech
@@ -0,0 +1,13 @@
+Document: libapt-pkg-doc-dpkg-tech
+Title: APT's interpetation of DPkg Technical Specification
+Author: Jason Gunthorpe
+Abstract: The DPkg Technical Manual gives an overview of dpkg's external
+ functions(as APT sees them) and describes how it views the world.
+Section: Devel
+
+Format: html
+Index: /usr/share/doc/libapt-pkg-doc/dpkg-tech.html/index.html
+Files: /usr/share/doc/libapt-pkg-doc/dpkg-tech.html/*.html
+
+Format: text
+Files: /usr/share/doc/libapt-pkg-doc/dpkg-tech.text.gz
diff --git a/debian/libapt-pkg-doc.doc-base.files b/debian/libapt-pkg-doc.doc-base.files
new file mode 100644
index 000000000..e0b79358c
--- /dev/null
+++ b/debian/libapt-pkg-doc.doc-base.files
@@ -0,0 +1,14 @@
+Document: libapt-pkg-doc-files
+Title: APT Files
+Author: Jason Gunthorpe
+Abstract: The APT Files document describes the complete implementation and
+ format of the installed APT directory structure. It also serves as guide
+ to how APT views the Debian archive.
+Section: Devel
+
+Format: html
+Index: /usr/share/doc/libapt-pkg-doc/files.html/index.html
+Files: /usr/share/doc/libapt-pkg-doc/files.html/*.html
+
+Format: text
+Files: /usr/share/doc/libapt-pkg-doc/files.text.gz
diff --git a/debian/libapt-pkg-doc.doc-base.method b/debian/libapt-pkg-doc.doc-base.method
new file mode 100644
index 000000000..61c361251
--- /dev/null
+++ b/debian/libapt-pkg-doc.doc-base.method
@@ -0,0 +1,14 @@
+Document: libapt-pkg-doc-method
+Title: APT Method Interface
+Author: Jason Gunthorpe
+Abstract: The APT Method Interface document describes the interface that
+ APT uses to the archive access methods.
+Section: Devel
+
+Format: html
+Index: /usr/share/doc/libapt-pkg-doc/method.html/index.html
+Files: /usr/share/doc/libapt-pkg-doc/method.html/*.html
+
+Format: text
+Files: /usr/share/doc/libapt-pkg-doc/method.text.gz
+
diff --git a/debian/libapt-pkg-doc.postinst b/debian/libapt-pkg-doc.postinst
deleted file mode 100755
index 7a8249def..000000000
--- a/debian/libapt-pkg-doc.postinst
+++ /dev/null
@@ -1,11 +0,0 @@
-#! /bin/sh
-
-case "$1" in
-       configure)
-	       if [ -f /usr/sbin/dhelp_parse ]; then
-	         /usr/sbin/dhelp_parse -a /usr/share/doc/libapt-pkg-doc
-	       fi
-       ;;
-esac
-
-#DEBHELPER#
diff --git a/debian/libapt-pkg-doc.prerm b/debian/libapt-pkg-doc.prerm
deleted file mode 100755
index 7759c3cf0..000000000
--- a/debian/libapt-pkg-doc.prerm
+++ /dev/null
@@ -1,13 +0,0 @@
-#! /bin/sh
-
-case "$1" in
-       remove|upgrade|remove-in-favour|deconfigure-in-favour)
-              if [ -f /usr/sbin/dhelp_parse ]; then
-                 /usr/sbin/dhelp_parse -d /usr/share/doc/libapt-pkg-doc
-              fi
-              ;;
-       failed-upgrade)
-              ;;
-esac
-
-#DEBHELPER#
diff --git a/debian/rules b/debian/rules
index 0862ffbbf..c3da7401a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,7 @@
 # Made with the aid of dh_make, by Craig Small
 # Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
 # Some lines taken from debmake, by Christoph Lameter.
-# $Id: rules,v 1.47 2003/02/12 14:28:03 doogie Exp $
+# $Id: rules,v 1.48 2003/02/12 14:31:41 doogie Exp $
 
 # LD_LIBRARY_PATH=pwd/debian/apt/usr/lib dh_shlibdeps -papt
 # dpkg: /home/jgg/work/apt2/debian/apt/usr/lib/libapt-pkg.so.2.9 not found.
@@ -146,10 +146,6 @@ libapt-pkg-doc: build-doc debian/shlibs.local
 	dh_installdocs -p$@ $(BLD)/docs/cache* $(BLD)/docs/design* $(BLD)/docs/dpkg-tech* \
                             $(BLD)/docs/files* $(BLD)/docs/method* \
 			    doc/libapt-pkg2_to_3.txt doc/style.txt
-
-	-cp -a debian/libapt-pkg-doc.dhelp debian/libapt-pkg-doc/usr/doc/libapt-pkg-doc/.dhelp
-	-cp -a debian/libapt-pkg-doc.dhelp debian/libapt-pkg-doc/usr/share/doc/libapt-pkg-doc/.dhelp
-
 	dh_installexamples -p$@
 #	dh_installmenu -p$@
 #	dh_installinit -p$@
@@ -177,11 +173,6 @@ apt-doc: build-doc
 	# Copy the guides
 	dh_installdocs -p$@ $(BLD)/docs/guide*.text $(BLD)/docs/guide*.html \
 	               $(BLD)/docs/offline.text $(BLD)/docs/offline.html
-
-	# One or the other..
-	-cp -a debian/apt-doc.dhelp debian/apt/usr/doc/apt-doc/.dhelp
-	-cp -a debian/apt-doc.dhelp debian/apt/usr/share/doc/apt-doc/.dhelp
-
 	dh_installchangelogs -p$@
 	dh_compress -p$@
 	dh_fixperms -p$@