* dh_installman: Convert all man pages in the build directory to utf-8, not

  just those installed by the program.

diff --git a/debian/changelog b/debian/changelog
index 37de9ef43ac799bd33fe7487fda1d1da89683634..057e6b01c975cbd868dc2efb706dbb1739883267 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debhelper (6.0.8) UNRELEASED; urgency=low
+
+  * dh_installman: Convert all man pages in the build directory to utf-8, not
+    just those installed by the program.
+
+ -- Joey Hess <joeyh@debian.org>  Mon, 10 Mar 2008 16:09:24 -0400
+
 debhelper (6.0.7) unstable; urgency=low
 
   * dh_lintian: Finally added this since linda is gone and there's only

diff --git a/dh_installman b/dh_installman
index e6db6414459fa88f35b56021af12a47cdf68d962..78e82ea22ebdfc5b901a4424e6678b4be9d03e0c 100755 (executable)
--- a/dh_installman
+++ b/dh_installman
@@ -38,11 +38,6 @@ like /usr/share/man/pl/man1/, that is because your program has a
 name like "foo.pl", and dh_installman assumes that means it is translated
 into Polish. Use --language=C to avoid this.
 
-dh_installman will use man to guess the character encoding of each manual
-page and convert it to UTF-8. If the guesswork fails for some reason, you
-can override it using an encoding declaration. See L<manconv(1)> for
-details.
-
 Any man page filenames specified as parameters will be installed into the
 first package dh_installman is told to act on. By default, this is the
 first binary package in debian/control, but if you use -p, -i, or -a flags,
@@ -55,6 +50,11 @@ After the man page installation step, dh_installman will check to see if
 any of the man pages in the temporary directories of any of the packages it
 is acting on contain ".so" links. If so, it changes them to symlinks.
 
+Also, dh_installman will use man to guess the character encoding of each
+manual page and convert it to UTF-8. If the guesswork fails for some
+reason, you can override it using an encoding declaration. See
+L<manconv(1)> for details.
+
 =head1 OPTIONS
 
 =over 4
@@ -97,9 +97,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
        my $file=pkgfile($package,"manpages");
        my @manpages;
 
-       if ($file) {
-               @manpages=filearray($file, ".");
-       }
+       @manpages=filearray($file, ".") if $file;
 
        if (($package eq $dh{FIRSTPACKAGE} || $dh{PARAMS_ALL}) && @ARGV) {
                push @manpages, @ARGV;
@@ -137,8 +135,6 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 
                # Now get the numeric component of the section.
                my ($realsection)=$section=~m/^(\d)/ if defined $section;
-               
-               # If there is no numeric section, bail.
                if (! $realsection) {
                        error("Could not determine section for $page");
                }
@@ -181,9 +177,6 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
                else {
                        doit "install","-p","-m644",$page,$instpage;
                }
-               complex_doit "man --recode UTF-8 \Q$instpage\E > \Q$instpage.new\E";
-               doit "chmod",644,"$instpage.new";
-               doit "mv","-f","$instpage.new",$instpage;
        }
 
        # Now the .so conversion.
@@ -198,6 +191,18 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
                doit "rm","-f",$sofile;
                doit "ln","-sf",$sodest,$sofile;
        }
+
+       # Now utf-8 conversion.
+       foreach my $dir (qw{usr/share/man usr/X11R6/man}) {
+               if (-e "$tmp/$dir") {
+                       find(sub {
+                               return unless -f $_;
+                               complex_doit "man --recode UTF-8 ./\Q$_\E > \Q$_.new\E";
+                               doit "chmod",644,"$_.new";
+                               doit "mv","-f","$_.new",$_;
+                       }, "$tmp/$dir");
+               }
+       }
 }
 
 # Check if a file is a .so man page, for use by File::Find.

