r1905: * dh_installxfonts: pass --x11r7-layout to update-fonts-* commands to ensure

  they use the right new directory. Closes: #362820
* dh_installxfonts: also, alias files have moved from /etc/X11/fonts/* to
  /etc/X11/fonts/X11R7/*, update call to update-fonts-alias and the man page
  accordingly; packages containing alias files will need to switch to the
  new directory on their own.
* dh_installudev: correct documentation for --name. Closes: #363028
* Fix broken directory removal code.

3 files changed, 11 insertions, 9 deletions

diff --git a/man/po4a/po/debhelper.pot b/man/po4a/po/debhelper.pot
index c94d0049..a3b6f213 100644
--- a/man/po4a/po/debhelper.pot
+++ b/man/po4a/po/debhelper.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2006-04-14  0:39+0200\n"
+"POT-Creation-Date: 2006-04-17 15:59-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"
@@ -3853,8 +3853,8 @@ msgid ""
 "Before calling this program, you should have installed any X fonts provided "
 "by your package into the appropriate location in the package build "
 "directory, and if you have fonts.alias or fonts.scale files, you should "
-"install them into the correct location under etc/X11/fonts in your package "
-"build directory."
+"install them into the correct location under etc/X11/fonts/X11R7 in your "
+"package build directory."
 msgstr ""
 
 # type: textblock
diff --git a/man/po4a/po/es.po b/man/po4a/po/es.po
index b969c90e..1749ad9d 100644
--- 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: 2006-04-13 10:48+0200\n"
+"POT-Creation-Date: 2006-04-17 15:59-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"
@@ -5148,12 +5148,13 @@ msgstr ""
 
 # type: textblock
 #: dh_installxfonts:22
+#, fuzzy
 msgid ""
 "Before calling this program, you should have installed any X fonts provided "
 "by your package into the appropriate location in the package build "
 "directory, and if you have fonts.alias or fonts.scale files, you should "
-"install them into the correct location under etc/X11/fonts in your package "
-"build directory."
+"install them into the correct location under etc/X11/fonts/X11R7 in your "
+"package build directory."
 msgstr ""
 "Antes de llamar a este programa, debe tener instalados los tipos de letra "
 "para X proporcionados por el paquete en el lugar apropiado del directorio de "
diff --git a/man/po4a/po/fr.po b/man/po4a/po/fr.po
index 96a76b0e..14689dcc 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-04-13 10:48+0200\n"
+"POT-Creation-Date: 2006-04-17 15:59-0400\n"
 "PO-Revision-Date: 2006-04-14 11:15+0200\n"
 "Last-Translator: Valery Perrin <valery.perrin.debian@free.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -5268,12 +5268,13 @@ msgstr ""
 
 # type: textblock
 #: dh_installxfonts:22
+#, fuzzy
 msgid ""
 "Before calling this program, you should have installed any X fonts provided "
 "by your package into the appropriate location in the package build "
 "directory, and if you have fonts.alias or fonts.scale files, you should "
-"install them into the correct location under etc/X11/fonts in your package "
-"build directory."
+"install them into the correct location under etc/X11/fonts/X11R7 in your "
+"package build directory."
 msgstr ""
 "Avant d'exécuter ce programme, il est nécessaire d'avoir installé, dans "
 "l'emplacement adéquat du répertoire de construction du paquet, toutes les "