Package: diffutils Version: 1:3.6-1 Followup-For: Bug #464000 This documentation bug is still present and it just "hit" me. If upstream documentation is correct but it can't be used directly for DFSG issues, then I think this is a Debian specific bug and not upstream one.
I've coded a partial patch that fixes the english and italian documentation (only languages I speak), but I don't know how to make the dpkg-buildpackage command recompile the po/*.po files to their po/*.gmo binary format. If I `make distdir` they get recompiled without any errors, but then dpkg-buildpackage refuses to include them into the .deb package. My bad, I lack the skills. If the maintainer decides my patch is any good, then we need to open a new bug report for the translation of the patch in all other languages and finally include the translations into my patch, before the maintainer can actually accept it and close this bug as fixed. -- System Information: Debian Release: buster/sid APT prefers unstable APT policy: (994, 'unstable'), (700, 'stable'), (500, 'oldstable-updates'), (500, 'oldstable') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 4.12.0-1-amd64 (SMP w/4 CPU cores) Locale: LANG=it_IT.utf8, LC_CTYPE=it_IT.utf8 (charmap=UTF-8), LANGUAGE=it_IT.utf8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) Versions of packages diffutils depends on: ii libc6 2.24-17 diffutils recommends no packages. Versions of packages diffutils suggests: ii diffutils-doc 1:3.6-1 pn wdiff <none> -- no debconf information
Description: Partially fixes #464000 Document that --verbose output is octal for bytes values also in the manpage and in the --help output. The fix is present only in the english and italian translation (I do not speak any other languages). . diffutils (1:3.6-1) unstable; urgency=low . * Debian specific * Makes progress on: #464000. Author: Lucio Crusca <lu...@sulweb.org> Bug-Debian: https://bugs.debian.org/464000 --- The information above should follow the Patch Tagging Guidelines, please checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here are templates for supplementary fields that you might want to add: Origin: <vendor|upstream|other>, <url of original patch> Bug: <url in upstream bugtracker> Bug-Debian: https://bugs.debian.org/<bugnumber> Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber> Forwarded: <no|not-needed|url proving that it has been forwarded> Reviewed-By: <name and email of someone who approved the patch> Last-Update: 2017-11-19 --- diffutils-3.6.orig/po/ca.po +++ diffutils-3.6/po/ca.po @@ -556,7 +556,7 @@ msgstr "" #: src/cmp.c:165 #, fuzzy msgid "" -"-l, --verbose output byte numbers and differing byte values" +"-l, --verbose output decimal byte numbers and differing byte octal values" msgstr "-l --verbose Mostra la posició i valor dels octets que difereixen." #: src/cmp.c:166 --- diffutils-3.6.orig/po/cs.po +++ diffutils-3.6/po/cs.po @@ -561,7 +561,7 @@ msgstr "" #: src/cmp.c:165 msgid "" -"-l, --verbose output byte numbers and differing byte values" +"-l, --verbose output decimal byte numbers and differing byte octal values" msgstr "-l --verbose vypÃÅ¡e pozice a hodnoty rozdÃlných bajtů" #: src/cmp.c:166 --- diffutils-3.6.orig/po/da.po +++ diffutils-3.6/po/da.po @@ -562,7 +562,7 @@ msgstr "" #: src/cmp.c:165 msgid "" -"-l, --verbose output byte numbers and differing byte values" +"-l, --verbose output decimal byte numbers and differing byte octal values" msgstr "" "-l, --verbose vis numre og værdier for de byte, der er " "forskellige" --- diffutils-3.6.orig/po/de.po +++ diffutils-3.6/po/de.po @@ -566,7 +566,7 @@ msgstr "" #: src/cmp.c:165 msgid "" -"-l, --verbose output byte numbers and differing byte values" +"-l, --verbose output decimal byte numbers and differing byte octal values" msgstr "" "-l, --verbose Bytenummern und Werte aller unterschiedlichen\n" " Bytes ausgeben." --- diffutils-3.6.orig/po/el.po +++ diffutils-3.6/po/el.po @@ -560,7 +560,7 @@ msgstr "" #: src/cmp.c:165 msgid "" -"-l, --verbose output byte numbers and differing byte values" +"-l, --verbose output decimal byte numbers and differing byte octal values" msgstr "-l --verbose ÎÎ¾Î¿Î´Î¿Ï Î±ÏÎ¹Î¸Î¼Î¿Ï ÎºÎ±Î¹ ÏÎ¹Î¼Î®Ï ÏλÏν ÏÏν bytes ÏÎ¿Ï Î´Î¹Î±ÏÎÏÎ¿Ï Î½." #: src/cmp.c:166 --- diffutils-3.6.orig/po/eo.po +++ diffutils-3.6/po/eo.po @@ -569,7 +569,7 @@ msgstr "" #: src/cmp.c:165 msgid "" -"-l, --verbose output byte numbers and differing byte values" +"-l, --verbose output decimal byte numbers and differing byte octal values" msgstr "" "-l, --verbose montri numerojn kaj valorojn de Äiuj malsamaj " "bajtoj" --- diffutils-3.6.orig/po/es.po +++ diffutils-3.6/po/es.po @@ -626,7 +626,7 @@ msgstr "" #: src/cmp.c:165 msgid "" -"-l, --verbose output byte numbers and differing byte values" +"-l, --verbose output decimal byte numbers and differing byte octal values" msgstr "" "-l, --verbose muestra los números de byte y valores de todos los bytes " "que\n" --- diffutils-3.6.orig/po/fi.po +++ diffutils-3.6/po/fi.po @@ -569,7 +569,7 @@ msgstr "" #: src/cmp.c:165 #, fuzzy msgid "" -"-l, --verbose output byte numbers and differing byte values" +"-l, --verbose output decimal byte numbers and differing byte octal values" msgstr "-I --verbose Näytä kaikkien eroavien tavujen sijainnit ja arvot" #: src/cmp.c:166 --- diffutils-3.6.orig/po/fr.po +++ diffutils-3.6/po/fr.po @@ -563,7 +563,7 @@ msgstr "" #: src/cmp.c:165 msgid "" -"-l, --verbose output byte numbers and differing byte values" +"-l, --verbose output decimal byte numbers and differing byte octal values" msgstr "" "-l, --verbose Afficher les numéros d'octets et les valeurs de " "tous les octets qui diffèrent." --- diffutils-3.6.orig/po/ga.po +++ diffutils-3.6/po/ga.po @@ -562,7 +562,7 @@ msgstr " Gabh thar an chéad SCIP1 beart #: src/cmp.c:165 #, fuzzy msgid "" -"-l, --verbose output byte numbers and differing byte values" +"-l, --verbose output decimal byte numbers and differing byte octal values" msgstr "" "-l --verbose Taispeáin uimhreacha agus luachanna do bhearta uile difriúla." --- diffutils-3.6.orig/po/gl.po +++ diffutils-3.6/po/gl.po @@ -566,7 +566,7 @@ msgstr "" #: src/cmp.c:165 #, fuzzy msgid "" -"-l, --verbose output byte numbers and differing byte values" +"-l, --verbose output decimal byte numbers and differing byte octal values" msgstr "-l --verbose Amosar os números e valores dos bytes que difiran." #: src/cmp.c:166 --- diffutils-3.6.orig/po/he.po +++ diffutils-3.6/po/he.po @@ -536,7 +536,7 @@ msgstr ".éðùä õáå÷á íéúá N2 ìòå ïåùàøä õ #: src/cmp.c:165 #, fuzzy msgid "" -"-l, --verbose output byte numbers and differing byte values" +"-l, --verbose output decimal byte numbers and differing byte octal values" msgstr ".íéäæ íðéàù íéúáä ìë ìù ãå÷å éøåãéñ 'ñî âöä -l --verbose" #: src/cmp.c:166 --- diffutils-3.6.orig/po/hr.po +++ diffutils-3.6/po/hr.po @@ -566,7 +566,7 @@ msgstr "" #: src/cmp.c:165 msgid "" -"-l, --verbose output byte numbers and differing byte values" +"-l, --verbose output decimal byte numbers and differing byte octal values" msgstr "" "-l, --verbose ispiÅ¡i brojeve i vrijednosti bajtova koji se " "razlikuju" --- diffutils-3.6.orig/po/hu.po +++ diffutils-3.6/po/hu.po @@ -570,7 +570,7 @@ msgstr "" #: src/cmp.c:165 msgid "" -"-l, --verbose output byte numbers and differing byte values" +"-l, --verbose output decimal byte numbers and differing byte octal values" msgstr "" "-l, --verbose a bájt számok és az eltérÅ bájt értékek kiÃrása" --- diffutils-3.6.orig/po/id.po +++ diffutils-3.6/po/id.po @@ -564,7 +564,7 @@ msgstr "" #: src/cmp.c:165 msgid "" -"-l, --verbose output byte numbers and differing byte values" +"-l, --verbose output decimal byte numbers and differing byte octal values" msgstr "" "-l, --verbose Keluarkan jumlah byte dan nilai semua byte yang berbeda." --- diffutils-3.6.orig/po/it.po +++ diffutils-3.6/po/it.po @@ -560,9 +560,9 @@ msgstr "" # Lo strano allineamento della seconda riga è corretto. #: src/cmp.c:165 msgid "" -"-l, --verbose output byte numbers and differing byte values" +"-l, --verbose output decimal byte numbers and differing byte octal values" msgstr "" -"-l, --verbose Mostra i numeri e i valori di tutti i byte\n" +"-l, --verbose Mostra i numeri in decimale e i valori ottali di tutti i byte\n" " differenti" # Solitamente viene usato NUM quando si vuole specificare un numero. --- diffutils-3.6.orig/po/ja.po +++ diffutils-3.6/po/ja.po @@ -570,7 +570,7 @@ msgstr "" #: src/cmp.c:165 msgid "" -"-l, --verbose output byte numbers and differing byte values" +"-l, --verbose output decimal byte numbers and differing byte octal values" msgstr "-l, --verbose ãã¤ãæ°ããã³ç°ãªããã¤ãã®å¤ãåºåãã" #: src/cmp.c:166 --- diffutils-3.6.orig/po/lv.po +++ diffutils-3.6/po/lv.po @@ -568,7 +568,7 @@ msgstr "" #: src/cmp.c:165 msgid "" -"-l, --verbose output byte numbers and differing byte values" +"-l, --verbose output decimal byte numbers and differing byte octal values" msgstr "" "-l, --verbose izvadÄ«t baitu numurus un atÅ¡Ä·irÄ«go baitu vÄrtÄ«bas" --- diffutils-3.6.orig/po/ms.po +++ diffutils-3.6/po/ms.po @@ -575,7 +575,7 @@ msgstr "" #: src/cmp.c:165 #, fuzzy msgid "" -"-l, --verbose output byte numbers and differing byte values" +"-l, --verbose output decimal byte numbers and differing byte octal values" msgstr "-l --verbose Keluarkan nombor byte dan nilai semua byte berbeza." #: src/cmp.c:166 --- diffutils-3.6.orig/po/nb.po +++ diffutils-3.6/po/nb.po @@ -560,7 +560,7 @@ msgstr "" #: src/cmp.c:165 msgid "" -"-l, --verbose output byte numbers and differing byte values" +"-l, --verbose output decimal byte numbers and differing byte octal values" msgstr "" "-l, --verbose skriv ut byte-nummer og avvikende byte-verdier" --- diffutils-3.6.orig/po/nl.po +++ diffutils-3.6/po/nl.po @@ -567,7 +567,7 @@ msgstr "" #: src/cmp.c:165 msgid "" -"-l, --verbose output byte numbers and differing byte values" +"-l, --verbose output decimal byte numbers and differing byte octal values" msgstr "" "-l, --verbose bytenummers en -waarden tonen van bytes die " "verschillen" --- diffutils-3.6.orig/po/pl.po +++ diffutils-3.6/po/pl.po @@ -558,7 +558,7 @@ msgstr "" #: src/cmp.c:165 msgid "" -"-l, --verbose output byte numbers and differing byte values" +"-l, --verbose output decimal byte numbers and differing byte octal values" msgstr "" "-I --verbose wypisanie poÅożeÅ i kodów wszystkich różniÄ cych " "siÄ bajtów" --- diffutils-3.6.orig/po/pt_BR.po +++ diffutils-3.6/po/pt_BR.po @@ -563,7 +563,7 @@ msgstr "" #: src/cmp.c:165 msgid "" -"-l, --verbose output byte numbers and differing byte values" +"-l, --verbose output decimal byte numbers and differing byte octal values" msgstr "" "-l, --verbose emite os números de bytes e os valores de\n" " todos os bytes diferentes" --- diffutils-3.6.orig/po/ro.po +++ diffutils-3.6/po/ro.po @@ -540,7 +540,7 @@ msgstr "" #: src/cmp.c:165 #, fuzzy msgid "" -"-l, --verbose output byte numbers and differing byte values" +"-l, --verbose output decimal byte numbers and differing byte octal values" msgstr "" "-l --verbose Tipãreºte numerele octeþilor ºi valorile octeþilor diferiþi." --- diffutils-3.6.orig/po/ru.po +++ diffutils-3.6/po/ru.po @@ -559,7 +559,7 @@ msgstr "" #: src/cmp.c:165 msgid "" -"-l, --verbose output byte numbers and differing byte values" +"-l, --verbose output decimal byte numbers and differing byte octal values" msgstr "" "-l, --verbose вÑводиÑÑ Ð½Ð¾Ð¼ÐµÑа и знаÑÐµÐ½Ð¸Ñ Ð²ÑÐµÑ ÑазлиÑаÑÑÐ¸Ñ ÑÑ Ð±Ð°Ð¹Ñ" --- diffutils-3.6.orig/po/sr.po +++ diffutils-3.6/po/sr.po @@ -557,7 +557,7 @@ msgstr "" #: src/cmp.c:165 msgid "" -"-l, --verbose output byte numbers and differing byte values" +"-l, --verbose output decimal byte numbers and differing byte octal values" msgstr "" "-l --verbose иÑпиÑÑÑе Ñедни бÑÐ¾Ñ Ð¸ вÑедноÑÑ Ð±Ð°ÑÑова " "коÑи Ñе ÑазликÑÑÑ." --- diffutils-3.6.orig/po/sv.po +++ diffutils-3.6/po/sv.po @@ -560,7 +560,7 @@ msgstr "" #: src/cmp.c:165 msgid "" -"-l, --verbose output byte numbers and differing byte values" +"-l, --verbose output decimal byte numbers and differing byte octal values" msgstr "" "-l, --verbose skriv ut bytenummer och värde för alla skiljande " "byte" --- diffutils-3.6.orig/po/tr.po +++ diffutils-3.6/po/tr.po @@ -587,7 +587,7 @@ msgstr "" #: src/cmp.c:165 msgid "" -"-l, --verbose output byte numbers and differing byte values" +"-l, --verbose output decimal byte numbers and differing byte octal values" msgstr "" "-l, --verbose bütün farklı baytların numaralarını ve " "deÄerlerini göster" --- diffutils-3.6.orig/po/uk.po +++ diffutils-3.6/po/uk.po @@ -562,7 +562,7 @@ msgstr "" #: src/cmp.c:165 msgid "" -"-l, --verbose output byte numbers and differing byte values" +"-l, --verbose output decimal byte numbers and differing byte octal values" msgstr "" "-l --verbose вивеÑÑи номеÑи Ñа знаÑÐµÐ½Ð½Ñ ÑÑÑÑ ÑÑÐ·Ð½Ð¸Ñ Ð±Ð°Ð¹ÑÑв" --- diffutils-3.6.orig/po/vi.po +++ diffutils-3.6/po/vi.po @@ -564,7 +564,7 @@ msgstr "" #: src/cmp.c:165 msgid "" -"-l, --verbose output byte numbers and differing byte values" +"-l, --verbose output decimal byte numbers and differing byte octal values" msgstr "" "-l, --verbose xuất sá» byte và giá trá» của tất cả byte khác nhau" --- diffutils-3.6.orig/po/zh_CN.po +++ diffutils-3.6/po/zh_CN.po @@ -567,7 +567,7 @@ msgstr "" #: src/cmp.c:165 msgid "" -"-l, --verbose output byte numbers and differing byte values" +"-l, --verbose output decimal byte numbers and differing byte octal values" msgstr "-l, --verbose è¾åºææç¸å¼åèçåèæ°åå 容" #: src/cmp.c:166 --- diffutils-3.6.orig/po/zh_TW.po +++ diffutils-3.6/po/zh_TW.po @@ -553,7 +553,7 @@ msgstr " ç¥é FILE1 çæå SKIP1 å #: src/cmp.c:165 #, fuzzy msgid "" -"-l, --verbose output byte numbers and differing byte values" +"-l, --verbose output decimal byte numbers and differing byte octal values" msgstr "-l --verbose é¡¯ç¤ºå ©è ææç¸ç°çä½ç½®åå®åçä½å çµæ¸å¼ã" #: src/cmp.c:166 --- diffutils-3.6.orig/src/cmp.c +++ diffutils-3.6/src/cmp.c @@ -162,7 +162,7 @@ static char const * const option_help_ms N_("-i, --ignore-initial=SKIP skip first SKIP bytes of both inputs"), N_("-i, --ignore-initial=SKIP1:SKIP2 skip first SKIP1 bytes of FILE1 and\n" " first SKIP2 bytes of FILE2"), - N_("-l, --verbose output byte numbers and differing byte values"), + N_("-l, --verbose output decimal byte numbers and differing byte octal values"), N_("-n, --bytes=LIMIT compare at most LIMIT bytes"), N_("-s, --quiet, --silent suppress all normal output"), N_(" --help display this help and exit"),