diff --git a/man/po4a/po/debhelper.pot b/man/po4a/po/debhelper.pot
index 3d8615c2e236e4bfb6697b8c731c56cb3078ec21..bf26976d6eef88c8b0c2380d28f1e44b91f9787e 100644 (file)
--- a/man/po4a/po/debhelper.pot
+++ b/man/po4a/po/debhelper.pot
@@ -2,12 +2,12 @@
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2008-01-28 16:36-0500\n"
+"POT-Creation-Date: 2008-03-10 18:31-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -864,7 +864,7 @@ msgid ""
 msgstr ""
 
 # type: =head1
-#: debhelper.pod:478 dh_builddeb:85 dh_clean:106 dh_compress:189 dh_desktop:47 dh_fixperms:110 dh_gconf:90 dh_gencontrol:73 dh_installcatalogs:111 dh_installchangelogs:125 dh_installcron:61 dh_installdebconf:118 dh_installdeb:94 dh_installdirs:83 dh_installdocs:237 dh_installemacsen:109 dh_installexamples:103 dh_installinfo:103 dh_installinit:197 dh_installlogcheck:51 dh_installlogrotate:50 dh_installmanpages:197 dh_installman:241 dh_installmenu:80 dh_installmime:85 dh_installmodules:116 dh_installpam:52 dh_install:251 dh_installppp:56 dh_installwm:107 dh_installxfonts:86 dh_link:223 dh_listpackages:28 dh_makeshlibs:222 dh_md5sums:86 dh_movefiles:162 dh_perl:140 dh_python:282 dh_scrollkeeper:76 dh_shlibdeps:159 dh_strip:224 dh_suidregister:117 dh_testdir:43 dh_testroot:26 dh_testversion:74 dh_undocumented:28 dh_usrlocal:114
+#: debhelper.pod:478 dh_builddeb:85 dh_clean:106 dh_compress:189 dh_desktop:47 dh_fixperms:110 dh_gconf:90 dh_gencontrol:73 dh_installcatalogs:111 dh_installchangelogs:125 dh_installcron:61 dh_installdebconf:118 dh_installdeb:94 dh_installdirs:83 dh_installdocs:237 dh_installemacsen:109 dh_installexamples:103 dh_installinfo:103 dh_installinit:197 dh_installlogcheck:51 dh_installlogrotate:50 dh_installmanpages:197 dh_installman:246 dh_installmenu:80 dh_installmime:85 dh_installmodules:116 dh_installpam:52 dh_install:251 dh_installppp:56 dh_installwm:107 dh_installxfonts:86 dh_link:223 dh_listpackages:28 dh_makeshlibs:222 dh_md5sums:86 dh_movefiles:162 dh_perl:140 dh_python:282 dh_scrollkeeper:76 dh_shlibdeps:159 dh_strip:224 dh_suidregister:117 dh_testdir:43 dh_testroot:26 dh_testversion:74 dh_undocumented:28 dh_usrlocal:114
 msgid "SEE ALSO"
 msgstr ""
 
@@ -889,12 +889,12 @@ msgid "Debhelper web site."
 msgstr ""
 
 # type: =head1
