tags 351531 patch thanks Hi,
Olivier Trichet <[EMAIL PROTECTED]> (05/02/2006): > The aptitude package contains 2 French manpages. > The file aptitude.fr.8[1] can be safely remove since it is now outdated > and superseeded by the manpage generated from doc/fr/manpage.xml. 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. You will find attached a patch that fixes this problem. Here are my comments: >--- aptitude-0.4.2/doc/fr/fixman 2006-08-02 09:12:02.000000000 +0200 >+++ aptitude-0.4.2.new/doc/fr/fixman 2006-08-07 15:31:59.000000000 +0200 >@@ -2,8 +2,9 @@ > # this file basically copied from fixquotes (German translation) > # and fixman (Finnish translation) > >-MANPAGE=aptitude.fr.8 >+MANPAGE=aptitude.8 Uses aptitude.8 instead of aptitude.fr.8, as this manpage is built in the fr/ directory and will be installed as aptitude.8 >+iconv -f utf-8 -t iso-8859-1 $MANPAGE > $MANPAGE.tmp && mv $MANPAGE.tmp >$MANPAGE converts the manpage in iso, as required by man-db. >--- aptitude-0.4.2/doc/fr/Makefile.am 2006-08-02 09:12:02.000000000 +0200 >+++ aptitude-0.4.2.new/doc/fr/Makefile.am 2006-08-07 15:05:30.000000000 >+0200 >@@ -4,7 +4,8 @@ > > EXTRA_DIST=fixman > LANGCODE=fr >-MANPAGE=aptitude.$(LANGCODE).8 >[EMAIL PROTECTED]@/fr >+MANPAGE=aptitude.8 overrides the default mandir definition, so that the French manpage is installed in man/fr/man8/ instead of man/man8/ also uses aptitude.8 instead of aptitude.fr.8 >--- aptitude-0.4.2/Makefile.am 2006-08-02 09:12:02.000000000 +0200 >+++ aptitude-0.4.2.new/Makefile.am 2006-08-07 14:10:00.000000000 +0200 >@@ -8,7 +8,7 @@ > > SUBDIRS=$(SRCDIRS) $(DOCDIRS) m4 po tests > >-MANPAGE_LOCALES=fr gl it pl >+MANPAGE_LOCALES=gl it pl does not install the aptitude.fr.8 manpage at the root level of the tree. Cheers, -- Thomas Huriaux
diff -Nur aptitude-0.4.2/doc/fr/fixman aptitude-0.4.2.new/doc/fr/fixman --- aptitude-0.4.2/doc/fr/fixman 2006-08-02 09:12:02.000000000 +0200 +++ aptitude-0.4.2.new/doc/fr/fixman 2006-08-07 15:31:59.000000000 +0200 @@ -2,8 +2,9 @@ # this file basically copied from fixquotes (German translation) # and fixman (Finnish translation) -MANPAGE=aptitude.fr.8 +MANPAGE=aptitude.8 +iconv -f utf-8 -t iso-8859-1 $MANPAGE > $MANPAGE.tmp && mv $MANPAGE.tmp $MANPAGE # Guillement français pour la traduction des <quote>...</quote> sed -i "s/''/\\ »/g;"'s/``/«\\ /g' $MANPAGE diff -Nur aptitude-0.4.2/doc/fr/Makefile.am aptitude-0.4.2.new/doc/fr/Makefile.am --- aptitude-0.4.2/doc/fr/Makefile.am 2006-08-02 09:12:02.000000000 +0200 +++ aptitude-0.4.2.new/doc/fr/Makefile.am 2006-08-07 15:05:30.000000000 +0200 @@ -4,7 +4,8 @@ EXTRA_DIST=fixman LANGCODE=fr -MANPAGE=aptitude.$(LANGCODE).8 [EMAIL PROTECTED]@/fr +MANPAGE=aptitude.8 IMAGES = $(wildcard images/*.png) diff -Nur aptitude-0.4.2/Makefile.am aptitude-0.4.2.new/Makefile.am --- aptitude-0.4.2/Makefile.am 2006-08-02 09:12:02.000000000 +0200 +++ aptitude-0.4.2.new/Makefile.am 2006-08-07 14:10:00.000000000 +0200 @@ -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)
signature.asc
Description: Digital signature
