retitle contains 2 French and Finnish manpages, one aptitude.fr.8 obsolete
thanks
Thomas Huriaux wrote:
> While preparing the patch to switch to po4a, I had not seen that there
> were 2 manpages. This bug is more annoying than it seems, as the outdated
> manpage is the one displayed with the command "man aptitude" in a French
> environment. The up-to-date manpage is installed as aptitude.fr.8 in the
> English section.
> Please note that there is a similar problem with the Finnish manpage
> (installed once as man/fi/man8/aptitude.8.gz and once as
> man/man8/aptitude.fi.8.gz). However, as I don't speak finnish, I don't
> know which one is the best one.
Finnish ones are from one source; two are the same.
This bug is due to:
* Since MANPAGE_LOCALES in Makefile.am contains fr,
aptitude.fr.8 (outdated one) is installed into /usr/share/man/fr/man8.
* Since doc/fr/Makefile.am has no code to install doc/fr/aptitude.fr.8
(new one) into /usr/share/man/fr/man8, doc/fr/aptitude.fr.8 is not
installed into that directory.
(Since doc/fi/Makefile.am has code to install doc/fi/aptitude.fi.8
into /usr/share/man/fi/man8, doc/fi/aptitude.fr.8 is correctly installed
into that directory.)
* Since doc/fi/Makefile.am and doc/fr/Makefile.am use man_MANS,
doc/fi/aptitude.fi.8 and doc/fr/aptitude.fr.8 (new one) is ALSO installed
into /usr/share/man/man8.
A patch attached here fixes this bug. Please do as follows:
* Apply a patch attached here.
* Remove aptitude.fr.8 in the source root.
Thanks,
-nori
--- old-aptitude-1/Makefile.am 2006-05-26 03:36:24.000000000 +0900
+++ new-aptitude-1/Makefile.am 2006-10-07 10:04:31.000000000 +0900
@@ -8,7 +8,7 @@
SUBDIRS=$(SRCDIRS) $(DOCDIRS) m4 po tests
-MANPAGE_LOCALES=fr gl it pl
+MANPAGE_LOCALES=gl it pl
TLMANPAGES = $(wildcard aptitude.??.8)
TLHELPTXTS = help.txt $(wildcard help-??.txt) $(wildcard help-??_??.txt)
diff -rN -u old-aptitude-1/doc/fi/Makefile.am new-aptitude-1/doc/fi/Makefile.am
--- old-aptitude-1/doc/fi/Makefile.am 2006-04-22 09:57:05.000000000 +0900
+++ new-aptitude-1/doc/fi/Makefile.am 2006-10-07 10:04:21.000000000 +0900
@@ -23,8 +23,6 @@
-rm -f doc-stamp doc-css-stamp doc-html-stamp doc-txt-stamp
doc-man-stamp
-rm -fr $(MANPAGE) $(README) *.tmp
-man_MANS=$(MANPAGE)
-
install-data-hook:
$(mkinstalldirs) $(DESTDIR)$(localemandir)/man8
$(INSTALL_DATA) $(MANPAGE) $(DESTDIR)$(localemandir)/man8/aptitude.8
diff -rN -u old-aptitude-1/doc/fr/Makefile.am new-aptitude-1/doc/fr/Makefile.am
--- old-aptitude-1/doc/fr/Makefile.am 2006-06-15 13:39:42.000000000 +0900
+++ new-aptitude-1/doc/fr/Makefile.am 2006-10-07 13:49:42.000000000 +0900
@@ -11,6 +11,8 @@
# Put documentation in /usr/share/doc/aptitude (by default)
docdir=$(datadir)/doc/$(PACKAGE)
+localemandir=$(mandir)/$(LANGCODE)
+
# Automake automagically distributes README without asking..
README=README.$(LANGCODE)
@@ -25,9 +27,9 @@
-rm -f doc-stamp doc-css-stamp doc-html-stamp doc-txt-stamp
doc-man-stamp
-rm -fr $(MANPAGE) $(README) *.tmp
-man_MANS=$(MANPAGE)
-
install-data-hook:
+ $(mkinstalldirs) $(DESTDIR)$(localemandir)/man8
+ $(INSTALL_DATA) $(MANPAGE) $(DESTDIR)$(localemandir)/man8/aptitude.8
$(mkinstalldirs) $(DESTDIR)$(docdir)/html/$(LANGCODE)/images
$(INSTALL_DATA) output-html/*.html output-html/*.css
$(DESTDIR)$(docdir)/html/$(LANGCODE)
$(INSTALL_DATA) output-html/images/*
$(DESTDIR)$(docdir)/html/$(LANGCODE)/images