-#: debhelper.pod:492 dh_builddeb:91 dh_clean:112 dh_compress:195 dh_desktop:53 dh_fixperms:116 dh_gconf:96 dh_gencontrol:79 dh_installcatalogs:117 dh_installchangelogs:131 dh_installcron:67 dh_installdebconf:124 dh_installdeb:100 dh_installdirs:89 dh_installdocs:243 dh_installemacsen:115 dh_installexamples:109 dh_installinfo:109 dh_installinit:203 dh_installlogcheck:57 dh_installlogrotate:56 dh_installmanpages:203 dh_installman:247 dh_installmenu:88 dh_installmime:91 dh_installmodules:122 dh_installpam:58 dh_install:257 dh_installppp:62 dh_installwm:113 dh_installxfonts:92 dh_link:229 dh_listpackages:34 dh_makeshlibs:228 dh_md5sums:92 dh_movefiles:168 dh_perl:146 dh_python:288 dh_scrollkeeper:82 dh_shlibdeps:165 dh_strip:230 dh_suidregister:123 dh_testdir:49 dh_testroot:32 dh_testversion:80 dh_undocumented:34 dh_usrlocal:120
+#: debhelper.pod:492 dh_builddeb:91 dh_clean:112 dh_compress:195 dh_desktop:53 dh_fixperms:116 dh_gconf:96 dh_gencontrol:79 dh_installcatalogs:117 dh_installchangelogs:131 dh_installcron:67 dh_installdebconf:124 dh_installdeb:100 dh_installdirs:89 dh_installdocs:243 dh_installemacsen:115 dh_installexamples:109 dh_installinfo:109 dh_installinit:203 dh_installlogcheck:57 dh_installlogrotate:56 dh_installmanpages:203 dh_installman:252 dh_installmenu:88 dh_installmime:91 dh_installmodules:122 dh_installpam:58 dh_install:257 dh_installppp:62 dh_installwm:113 dh_installxfonts:92 dh_link:229 dh_listpackages:34 dh_makeshlibs:228 dh_md5sums:92 dh_movefiles:168 dh_perl:146 dh_python:288 dh_scrollkeeper:82 dh_shlibdeps:165 dh_strip:230 dh_suidregister:123 dh_testdir:49 dh_testroot:32 dh_testversion:80 dh_undocumented:34 dh_usrlocal:120
 msgid "AUTHOR"
 msgstr ""
 
 # type: textblock
-#: debhelper.pod:494 dh_builddeb:93 dh_clean:114 dh_compress:197 dh_fixperms:118 dh_gencontrol:81 dh_installchangelogs:133 dh_installcron:69 dh_installdebconf:126 dh_installdeb:102 dh_installdirs:91 dh_installdocs:245 dh_installemacsen:117 dh_installexamples:111 dh_installinfo:111 dh_installinit:205 dh_installlogrotate:58 dh_installmanpages:205 dh_installman:249 dh_installmenu:90 dh_installmime:93 dh_installmodules:124 dh_installpam:60 dh_install:259 dh_installppp:64 dh_installwm:115 dh_installxfonts:94 dh_link:231 dh_listpackages:36 dh_makeshlibs:230 dh_md5sums:94 dh_movefiles:170 dh_shlibdeps:167 dh_strip:232 dh_suidregister:125 dh_testdir:51 dh_testroot:34 dh_testversion:82 dh_undocumented:36
+#: debhelper.pod:494 dh_builddeb:93 dh_clean:114 dh_compress:197 dh_fixperms:118 dh_gencontrol:81 dh_installchangelogs:133 dh_installcron:69 dh_installdebconf:126 dh_installdeb:102 dh_installdirs:91 dh_installdocs:245 dh_installemacsen:117 dh_installexamples:111 dh_installinfo:111 dh_installinit:205 dh_installlogrotate:58 dh_installmanpages:205 dh_installman:254 dh_installmenu:90 dh_installmime:93 dh_installmodules:124 dh_installpam:60 dh_install:259 dh_installppp:64 dh_installwm:115 dh_installxfonts:94 dh_link:231 dh_listpackages:36 dh_makeshlibs:230 dh_md5sums:94 dh_movefiles:170 dh_shlibdeps:167 dh_strip:232 dh_suidregister:125 dh_testdir:51 dh_testroot:34 dh_testversion:82 dh_undocumented:36
 msgid "Joey Hess <joeyh@debian.org>"
 msgstr ""
 
@@ -962,12 +962,12 @@ msgid "Pass I<params> to L<dpkg-deb(1)> when it is used to build the package."
 msgstr ""
 
 # type: textblock
