r1900: * dh_installxfonts: Random hack to deal with X font dirs moving to

  /usr/share/fonts/X11/ -- look there for fonts as well as in the old
  location, although the old location probably won't be seen by X anymore.
* dh_installxfonts: Generate misc:Depends on new xfonts-utils.
* dh_compress: compress pcm fonts under usr/share/fonts/X11/
* dh_link: change example that used X11R6 directory.

1 files changed, 14 insertions, 11 deletions

diff --git a/man/po4a/po/fr.po b/man/po4a/po/fr.po
index fb007941..dff667cd 100644
--- 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: 2006-03-30 15:23-0500\n"
+"POT-Creation-Date: 2006-04-13 10:48+0200\n"
 "PO-Revision-Date: 2006-03-28 09:11+0200\n"
 "Last-Translator: Valery Perrin <valery.perrin.debian@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -135,7 +135,7 @@ msgstr ""
 #: dh_installman:229 dh_testroot:26 dh_movefiles:162 dh_desktop:43
 #: dh_suidregister:117 dh_installchangelogs:125 dh_python:266
 #: dh_installdocs:233 dh_installcatalogs:105 dh_installmanpages:197
-#: dh_installxfonts:83 dh_installlogcheck:51
+#: dh_installxfonts:85 dh_installlogcheck:51
 msgid "SEE ALSO"
 msgstr "VOIR AUSSI"
 
@@ -150,7 +150,7 @@ msgstr "VOIR AUSSI"
 #: dh_makeshlibs:202 dh_perl:142 dh_fixperms:109 dh_listpackages:30
 #: dh_installman:231 dh_testroot:28 dh_movefiles:164 dh_suidregister:119
 #: dh_installchangelogs:127 dh_python:268 dh_installdocs:235
-#: dh_installcatalogs:107 dh_installmanpages:199 dh_installxfonts:85
+#: dh_installcatalogs:107 dh_installmanpages:199 dh_installxfonts:87
 #: dh_installlogcheck:53
 msgid "L<debhelper(7)>"
 msgstr "L<debhelper(7)>"
@@ -166,7 +166,7 @@ msgstr "L<debhelper(7)>"
 #: dh_gencontrol:77 dh_install:255 dh_makeshlibs:204 dh_perl:144
 #: dh_fixperms:111 dh_listpackages:32 dh_installman:233 dh_testroot:30
 #: dh_movefiles:166 dh_desktop:47 dh_suidregister:121 dh_installchangelogs:129
-#: dh_python:270 dh_installdocs:237 dh_installmanpages:201 dh_installxfonts:87
+#: dh_python:270 dh_installdocs:237 dh_installmanpages:201 dh_installxfonts:89
 msgid "This program is a part of debhelper."
 msgstr "Ce programme fait partie de debhelper."
 
@@ -183,7 +183,7 @@ msgstr "Ce programme fait partie de debhelper."
 #: dh_installman:235 dh_testroot:32 dh_movefiles:168 dh_desktop:49
 #: dh_suidregister:123 dh_installchangelogs:131 dh_python:272
 #: dh_installdocs:239 dh_installcatalogs:111 dh_installmanpages:203
-#: dh_installxfonts:89 dh_installlogcheck:57
+#: dh_installxfonts:91 dh_installlogcheck:57
 msgid "AUTHOR"
 msgstr "AUTEUR"
 
@@ -198,7 +198,7 @@ msgstr "AUTEUR"
 #: dh_install:259 dh_makeshlibs:208 dh_fixperms:115 dh_listpackages:36
 #: dh_installman:237 dh_testroot:34 dh_movefiles:170 dh_suidregister:125
 #: dh_installchangelogs:133 dh_installdocs:241 dh_installmanpages:205
-#: dh_installxfonts:91
+#: dh_installxfonts:93
 msgid "Joey Hess <joeyh@debian.org>"
 msgstr "Joey Hess <joeyh@debian.org>"
 
@@ -648,13 +648,14 @@ msgstr ""
 
 # type: textblock
 #: dh_compress:24
+#, fuzzy
 msgid ""
 "By default, dh_compress compresses files that debian policy mandates should "
 "be compressed, namely all files in usr/share/info, usr/share/man, usr/X11R6/"
 "man, files in usr/share/doc that are larger than 4k in size, (except the "
 "copyright file, .html and .css files, and files that appear to be already "
 "compressed based on their extensions), and all changelog files. Plus PCF "
-"fonts underneath usr/X11R6/lib/X11/fonts/"
+"fonts underneath usr/X11R6/lib/X11/fonts/ and usr/share/fonts/X11/"
 msgstr ""
 "Par défaut, dh_compress comprime les fichiers que la Charte Debian indique "
 "comme devant être comprimés. Cela concerne tous les fichiers de usr/share/"
@@ -3151,10 +3152,10 @@ msgstr "Produira un lien titi.1 pointant vers toto.1"
 
 # type: verbatim
 #: dh_link:71
-#, no-wrap
+#, fuzzy, no-wrap
 msgid ""
 " dh_link var/lib/foo usr/lib/foo \\\n"
-"   usr/X11R6/man/man1/foo.1x usr/share/man/man1/bar.1\n"
+"   usr/share/man/man1/foo.1 usr/share/man/man1/bar.1\n"
 "\n"
 msgstr ""
 " dh_link var/lib/toto usr/lib/toto \\\n"
@@ -3163,9 +3164,10 @@ msgstr ""
 
 # type: textblock
 #: dh_link:74
+#, fuzzy
 msgid ""
 "Make /usr/lib/foo/ be a link to /var/lib/foo/, and bar.1 be a symlink to the "
-"X man page foo.1x"
+"foo.1"
 msgstr ""
 "Crée un lien /usr/lib/toto qui pointe vers le fichier /var/lib/toto et un "
 "lien titi.1 qui pointe vers la page de man toto.1."
@@ -5281,8 +5283,9 @@ msgstr ""
 
 # type: textblock
 #: dh_installxfonts:28
+#, fuzzy
 msgid ""
-"Your package should depend on xutils (>= 4.0.3) so that the update-fonts-* "
+"Your package should depend on xfonts-utils so that the update-fonts-* "
 "commands are available. (This program adds that dependency to ${misc:"
 "Depends}.)"
 msgstr ""