Преглед изворни кода

dpkg-shlibdeps(1): avoid triggering a lintian warning on translations

Translations of the manual pages end up with "\-" instead of "-" that
is in the original manual page and as such man is not allowed to break
the long path name there.

Avoid all the problems by using a shorter path in the example so that the
path doesn't end up alone on its line without any possibility to adjust on
the right.

Update the translations at the same time to avoid some fuzzy strings.
Raphaël Hertzog пре 16 година
родитељ
комит
bc348c88cb
6 измењених фајлова са 11 додато и 11 уклоњено
  1. 1 1
      man/dpkg-shlibdeps.1
  2. 2 2
      man/po/de.po
  3. 1 1
      man/po/dpkg-man.pot
  4. 2 2
      man/po/fr.po
  5. 2 2
      man/po/pl.po
  6. 3 3
      man/po/sv.po

+ 1 - 1
man/dpkg-shlibdeps.1

@@ -310,7 +310,7 @@ built within the same source package and if the shlibs files has not yet
 been created (in which case you must fix debian/rules to create
 been created (in which case you must fix debian/rules to create
 the shlibs before calling \fBdpkg\-shlibdeps\fR). Bad RPATH can also
 the shlibs before calling \fBdpkg\-shlibdeps\fR). Bad RPATH can also
 lead to the library being found under a non-canonical name (example:
 lead to the library being found under a non-canonical name (example:
-/usr/lib/gcc/i486-linux-gnu/4.2.3/../../../../lib/libssl.so.9.8 instead of
+/usr/lib/openoffice.org/../lib/libssl.so.9.8 instead of
 /usr/lib/libssl.so.0.9.8) that's not associated to any package,
 /usr/lib/libssl.so.0.9.8) that's not associated to any package,
 .B dpkg\-shlibdeps
 .B dpkg\-shlibdeps
 tries to work around this by trying to fallback on a canonical name (using
 tries to work around this by trying to fallback on a canonical name (using

+ 2 - 2
man/po/de.po

@@ -11411,7 +11411,7 @@ msgid ""
 "the same source package and if the shlibs files has not yet been created (in "
 "the same source package and if the shlibs files has not yet been created (in "
 "which case you must fix debian/rules to create the shlibs before calling "
 "which case you must fix debian/rules to create the shlibs before calling "
 "B<dpkg-shlibdeps>). Bad RPATH can also lead to the library being found under "
 "B<dpkg-shlibdeps>). Bad RPATH can also lead to the library being found under "
-"a non-canonical name (example: /usr/lib/gcc/i486-linux-gnu/4.2.3/../../../../"
+"a non-canonical name (example: /usr/lib/openoffice.org/../"
 "lib/libssl.so.9.8 instead of /usr/lib/libssl.so.0.9.8) that's not associated "
 "lib/libssl.so.9.8 instead of /usr/lib/libssl.so.0.9.8) that's not associated "
 "to any package, B<dpkg-shlibdeps> tries to work around this by trying to "
 "to any package, B<dpkg-shlibdeps> tries to work around this by trying to "
 "fallback on a canonical name (using B<realpath>(3))  but it might not always "
 "fallback on a canonical name (using B<realpath>(3))  but it might not always "
@@ -11424,7 +11424,7 @@ msgstr ""
 "rules korrigieren müssen, damit die Shlibs-Datei erstellt wird bevor B<dpkg-"
 "rules korrigieren müssen, damit die Shlibs-Datei erstellt wird bevor B<dpkg-"
 "shlibdeps> aufgerufen wird). Defekte RPATH können auch dazu führen, dass die "
 "shlibdeps> aufgerufen wird). Defekte RPATH können auch dazu führen, dass die "
 "Bibliothek unter nicht-kanonischen Namen gefunden wird (beispielsweise /usr/"
 "Bibliothek unter nicht-kanonischen Namen gefunden wird (beispielsweise /usr/"
-"lib/gcc/i486-linux-gnu/4.2.3/../../../../lib/libssl.so.9.8 statt /usr/lib/"
+"lib/openoffice.org/../lib/libssl.so.9.8 statt /usr/lib/"
 "libssl.so.0.9.8), so dass dann diese keinem Paket zugeordnet ist; B<dpkg-"
 "libssl.so.0.9.8), so dass dann diese keinem Paket zugeordnet ist; B<dpkg-"
 "shlibdeps> versucht dies zu umgehen, indem es auf einen kanonischen Namen "
 "shlibdeps> versucht dies zu umgehen, indem es auf einen kanonischen Namen "
 "(mittels B<realpath>(3)) zurückfällt, allerdings könnte dies manchmal nicht "
 "(mittels B<realpath>(3)) zurückfällt, allerdings könnte dies manchmal nicht "

+ 1 - 1
man/po/dpkg-man.pot

@@ -8978,7 +8978,7 @@ msgid ""
 "which case you must fix debian/rules to create the shlibs before calling "
 "which case you must fix debian/rules to create the shlibs before calling "
 "B<dpkg-shlibdeps>). Bad RPATH can also lead to the library being found under "
 "B<dpkg-shlibdeps>). Bad RPATH can also lead to the library being found under "
 "a non-canonical name (example: "
 "a non-canonical name (example: "
-"/usr/lib/gcc/i486-linux-gnu/4.2.3/../../../../lib/libssl.so.9.8 instead of "
+"/usr/lib/gcc/i486-\\:linux-\\:gnu/4.2.3/../../../../lib/libssl.so.9.8 instead of "
 "/usr/lib/libssl.so.0.9.8) that's not associated to any package, "
 "/usr/lib/libssl.so.0.9.8) that's not associated to any package, "
 "B<dpkg-shlibdeps> tries to work around this by trying to fallback on a "
 "B<dpkg-shlibdeps> tries to work around this by trying to fallback on a "
 "canonical name (using B<realpath>(3))  but it might not always work. It's "
 "canonical name (using B<realpath>(3))  but it might not always work. It's "

+ 2 - 2
man/po/fr.po

@@ -11093,7 +11093,7 @@ msgid ""
 "the same source package and if the shlibs files has not yet been created (in "
 "the same source package and if the shlibs files has not yet been created (in "
 "which case you must fix debian/rules to create the shlibs before calling "
 "which case you must fix debian/rules to create the shlibs before calling "
 "B<dpkg-shlibdeps>). Bad RPATH can also lead to the library being found under "
 "B<dpkg-shlibdeps>). Bad RPATH can also lead to the library being found under "
-"a non-canonical name (example: /usr/lib/gcc/i486-linux-gnu/4.2.3/../../../../"
+"a non-canonical name (example: /usr/lib/openoffice.org/../"
 "lib/libssl.so.9.8 instead of /usr/lib/libssl.so.0.9.8) that's not associated "
 "lib/libssl.so.9.8 instead of /usr/lib/libssl.so.0.9.8) that's not associated "
 "to any package, B<dpkg-shlibdeps> tries to work around this by trying to "
 "to any package, B<dpkg-shlibdeps> tries to work around this by trying to "
 "fallback on a canonical name (using B<realpath>(3))  but it might not always "
 "fallback on a canonical name (using B<realpath>(3))  but it might not always "
@@ -11105,7 +11105,7 @@ msgstr ""
 "fichiers shlibs n'aient pas encore été créés (dans ce cas debian/rules doit "
 "fichiers shlibs n'aient pas encore été créés (dans ce cas debian/rules doit "
 "être modifié pour créer le shlibs avant l'appel de B<dpkg-shlibdeps>). Un "
 "être modifié pour créer le shlibs avant l'appel de B<dpkg-shlibdeps>). Un "
 "mauvais RPATH peut aussi conduire à ce que la bibliothèque soit trouvée sous "
 "mauvais RPATH peut aussi conduire à ce que la bibliothèque soit trouvée sous "
-"un nom non-canonique (comme: /usr/lib/gcc/i486-linux-gnu/4.2.3/../../../../"
+"un nom non-canonique (comme: /usr/lib/openoffice.org/../"
 "lib/libssl.so.9.8 au lieu de /usr/lib/libssl.so.0.9.8) qui n'est associé à "
 "lib/libssl.so.9.8 au lieu de /usr/lib/libssl.so.0.9.8) qui n'est associé à "
 "aucun paquet, B<dpkg-shlibdeps> essaie de travailler sur ce nom non-"
 "aucun paquet, B<dpkg-shlibdeps> essaie de travailler sur ce nom non-"
 "canonique (en utilisant B<realpath>(3)), mais cela ne fonctionne pas "
 "canonique (en utilisant B<realpath>(3)), mais cela ne fonctionne pas "

+ 2 - 2
man/po/pl.po

@@ -11196,7 +11196,7 @@ msgid ""
 "the same source package and if the shlibs files has not yet been created (in "
 "the same source package and if the shlibs files has not yet been created (in "
 "which case you must fix debian/rules to create the shlibs before calling "
 "which case you must fix debian/rules to create the shlibs before calling "
 "B<dpkg-shlibdeps>). Bad RPATH can also lead to the library being found under "
 "B<dpkg-shlibdeps>). Bad RPATH can also lead to the library being found under "
-"a non-canonical name (example: /usr/lib/gcc/i486-linux-gnu/4.2.3/../../../../"
+"a non-canonical name (example: /usr/lib/openoffice.org/../"
 "lib/libssl.so.9.8 instead of /usr/lib/libssl.so.0.9.8) that's not associated "
 "lib/libssl.so.9.8 instead of /usr/lib/libssl.so.0.9.8) that's not associated "
 "to any package, B<dpkg-shlibdeps> tries to work around this by trying to "
 "to any package, B<dpkg-shlibdeps> tries to work around this by trying to "
 "fallback on a canonical name (using B<realpath>(3))  but it might not always "
 "fallback on a canonical name (using B<realpath>(3))  but it might not always "
@@ -11209,7 +11209,7 @@ msgstr ""
 "poprawić debian/rules aby shlibs były tworzone przed wywołaniem B<dpkg-"
 "poprawić debian/rules aby shlibs były tworzone przed wywołaniem B<dpkg-"
 "shlibdeps>). Niewłaściwa wartość RPATH może również powodować, że biblioteka "
 "shlibdeps>). Niewłaściwa wartość RPATH może również powodować, że biblioteka "
 "zostanie odnaleziona pod nietypową nazwą, która nie jest związana z żadnym "
 "zostanie odnaleziona pod nietypową nazwą, która nie jest związana z żadnym "
-"pakietem (np. /usr/lib/gcc/i486-linux-gnu/4.2.3/../../../../lib/libssl."
+"pakietem (np. /usr/lib/openoffice.org/../lib/libssl."
 "so.9.8 zamiast /usr/lib/libssl.so.0.9.8). B<dpkg-shlibdeps> próbuje poradzić "
 "so.9.8 zamiast /usr/lib/libssl.so.0.9.8). B<dpkg-shlibdeps> próbuje poradzić "
 "sobie z tym starając się odczytać nazwę kanoniczną (z użyciem B<realpath>"
 "sobie z tym starając się odczytać nazwę kanoniczną (z użyciem B<realpath>"
 "(3)) ale może to nie zawsze zadziałać. Aby uniknąć problemów, najlepiej jest "
 "(3)) ale może to nie zawsze zadziałać. Aby uniknąć problemów, najlepiej jest "

+ 3 - 3
man/po/sv.po

@@ -11078,7 +11078,7 @@ msgid ""
 "the same source package and if the shlibs files has not yet been created (in "
 "the same source package and if the shlibs files has not yet been created (in "
 "which case you must fix debian/rules to create the shlibs before calling "
 "which case you must fix debian/rules to create the shlibs before calling "
 "B<dpkg-shlibdeps>). Bad RPATH can also lead to the library being found under "
 "B<dpkg-shlibdeps>). Bad RPATH can also lead to the library being found under "
-"a non-canonical name (example: /usr/lib/gcc/i486-linux-gnu/4.2.3/../../../../"
+"a non-canonical name (example: /usr/lib/openoffice.org/../"
 "lib/libssl.so.9.8 instead of /usr/lib/libssl.so.0.9.8) that's not associated "
 "lib/libssl.so.9.8 instead of /usr/lib/libssl.so.0.9.8) that's not associated "
 "to any package, B<dpkg-shlibdeps> tries to work around this by trying to "
 "to any package, B<dpkg-shlibdeps> tries to work around this by trying to "
 "fallback on a canonical name (using B<realpath>(3))  but it might not always "
 "fallback on a canonical name (using B<realpath>(3))  but it might not always "
@@ -11089,8 +11089,8 @@ msgstr ""
 "samma källkodspaket och om shlibs-filen ännu inte har skapats (då måste du "
 "samma källkodspaket och om shlibs-filen ännu inte har skapats (då måste du "
 "fixa debian/rules så att det skapar shlibs-filen innan det anropar B<dpkg-"
 "fixa debian/rules så att det skapar shlibs-filen innan det anropar B<dpkg-"
 "shlibdeps>). Felaktig RPATH kan också leda till att biblioteket hittas under "
 "shlibdeps>). Felaktig RPATH kan också leda till att biblioteket hittas under "
-"ett icke-kanoniskt namn (till exempel: /usr/lib/gcc/i486-linux-"
-"gnu/4.2.3/../../../../lib/libssl.so.9.8 istället för /usr/lib/libssl."
+"ett icke-kanoniskt namn (till exempel: /usr/lib/openoffice.org/../"
+"lib/libssl.so.9.8 istället för /usr/lib/libssl."
 "so.0.9.8) som inte associeras till något paket, B<dpkg-shlibdeps> försöker "
 "so.0.9.8) som inte associeras till något paket, B<dpkg-shlibdeps> försöker "
 "gå runt detta genom att falla tillbaka på ett kanoniskt namn (med B<realpath>"
 "gå runt detta genom att falla tillbaka på ett kanoniskt namn (med B<realpath>"
 "(3)), men det fungerar kanske inte alltid. Det är alltid bäst att städa upp "
 "(3)), men det fungerar kanske inte alltid. Det är alltid bäst att städa upp "