-#: dh_builddeb:87 dh_clean:108 dh_compress:191 dh_fixperms:112 dh_gconf:92 dh_gencontrol:75 dh_installcatalogs:113 dh_installchangelogs:127 dh_installcron:63 dh_installdebconf:120 dh_installdeb:96 dh_installdirs:85 dh_installdocs:239 dh_installemacsen:111 dh_installexamples:105 dh_installinfo:105 dh_installinit:199 dh_installlogcheck:53 dh_installlogrotate:52 dh_installmanpages:199 dh_installman:243 dh_installmime:87 dh_installmodules:118 dh_installpam:54 dh_install:253 dh_installppp:58 dh_installwm:109 dh_installxfonts:88 dh_link:225 dh_listpackages:30 dh_makeshlibs:224 dh_md5sums:88 dh_movefiles:164 dh_perl:142 dh_python:284 dh_strip:226 dh_suidregister:119 dh_testdir:45 dh_testroot:28 dh_testversion:76 dh_undocumented:30 dh_usrlocal:116
+#: dh_builddeb:87 dh_clean:108 dh_compress:191 dh_fixperms:112 dh_gconf:92 dh_gencontrol:75 dh_installcatalogs:113 dh_installchangelogs:127 dh_installcron:63 dh_installdebconf:120 dh_installdeb:96 dh_installdirs:85 dh_installdocs:239 dh_installemacsen:111 dh_installexamples:105 dh_installinfo:105 dh_installinit:199 dh_installlogcheck:53 dh_installlogrotate:52 dh_installmanpages:199 dh_installman:248 dh_installmime:87 dh_installmodules:118 dh_installpam:54 dh_install:253 dh_installppp:58 dh_installwm:109 dh_installxfonts:88 dh_link:225 dh_listpackages:30 dh_makeshlibs:224 dh_md5sums:88 dh_movefiles:164 dh_perl:142 dh_python:284 dh_strip:226 dh_suidregister:119 dh_testdir:45 dh_testroot:28 dh_testversion:76 dh_undocumented:30 dh_usrlocal:116
 msgid "L<debhelper(7)>"
 msgstr ""
 
 # type: textblock
-#: dh_builddeb:89 dh_clean:110 dh_compress:193 dh_desktop:51 dh_fixperms:114 dh_gconf:94 dh_gencontrol:77 dh_installchangelogs:129 dh_installcron:65 dh_installdebconf:122 dh_installdeb:98 dh_installdirs:87 dh_installdocs:241 dh_installemacsen:113 dh_installexamples:107 dh_installinfo:107 dh_installinit:201 dh_installlogrotate:54 dh_installmanpages:201 dh_installman:245 dh_installmenu:86 dh_installmime:89 dh_installmodules:120 dh_installpam:56 dh_install:255 dh_installppp:60 dh_installwm:111 dh_installxfonts:90 dh_link:227 dh_listpackages:32 dh_makeshlibs:226 dh_md5sums:90 dh_movefiles:166 dh_perl:144 dh_python:286 dh_scrollkeeper:80 dh_shlibdeps:163 dh_strip:228 dh_suidregister:121 dh_testdir:47 dh_testroot:30 dh_testversion:78 dh_undocumented:32 dh_usrlocal:118
+#: dh_builddeb:89 dh_clean:110 dh_compress:193 dh_desktop:51 dh_fixperms:114 dh_gconf:94 dh_gencontrol:77 dh_installchangelogs:129 dh_installcron:65 dh_installdebconf:122 dh_installdeb:98 dh_installdirs:87 dh_installdocs:241 dh_installemacsen:113 dh_installexamples:107 dh_installinfo:107 dh_installinit:201 dh_installlogrotate:54 dh_installmanpages:201 dh_installman:250 dh_installmenu:86 dh_installmime:89 dh_installmodules:120 dh_installpam:56 dh_install:255 dh_installppp:60 dh_installwm:111 dh_installxfonts:90 dh_link:227 dh_listpackages:32 dh_makeshlibs:226 dh_md5sums:90 dh_movefiles:166 dh_perl:144 dh_python:286 dh_scrollkeeper:80 dh_shlibdeps:163 dh_strip:228 dh_suidregister:121 dh_testdir:47 dh_testroot:30 dh_testversion:78 dh_undocumented:32 dh_usrlocal:118
 msgid "This program is a part of debhelper."
 msgstr ""
 
