summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArch Librarian <arch@canonical.com>2004-09-20 16:55:18 +0000
committerArch Librarian <arch@canonical.com>2004-09-20 16:55:18 +0000
commit0b5c85b5c9edc8cbd9a3962d412810354398b095 (patch)
tree64fa3a52e9d2ab1b34e844213ef0bea864842411
parent50e1955778d7d2f30ae029b3210b26b7f9f865f6 (diff)
More usr doc fixes
Author: jgg Date: 1999-12-07 07:38:19 GMT More usr doc fixes
-rw-r--r--debian/dirs3
-rw-r--r--debian/libapt-pkg-doc.dirs2
-rwxr-xr-xdebian/libapt-pkg-doc.postinst1
-rwxr-xr-xdebian/postinst1
-rwxr-xr-xdebian/rules11
5 files changed, 8 insertions, 10 deletions
diff --git a/debian/dirs b/debian/dirs
index 4ee13a12b..1551a2083 100644
--- a/debian/dirs
+++ b/debian/dirs
@@ -2,8 +2,5 @@ usr/bin
usr/lib/apt/methods
usr/lib/dpkg/methods/apt
etc/apt
-usr/doc/apt
var/cache/apt/archives/partial
var/state/apt/lists/partial
-usr/doc/apt/users-guide.html
-usr/doc/apt/offline.html
diff --git a/debian/libapt-pkg-doc.dirs b/debian/libapt-pkg-doc.dirs
deleted file mode 100644
index 970b73659..000000000
--- a/debian/libapt-pkg-doc.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/doc/apt
-usr/doc/libapt-pkg-doc
diff --git a/debian/libapt-pkg-doc.postinst b/debian/libapt-pkg-doc.postinst
index fc588d244..aa8aac4dc 100755
--- a/debian/libapt-pkg-doc.postinst
+++ b/debian/libapt-pkg-doc.postinst
@@ -8,3 +8,4 @@ case "$1" in
;;
esac
+#DEBHELPER#
diff --git a/debian/postinst b/debian/postinst
index 6e729c01b..a43a08057 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -56,3 +56,4 @@ case "$1" in
fi
esac
+#DEBHELPER#
diff --git a/debian/rules b/debian/rules
index b3e1d12c1..05dbc4603 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.18 1999/11/23 05:36:52 jgg Exp $
+# $Id: rules,v 1.19 1999/12/07 07:38:19 jgg Exp $
# For the deb builder, you can run 'debian/rules cvs-build', which does all
@@ -53,7 +53,7 @@ build-stamp: configure
# cd build && CXXFLAGS="-g -Wall -D_POSIX_C_SOURCE=199309" ../configure --disable-nls --disable-static --prefix=/usr
# cd build && make all-hdr
# cd build && make -s
-
+
# Add here commands to compile the package.
make
touch build-stamp
@@ -78,12 +78,13 @@ libapt-pkg-doc: build debian/shlibs.local
dh_installdirs -p$@
#
# libapt-pkg-doc install
-#
+#
+ dh_installdocs -p$@ $(BLD)/docs/cache* $(BLD)/docs/design* $(BLD)/docs/dpkg-tech* \
+ $(BLD)/docs/files* $(BLD)/docs/method*
+
-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_installdocs -p$@ $(BLD)/docs/cache* $(BLD)/docs/design* $(BLD)/docs/dpkg-tech* \
- $(BLD)/docs/files* $(BLD)/docs/method*
dh_installexamples -p$@
# dh_installmenu -p$@
# dh_installinit -p$@