summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/apt-utils.manpages6
-rw-r--r--debian/apt.manpages18
-rw-r--r--debian/changelog5
-rwxr-xr-xdebian/rules11
4 files changed, 33 insertions, 7 deletions
diff --git a/debian/apt-utils.manpages b/debian/apt-utils.manpages
new file mode 100644
index 000000000..a68e909fc
--- /dev/null
+++ b/debian/apt-utils.manpages
@@ -0,0 +1,6 @@
+doc/apt-extracttemplates.1
+doc/apt-ftparchive.1
+doc/apt-sortpkgs.1
+doc/fr/apt-extracttemplates.fr.1
+doc/fr/apt-ftparchive.fr.1
+doc/fr/apt-sortpkgs.fr.1
diff --git a/debian/apt.manpages b/debian/apt.manpages
new file mode 100644
index 000000000..cc391dc23
--- /dev/null
+++ b/debian/apt.manpages
@@ -0,0 +1,18 @@
+doc/apt-cache.8
+doc/apt-cdrom.8
+doc/apt-config.8
+doc/apt-get.8
+doc/apt.8
+doc/apt.conf.5
+doc/apt_preferences.5
+doc/fr/apt-cache.fr.8
+doc/fr/apt-cdrom.fr.8
+doc/fr/apt-config.fr.8
+doc/fr/apt-get.fr.8
+doc/fr/apt.conf.fr.5
+doc/fr/apt_preferences.fr.5
+doc/fr/sources.list.fr.5
+doc/fr/vendors.list.fr.5
+doc/pt_BR/apt_preferences.pt_BR.5
+doc/sources.list.5
+doc/vendors.list.5
diff --git a/debian/changelog b/debian/changelog
index f180f22ab..04b2f040b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,11 @@ apt (0.5.9) unstable; urgency=low
* Mention default setting for --all-versions (Closes: #203298)
* Patch from Otavio Salvador to exit successfully after --version
(Closes: #203418)
+ * Patch from Otavio Salvador to switch from dh_installmanpages to
+ dh_installman. Fixes the problem where the pt_BR man page was
+ installed in the wrong location (Closes: #194558)
- --
+ -- Matt Zimmerman <mdz@debian.org> Sat, 2 Aug 2003 15:50:02 -0400
apt (0.5.8) unstable; urgency=medium
diff --git a/debian/rules b/debian/rules
index 3ec524cc6..b67ad8119 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.50 2003/07/21 06:09:12 mdz Exp $
+# $Id: rules,v 1.51 2003/08/02 19:51:02 mdz 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.
@@ -150,7 +150,7 @@ libapt-pkg-doc: build-doc debian/shlibs.local
# dh_installmenu -p$@
# dh_installinit -p$@
# dh_installcron -p$@
-# dh_installmanpages -p$@
+# dh_installman -p$@
# dh_undocumented -p$@
dh_installchangelogs -p$@
@@ -213,7 +213,7 @@ apt: build debian/shlibs.local
# head -n 500 ChangeLog > debian/ChangeLog
dh_installexamples -p$@ $(BLD)/docs/examples/*
- dh_installmanpages -p$@ apt-ftparchive.1 apt-sortpkgs.1 apt-extracttemplates.1
+ dh_installman -p$@
dh_installdocs -p$@
dh_installchangelogs -p$@
@@ -244,7 +244,7 @@ libapt-pkg-dev: build debian/shlibs.local
# dh_installmenu -p$@
# dh_installinit -p$@
# dh_installcron -p$@
-# dh_installmanpages -p$@
+# dh_installman -p$@
dh_installchangelogs -p$@
dh_strip -p$@
@@ -270,8 +270,7 @@ apt-utils: build debian/shlibs.local
dh_installdocs -p$@
# Install the man pages..
- mkdir -p debian/$@/usr/share/man/man1
- -cp doc/apt-sortpkgs.1 doc/apt-ftparchive.1 doc/apt-extracttemplates.1 debian/$@/usr/share/man/man1/
+ dh_installman -p$@
dh_installchangelogs -p$@
dh_strip -p$@