@@ -2340,15 +2340,6 @@ msgstr ""
 # type: textblock
 #: dh_installman:41
 msgid ""
-"dh_installman will use man to guess the character encoding of each manual "
-"page and convert it to UTF-8. If the guesswork fails for some reason, you "
-"can override it using an encoding declaration. See L<manconv(1)> for "
-"details."
-msgstr ""
-
-# type: textblock
-#: dh_installman:46
-msgid ""
 "Any man page filenames specified as parameters will be installed into the "
 "first package dh_installman is told to act on. By default, this is the first "
 "binary package in debian/control, but if you use -p, -i, or -a flags, it "
@@ -2356,20 +2347,29 @@ msgid ""
 msgstr ""
 
 # type: textblock
-#: dh_installman:51
+#: dh_installman:46
 msgid ""
 "Files named debian/package.manpages can list other man pages to be "
 "installed."
 msgstr ""
 
 # type: textblock
-#: dh_installman:54
+#: dh_installman:49
 msgid ""
 "After the man page installation step, dh_installman will check to see if any "
 "of the man pages in the temporary directories of any of the packages it is "
 "acting on contain \".so\" links. If so, it changes them to symlinks."
 msgstr ""
 
+# type: textblock
+#: dh_installman:53
+msgid ""
+"Also, dh_installman will use man to guess the character encoding of each "
+"manual page and convert it to UTF-8. If the guesswork fails for some reason, "
+"you can override it using an encoding declaration. See L<manconv(1)> for "
+"details."
+msgstr ""
+
 # type: =item
 #: dh_installman:67
 msgid "B<--language>=ll"

diff --git a/man/po4a/po/es.po b/man/po4a/po/es.po
index bcde3b89c3a5b3324d19356430fa47c8fb4a192b..27ff0b4d611932ea0b454d41d7c62ececa761b50 100644 (file)
--- a/man/po4a/po/es.po
+++ b/man/po4a/po/es.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2008-01-28 16:36-0500\n"
+"POT-Creation-Date: 2008-03-10 18:31-0400\n"
 "PO-Revision-Date: 2005-09-18 00:11+0200\n"
 "Last-Translator: Rubén Porras Campo <debian-l10n-spanish@lists.debian.org>\n"
 "Language-Team: SPANISH <debian-l10n-spanish@lists.debian.org>\n"
@@ -1150,7 +1150,7 @@ msgstr ""
 #: dh_installdeb:94 dh_installdirs:83 dh_installdocs:237 dh_installemacsen:109
 #: dh_installexamples:103 dh_installinfo:103 dh_installinit:197
 #: dh_installlogcheck:51 dh_installlogrotate:50 dh_installmanpages:197
-#: dh_installman:241 dh_installmenu:80 dh_installmime:85 dh_installmodules:116
+#: dh_installman:246 dh_installmenu:80 dh_installmime:85 dh_installmodules:116
 #: dh_installpam:52 dh_install:251 dh_installppp:56 dh_installwm:107
 #: dh_installxfonts:86 dh_link:223 dh_listpackages:28 dh_makeshlibs:222
 #: dh_md5sums:86 dh_movefiles:162 dh_perl:140 dh_python:282 dh_scrollkeeper:76
@@ -1186,7 +1186,7 @@ msgstr "Web de Debhelper."
 #: dh_installdeb:100 dh_installdirs:89 dh_installdocs:243
 #: dh_installemacsen:115 dh_installexamples:109 dh_installinfo:109
 #: dh_installinit:203 dh_installlogcheck:57 dh_installlogrotate:56
-#: dh_installmanpages:203 dh_installman:247 dh_installmenu:88
+#: dh_installmanpages:203 dh_installman:252 dh_installmenu:88
 #: dh_installmime:91 dh_installmodules:122 dh_installpam:58 dh_install:257
 #: dh_installppp:62 dh_installwm:113 dh_installxfonts:92 dh_link:229
 #: dh_listpackages:34 dh_makeshlibs:228 dh_md5sums:92 dh_movefiles:168
@@ -1202,7 +1202,7 @@ msgstr "AUTOR"
 #: dh_installdebconf:126 dh_installdeb:102 dh_installdirs:91
 #: dh_installdocs:245 dh_installemacsen:117 dh_installexamples:111
 #: dh_installinfo:111 dh_installinit:205 dh_installlogrotate:58
-#: dh_installmanpages:205 dh_installman:249 dh_installmenu:90
+#: dh_installmanpages:205 dh_installman:254 dh_installmenu:90
 #: dh_installmime:93 dh_installmodules:124 dh_installpam:60 dh_install:259
 #: dh_installppp:64 dh_installwm:115 dh_installxfonts:94 dh_link:231
 #: dh_listpackages:36 dh_makeshlibs:230 dh_md5sums:94 dh_movefiles:170
@@ -1298,7 +1298,7 @@ msgstr "Pasa I<par
 #: dh_installcron:63 dh_installdebconf:120 dh_installdeb:96 dh_installdirs:85
 #: dh_installdocs:239 dh_installemacsen:111 dh_installexamples:105
 #: dh_installinfo:105 dh_installinit:199 dh_installlogcheck:53
-#: dh_installlogrotate:52 dh_installmanpages:199 dh_installman:243
+#: dh_installlogrotate:52 dh_installmanpages:199 dh_installman:248
 #: dh_installmime:87 dh_installmodules:118 dh_installpam:54 dh_install:253
 #: dh_installppp:58 dh_installwm:109 dh_installxfonts:88 dh_link:225
 #: dh_listpackages:30 dh_makeshlibs:224 dh_md5sums:88 dh_movefiles:164
@@ -1313,7 +1313,7 @@ msgstr "L<debhelper(7)>"
 #: dh_installdebconf:122 dh_installdeb:98 dh_installdirs:87 dh_installdocs:241
 #: dh_installemacsen:113 dh_installexamples:107 dh_installinfo:107
 #: dh_installinit:201 dh_installlogrotate:54 dh_installmanpages:201
-#: dh_installman:245 dh_installmenu:86 dh_installmime:89 dh_installmodules:120
+#: dh_installman:250 dh_installmenu:86 dh_installmime:89 dh_installmodules:120
 #: dh_installpam:56 dh_install:255 dh_installppp:60 dh_installwm:111
 #: dh_installxfonts:90 dh_link:227 dh_listpackages:32 dh_makeshlibs:226
 #: dh_md5sums:90 dh_movefiles:166 dh_perl:144 dh_python:286 dh_scrollkeeper:80
@@ -3142,14 +3142,6 @@ msgstr ""
 # type: textblock
 #: dh_installman:41
 msgid ""
-"dh_installman will use man to guess the character encoding of each manual "
-"page and convert it to UTF-8. If the guesswork fails for some reason, you "
-"can override it using an encoding declaration. See L<manconv(1)> for details."
-msgstr ""
-
-# type: textblock
-#: dh_installman:46
-msgid ""
 "Any man page filenames specified as parameters will be installed into the "
 "first package dh_installman is told to act on. By default, this is the first "
 "binary package in debian/control, but if you use -p, -i, or -a flags, it "
@@ -3161,7 +3153,7 @@ msgstr ""
 "-a, será el primer paquete especificado por estas opciones."
 
 # type: textblock
-#: dh_installman:51
+#: dh_installman:46
 msgid ""
 "Files named debian/package.manpages can list other man pages to be installed."
 msgstr ""
@@ -3169,7 +3161,7 @@ msgstr ""
 "manual a instalar."
 
 # type: textblock
-#: dh_installman:54
+#: dh_installman:49
 msgid ""
 "After the man page installation step, dh_installman will check to see if any "
 "of the man pages in the temporary directories of any of the packages it is "
@@ -3180,6 +3172,15 @@ msgstr ""
 "de cualquiera de los paquetes sobre los que está actuando contienen enlaces "
 "\".so\". Si es así, los cambia por enlaces simbólicos."
 
+# type: textblock
+#: dh_installman:53
+msgid ""
+"Also, dh_installman will use man to guess the character encoding of each "
+"manual page and convert it to UTF-8. If the guesswork fails for some reason, "
+"you can override it using an encoding declaration. See L<manconv(1)> for "
+"details."
+msgstr ""
+
 # type: =item
 #: dh_installman:67
 msgid "B<--language>=ll"

diff --git a/man/po4a/po/fr.po b/man/po4a/po/fr.po
index a3410fc20d43c776ba75967bc9d42dc18e9cf837..af627a0849f947dcc4ac01ba32dc51c600bdd9c9 100644 (file)
--- a/man/po4a/po/fr.po
+++ b/man/po4a/po/fr.po
@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: debhelper manpages\n"
-"POT-Creation-Date: 2008-01-28 16:36-0500\n"
+"POT-Creation-Date: 2008-03-10 18:31-0400\n"
 "PO-Revision-Date: 2006-11-19 20:50+0100\n"
 "Last-Translator: Valery Perrin <valery.perrin.debian@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -1177,7 +1177,7 @@ msgstr ""
 #: dh_installdeb:94 dh_installdirs:83 dh_installdocs:237 dh_installemacsen:109
 #: dh_installexamples:103 dh_installinfo:103 dh_installinit:197
 #: dh_installlogcheck:51 dh_installlogrotate:50 dh_installmanpages:197
-#: dh_installman:241 dh_installmenu:80 dh_installmime:85 dh_installmodules:116
+#: dh_installman:246 dh_installmenu:80 dh_installmime:85 dh_installmodules:116
 #: dh_installpam:52 dh_install:251 dh_installppp:56 dh_installwm:107
 #: dh_installxfonts:86 dh_link:223 dh_listpackages:28 dh_makeshlibs:222
 #: dh_md5sums:86 dh_movefiles:162 dh_perl:140 dh_python:282 dh_scrollkeeper:76
@@ -1214,7 +1214,7 @@ msgstr "Le site internet de debhelper."
 #: dh_installdeb:100 dh_installdirs:89 dh_installdocs:243
 #: dh_installemacsen:115 dh_installexamples:109 dh_installinfo:109
 #: dh_installinit:203 dh_installlogcheck:57 dh_installlogrotate:56
-#: dh_installmanpages:203 dh_installman:247 dh_installmenu:88
+#: dh_installmanpages:203 dh_installman:252 dh_installmenu:88
 #: dh_installmime:91 dh_installmodules:122 dh_installpam:58 dh_install:257
 #: dh_installppp:62 dh_installwm:113 dh_installxfonts:92 dh_link:229
 #: dh_listpackages:34 dh_makeshlibs:228 dh_md5sums:92 dh_movefiles:168
@@ -1230,7 +1230,7 @@ msgstr "AUTEUR"
 #: dh_installdebconf:126 dh_installdeb:102 dh_installdirs:91
 #: dh_installdocs:245 dh_installemacsen:117 dh_installexamples:111
 #: dh_installinfo:111 dh_installinit:205 dh_installlogrotate:58
-#: dh_installmanpages:205 dh_installman:249 dh_installmenu:90
+#: dh_installmanpages:205 dh_installman:254 dh_installmenu:90
 #: dh_installmime:93 dh_installmodules:124 dh_installpam:60 dh_install:259
 #: dh_installppp:64 dh_installwm:115 dh_installxfonts:94 dh_link:231
 #: dh_listpackages:36 dh_makeshlibs:230 dh_md5sums:94 dh_movefiles:170
@@ -1327,7 +1327,7 @@ msgstr ""
 #: dh_installcron:63 dh_installdebconf:120 dh_installdeb:96 dh_installdirs:85
 #: dh_installdocs:239 dh_installemacsen:111 dh_installexamples:105
 #: dh_installinfo:105 dh_installinit:199 dh_installlogcheck:53
-#: dh_installlogrotate:52 dh_installmanpages:199 dh_installman:243
+#: dh_installlogrotate:52 dh_installmanpages:199 dh_installman:248
 #: dh_installmime:87 dh_installmodules:118 dh_installpam:54 dh_install:253
 #: dh_installppp:58 dh_installwm:109 dh_installxfonts:88 dh_link:225
 #: dh_listpackages:30 dh_makeshlibs:224 dh_md5sums:88 dh_movefiles:164
@@ -1342,7 +1342,7 @@ msgstr "L<debhelper(7)>"
 #: dh_installdebconf:122 dh_installdeb:98 dh_installdirs:87 dh_installdocs:241
 #: dh_installemacsen:113 dh_installexamples:107 dh_installinfo:107
 #: dh_installinit:201 dh_installlogrotate:54 dh_installmanpages:201
-#: dh_installman:245 dh_installmenu:86 dh_installmime:89 dh_installmodules:120
+#: dh_installman:250 dh_installmenu:86 dh_installmime:89 dh_installmodules:120
 #: dh_installpam:56 dh_install:255 dh_installppp:60 dh_installwm:111
 #: dh_installxfonts:90 dh_link:227 dh_listpackages:32 dh_makeshlibs:226
 #: dh_md5sums:90 dh_movefiles:166 dh_perl:144 dh_python:286 dh_scrollkeeper:80
@@ -3213,14 +3213,6 @@ msgstr ""
 # type: textblock
 #: dh_installman:41
 msgid ""
-"dh_installman will use man to guess the character encoding of each manual "
-"page and convert it to UTF-8. If the guesswork fails for some reason, you "
-"can override it using an encoding declaration. See L<manconv(1)> for details."
-msgstr ""
-
-# type: textblock
-#: dh_installman:46
-msgid ""
 "Any man page filenames specified as parameters will be installed into the "
 "first package dh_installman is told to act on. By default, this is the first "
 "binary package in debian/control, but if you use -p, -i, or -a flags, it "
@@ -3233,7 +3225,7 @@ msgstr ""
 "paquet indiqué par ces options."
 
 # type: textblock
-#: dh_installman:51
+#: dh_installman:46
 msgid ""
 "Files named debian/package.manpages can list other man pages to be installed."
 msgstr ""
@@ -3241,7 +3233,7 @@ msgstr ""
 "de manuel à installer."
 
 # type: textblock
-#: dh_installman:54
+#: dh_installman:49
 msgid ""
 "After the man page installation step, dh_installman will check to see if any "
 "of the man pages in the temporary directories of any of the packages it is "
@@ -3252,6 +3244,15 @@ msgstr ""
 "traités, contiennent des liens S<« .so »>. Dans ce cas il les transforme en "
 "liens symboliques."
 
+# type: textblock
+#: dh_installman:53
+msgid ""
+"Also, dh_installman will use man to guess the character encoding of each "
+"manual page and convert it to UTF-8. If the guesswork fails for some reason, "
+"you can override it using an encoding declaration. See L<manconv(1)> for "
+"details."
+msgstr ""
+
 # type: =item
 #: dh_installman:67
 msgid "B<--language>=ll"