[Pkg-mc-commits] r217 - in branch/cdbs/debian/patches: . man

Denis Briand narcan-guest at alioth.debian.org
Sun Aug 2 21:51:25 UTC 2009 

Author: narcan-guest
Date: 2009-08-02 21:51:24 +0000 (Sun, 02 Aug 2009)
New Revision: 217

Added:
   branch/cdbs/debian/patches/man/24_mcedit.patch
   branch/cdbs/debian/patches/man/25_mcview.patch
Modified:
   branch/cdbs/debian/patches/man/17_es.patch
   branch/cdbs/debian/patches/man/18_hu.patch
   branch/cdbs/debian/patches/man/19_it.patch
   branch/cdbs/debian/patches/man/20_pl.patch
   branch/cdbs/debian/patches/man/21_ru.patch
   branch/cdbs/debian/patches/man/22_sr.patch
   branch/cdbs/debian/patches/man/23_man.patch
   branch/cdbs/debian/patches/series
Log:
DONE, need a review


Modified: branch/cdbs/debian/patches/man/17_es.patch
===================================================================
--- branch/cdbs/debian/patches/man/17_es.patch	2009-08-02 20:35:48 UTC (rev 216)
+++ branch/cdbs/debian/patches/man/17_es.patch	2009-08-02 21:51:24 UTC (rev 217)
@@ -1,7 +1,8 @@
+Fix hyphen-used-as-minus-sign and manpage-has-errors-from-man
 Index: mc-4.7.0-pre1/doc/man/es/mc.1.in
 ===================================================================
---- mc-4.7.0-pre1.orig/doc/man/es/mc.1.in	2009-08-02 21:27:11.000000000 +0200
-+++ mc-4.7.0-pre1/doc/man/es/mc.1.in	2009-08-02 21:31:27.000000000 +0200
+--- mc-4.7.0-pre1.orig/doc/man/es/mc.1.in	2009-08-02 23:03:18.000000000 +0200
++++ mc-4.7.0-pre1/doc/man/es/mc.1.in	2009-08-02 23:04:00.000000000 +0200
 @@ -12,7 +12,7 @@
  .\"SKIP_SECTION"
  .SH "SINTAXIS"
@@ -718,6 +719,15 @@
  .fi
  .PP
  .B Condiciones aditivas
+@@ -1507,7 +1507,7 @@
+ incluida en el menú.
+ .PP
+ Podemos combinar condiciones por defecto y aditivas comenzando la condición con
+-'+=' o '=+' (o '+=?' o '=+?' si queremos depurar). Si nosotros queremos
++\&'+=' o '=+' (o '+=?' o '=+?' si queremos depurar). Si nosotros queremos
+ condiciones diferentes, una para añadir y otra por
+ defecto, una entrada de menú con dos líneas de condición, una
+ comenzando con '+' y otra con '='.
 @@ -1574,10 +1574,10 @@
  .PP
  .I Mostrar Archivos de Respaldo.
@@ -849,6 +859,18 @@
  .\"NODE "Advanced Chown"
  .SH "Cambiar Dueño y Permisos"
  Cambiar Dueño y Permisos combina
+@@ -2293,9 +2293,9 @@
+ .PP
+ Si usamos '\\U' o '\\L' en la máscara destino, los siguientes caracteres
+ serán convertidos a mayúsculas o minúsculas respectivamente hasta encontrar
+-'\\E' o un segundo '\\U' o '\\L' o el fin del nombre del archivo.
++\&'\\E' o un segundo '\\U' o '\\L' o el fin del nombre del archivo.
+ .PP
+-'\\u' y '\\l' tienen prioridad sobre '\\U' y '\\L'.
++\&'\\u' y '\\l' tienen prioridad sobre '\\U' y '\\L'.
+ .PP
+ Por ejemplo, si la máscara fuente es '*' (con Patrones Shell activo) o '^\\(.*\\)$'
+ (Patrones Shell desactivado) y la máscara destino es '\\L\\u*' los nombres de archivos
 @@ -2324,10 +2324,10 @@
  pueden entremezclar como en:
  .PP

Modified: branch/cdbs/debian/patches/man/18_hu.patch
===================================================================
--- branch/cdbs/debian/patches/man/18_hu.patch	2009-08-02 20:35:48 UTC (rev 216)
+++ branch/cdbs/debian/patches/man/18_hu.patch	2009-08-02 21:51:24 UTC (rev 217)
@@ -1,7 +1,8 @@
+Fix hyphen-used-as-minus-sign and manpage-has-errors-from-man
 Index: mc-4.7.0-pre1/doc/man/hu/mc.1.in
 ===================================================================
---- mc-4.7.0-pre1.orig/doc/man/hu/mc.1.in	2009-08-02 21:33:50.000000000 +0200
-+++ mc-4.7.0-pre1/doc/man/hu/mc.1.in	2009-08-02 21:39:55.000000000 +0200
+--- mc-4.7.0-pre1.orig/doc/man/hu/mc.1.in	2009-08-02 23:08:29.000000000 +0200
++++ mc-4.7.0-pre1/doc/man/hu/mc.1.in	2009-08-02 23:11:15.000000000 +0200
 @@ -6,7 +6,7 @@
  .\"SKIP_SECTION"
  .SH "ALKALMAZÁSA"
@@ -614,7 +615,7 @@
  .PP
  Egy érték fix méretének megadásához (mezőszélesség megadás), csak egy
 -':'-ra van szükséged és azt követően a megjelenített érték karaktereinek
-+':'\-ra van szükséged és azt követően a megjelenített érték karaktereinek
++\&':'\-ra van szükséged és azt követően a megjelenített érték karaktereinek
  számára, ha a szám egy '+' jelet követ, akkor a méret meghatározás a
  minimum érték szélességet adja meg, ha a program több helyet talál a
  képernyőn, mint ami az alap megjelenítéshez szükséges, ki tudja
@@ -992,8 +993,12 @@
  .fi
  .PP
  A minta lehet a shell által értelmezett, vagy lehet szabványos
-@@ -1469,11 +1469,11 @@
- '=t t' feltétel igaz akkor, ha a jelenlegi panelben vannak kijelölt
+@@ -1466,14 +1466,14 @@
+ .PP
+ Például az 'rlf' bejegyzés esetén lehet fájl, link, vagy fifo. A 't'
+ típus egy kicsit különleges, mert nem fájlon, hanem panelen dolgozik. A
+-'=t t' feltétel igaz akkor, ha a jelenlegi panelben vannak kijelölt
++\&'=t t' feltétel igaz akkor, ha a jelenlegi panelben vannak kijelölt
  fájlok és hamis, ha nincsennek.
  .PP
 -Ha a feltétel '=?'-lel kezdődik '=' helyett, a hibakereső (debug)
@@ -1035,7 +1040,7 @@
 -A magyarázat sorát '#'-kal kell kezdened. A kiegészítő magyarázat sorait
 -'#'-kal, space-szel, vagy tab-bal kell kezdened.
 +A magyarázat sorát '#'\-kal kell kezdened. A kiegészítő magyarázat sorait
-+'#'\-kal, space\-szel, vagy tab\-bal kell kezdened.
++\&'#'\-kal, space\-szel, vagy tab\-bal kell kezdened.
  .\"NODE "  Options Menu"
  .SH "  Beállítások"
  A Midnight Commander rendelkezik néhány olyan opcióval, amely lehetővé
@@ -1218,8 +1223,9 @@
  működnek, mióta néhány Terminál adatbázis megváltozott.
  .PP
  A mezőket a Tab gombbal és a vi mozgató gombjaival ('h' balra, 'j' le,
- 'k' fel és 'l' jobbra) járhatod körbe. Ha egy kurzor gombot legalább
+-'k' fel és 'l' jobbra) járhatod körbe. Ha egy kurzor gombot legalább
 -egyszer megnyomsz, OK-val jelöli; kilépéskor ez a állapot elmenthető.
++\&'k' fel és 'l' jobbra) járhatod körbe. Ha egy kurzor gombot legalább
 +egyszer megnyomsz, OK\-val jelöli; kilépéskor ez a állapot elmenthető.
  .PP
  Ezek közül bármelyiket tesztelheted a gomb lenyomásával. Amint
@@ -1412,8 +1418,9 @@
  maszk csoportjának, a második '*' megfelel a második csoportnak, és így
  tovább. A '\\1' maszk megfelel a forrás maszk első maszk csoportjának, a
 -'\\2' maszk megfelel a második csoportnak, és ez így megy '\\9'-ig. A
-+'\\2' maszk megfelel a második csoportnak, és ez így megy '\\9'\-ig. A
- '\\0' maszk jelentése: a forrás fájl teljes neve.
+-'\\0' maszk jelentése: a forrás fájl teljes neve.
++\&'\\2' maszk megfelel a második csoportnak, és ez így megy '\\9'\-ig. A
++\&'\\0' maszk jelentése: a forrás fájl teljes neve.
  .PP
  Két példa:
  .PP
@@ -1428,7 +1435,7 @@
  a forrásmaszkja a "*.*" lesz, a rendeltetésé pedig a "\\2.\\1".
  .PP
  .B "Shell kifejezések ki"
-@@ -2296,17 +2296,17 @@
+@@ -2296,30 +2296,30 @@
  Egyébként a cél maszk használata egyszerűbb, ha a Shell kifejezések
  opció be van kapcsolva.
  .PP
@@ -1443,14 +1450,16 @@
 -Ha a '\\U'-t, vagy '\\L'-t használod a cél maszkban a következő
 +Ha a '\\U'\-t, vagy '\\L'\-t használod a cél maszkban a következő
  karakterek naggyá, illetve kicsivé fognak változni egészen addig, amíg
- '\\E', vagy '\\U', '\\L', vagy a fájlnév vége következik.
+-'\\E', vagy '\\U', '\\L', vagy a fájlnév vége következik.
++\&'\\E', vagy '\\U', '\\L', vagy a fájlnév vége következik.
  .PP
 -Az '\\u' és '\\l' erősebb az '\\U'-nál és az '\\L'-nél.
 +Az '\\u' és '\\l' erősebb az '\\U'\-nál és az '\\L'\-nél.
  .PP
  Például, ha a forrás maszk '*' (Shell kifejezés be van kapcsolva), vagy
- '^\\(.*\\)$' (Shell kifejezés ki van kapcsolva) és a célmaszk '\\L\\u*'
-@@ -2314,12 +2314,12 @@
+-'^\\(.*\\)$' (Shell kifejezés ki van kapcsolva) és a célmaszk '\\L\\u*'
++\&'^\\(.*\\)$' (Shell kifejezés ki van kapcsolva) és a célmaszk '\\L\\u*'
+ a fájl nevek eleje nagybetűsre konvertálódik, a többi betű pedig
  kicsire.
  .PP
  Ezeken kívül még használhatod a '\\' karaktert, mint hivatkozó

Modified: branch/cdbs/debian/patches/man/19_it.patch
===================================================================
--- branch/cdbs/debian/patches/man/19_it.patch	2009-08-02 20:35:48 UTC (rev 216)
+++ branch/cdbs/debian/patches/man/19_it.patch	2009-08-02 21:51:24 UTC (rev 217)
@@ -1,7 +1,8 @@
+Fix hyphen-used-as-minus-sign and manpage-has-errors-from-man
 Index: mc-4.7.0-pre1/doc/man/it/mc.1.in
 ===================================================================
---- mc-4.7.0-pre1.orig/doc/man/it/mc.1.in	2009-08-02 21:40:36.000000000 +0200
-+++ mc-4.7.0-pre1/doc/man/it/mc.1.in	2009-08-02 21:47:16.000000000 +0200
+--- mc-4.7.0-pre1.orig/doc/man/it/mc.1.in	2009-08-02 22:45:20.000000000 +0200
++++ mc-4.7.0-pre1/doc/man/it/mc.1.in	2009-08-02 22:50:08.000000000 +0200
 @@ -27,7 +27,7 @@
  .\"SKIP_SECTION"
  .SH "USO"
@@ -727,6 +728,15 @@
  .fi
  .PP
  .B Condizioni Addizione
+@@ -1508,7 +1508,7 @@
+ di condizione, una che comincia con '+' e l'altra con '='.
+ .PP
+ I commenti cominciano con '#'. Linee di commento aggiuntive devono cominciare con
+-'#', spazi o tabulazioni.
++\&'#', spazi o tabulazioni.
+ .\"NODE "  Options Menu"
+ .SH "  Menu opzioni"
+ Il Midnight Commander possiede alcune opzioni che possono essere
 @@ -1573,11 +1573,11 @@
  .PP
  .I Mostra file di backup.

Modified: branch/cdbs/debian/patches/man/20_pl.patch
===================================================================
--- branch/cdbs/debian/patches/man/20_pl.patch	2009-08-02 20:35:48 UTC (rev 216)
+++ branch/cdbs/debian/patches/man/20_pl.patch	2009-08-02 21:51:24 UTC (rev 217)
@@ -1,7 +1,8 @@
+Fix hyphen-used-as-minus-sign and manpage-has-errors-from-man
 Index: mc-4.7.0-pre1/doc/man/pl/mc.1.in
 ===================================================================
---- mc-4.7.0-pre1.orig/doc/man/pl/mc.1.in	2009-08-02 21:48:30.000000000 +0200
-+++ mc-4.7.0-pre1/doc/man/pl/mc.1.in	2009-08-02 21:52:31.000000000 +0200
+--- mc-4.7.0-pre1.orig/doc/man/pl/mc.1.in	2009-08-02 23:11:37.000000000 +0200
++++ mc-4.7.0-pre1/doc/man/pl/mc.1.in	2009-08-02 23:17:24.000000000 +0200
 @@ -2,11 +2,11 @@
  .TH MC 1 "January 2003" "MC Version 4.6.0" "GNU Midnight Commander"
  .\"SKIP_SECTION"
@@ -270,7 +271,8 @@
 -.BR M-y .
 +.BR M\-y .
  Przenosi do poprzedniego katalogu w historii, podobne do kliknięcia myszką.
- '<'.
+-'<'.
++\&'<'.
  .PP
 -.BR M-u .
 +.BR M\-u .
@@ -742,12 +744,21 @@
  .fi
  .PP
  .B Warunki dodania
+@@ -1276,7 +1276,7 @@
+ .PP
+ Możesz łączyć ze sobą standardowe i dodane warunki zaczynając warunek od
+ kombinacji
+-'+=' lub '=+' (lub '+=?' lub '=+?' jeśli chcesz zobaczyć trasę błędów).
++\&'+=' lub '=+' (lub '+=?' lub '=+?' jeśli chcesz zobaczyć trasę błędów).
+ Jeśli chcesz użyć różnych warunków, dodanego i standardowego,
+ możesz poprzedzić wpis menu dwoma wierszami warunkowymi. Jednym zaczynającym
+ się od znaku '+', a drugim od '='.
 @@ -1333,11 +1333,11 @@
  .PP
  .I Show Backup Files.
  Standardowo Midnight Commander nie wyświetla plików kończących się znakiem
 -'~' (tak jak komenda ls -B w wersji GNU).
-+'~' (tak jak komenda ls \-B w wersji GNU).
++\&'~' (tak jak komenda ls \-B w wersji GNU).
  .PP
  .I Show Hidden Files.
  Standardowo Midnight Commander wyświetla wszystkie pliki zaczynające się
@@ -873,6 +884,30 @@
  .PP
  .\"NODE "Advanced Chown"
  .SH "Zaawansowane chown (Advanced Chown)"
+@@ -1920,7 +1920,7 @@
+ .B "Use shell patterns on"
+ .PP
+ Jeśli opcja obsługi wzorców powłoki jest włączona, możesz używać znaków '*' i
+-'?' w maskach źródłowych. Działają one tak jak w powłoce. W masce docelowej możesz
++\&'?' w maskach źródłowych. Działają one tak jak w powłoce. W masce docelowej możesz
+ używać tylko '*' i '\\<cyfra>'. Pierwsza maska '*' w nazwie docelowej
+ odnosi sie do pierwszej gwiazdki w masce źródłowej, druga do drugiej itd.
+ Joker '\\1' odnosi się do pierwszego jokera w masce źródłowej, '\\2' odnosi
+@@ -1958,12 +1958,12 @@
+ .B "Konwersje nazwy (Case Conversions)"
+ .PP
+ Możesz również zmieniać nazwy plików. Jeśli użyjesz '\\u' lub
+-'\\l' w masce docelowej, następny znak będzie przekonwertowany na
++\&'\\l' w masce docelowej, następny znak będzie przekonwertowany na
+ duży lub mały, zależnie od podanej opcji.
+ .PP
+ Jeśli użyjesz '\\U' lub '\\L' w masce docelowej, następne znaki będą
+ zmieniane na małe lub duże (zależnie od opcji), aż do napotkania znaku
+-'\\E' lub następnych '\\U', '\\L' bądź też końca linii.
++\&'\\E' lub następnych '\\U', '\\L' bądź też końca linii.
+ .PP
+ Konwersje '\\u' i '\\l' mają wyższy priorytet niż '\\U' i '\\L'.
+ .PP
 @@ -2026,11 +2026,11 @@
  .B F7
  Normalne wyszukiwanie\wyszukiwanie w trybie hex.

Modified: branch/cdbs/debian/patches/man/21_ru.patch
===================================================================
--- branch/cdbs/debian/patches/man/21_ru.patch	2009-08-02 20:35:48 UTC (rev 216)
+++ branch/cdbs/debian/patches/man/21_ru.patch	2009-08-02 21:51:24 UTC (rev 217)
@@ -1,7 +1,8 @@
+Fix hyphen-used-as-minus-sign and manpage-has-errors-from-man
 Index: mc-4.7.0-pre1/doc/man/ru/mc.1.in
 ===================================================================
---- mc-4.7.0-pre1.orig/doc/man/ru/mc.1.in	2009-08-02 21:53:10.000000000 +0200
-+++ mc-4.7.0-pre1/doc/man/ru/mc.1.in	2009-08-02 22:03:19.000000000 +0200
+--- mc-4.7.0-pre1.orig/doc/man/ru/mc.1.in	2009-08-02 22:54:19.000000000 +0200
++++ mc-4.7.0-pre1/doc/man/ru/mc.1.in	2009-08-02 22:58:52.000000000 +0200
 @@ -3,18 +3,18 @@
  .TH MC 1 "Январь 2003" "MC Version 4.6.0" "GNU Midnight Commander"
  .\"SKIP_SECTION"
@@ -1496,6 +1497,15 @@
  .PP
  Опция
  .B "Образцы в стиле shell"
+@@ -2679,7 +2679,7 @@
+ выключена, MC не осуществляет автоматической группировки. Для указания
+ групп символов в маске источника, которые будут соответствовать символам
+ замены в маске приемника, вы должны в этом случае использовать скобки
+-'\\(...\\)'. Этот способ более гибкий, но требует больше усилий при
++\&'\\(...\\)'. Этот способ более гибкий, но требует больше усилий при
+ вводе.
+ .PP
+ Два примера:
 @@ -2690,7 +2690,7 @@
  .PP
  Предположим, что вы хотите поменять местами имя файла и его расширение,
@@ -1505,7 +1515,13 @@
  .PP
  .B "Преобразование регистра"
  .PP
-@@ -2710,7 +2710,7 @@
+@@ -2705,12 +2705,12 @@
+ или конца имени файла.
+ .PP
+ Применение '\\u' и '\\l' обеспечивает более широкие возможности, чем
+-'\\U' и '\\L'.
++\&'\\U' и '\\L'.
+ .PP
  Например, если маска источника есть '*' (опция "Образцы в стиле shell"
  включена) или '^\\(.*\\)$' (опция "Образцы в стиле shell" выключена), а
  маска приемника есть '\\L\\u*', имена файлов будут преобразованы таким

Modified: branch/cdbs/debian/patches/man/22_sr.patch
===================================================================
--- branch/cdbs/debian/patches/man/22_sr.patch	2009-08-02 20:35:48 UTC (rev 216)
+++ branch/cdbs/debian/patches/man/22_sr.patch	2009-08-02 21:51:24 UTC (rev 217)
@@ -1,3 +1,4 @@
+Fix hyphen-used-as-minus-sign and manpage-has-errors-from-man
 Index: mc-4.7.0-pre1/doc/man/sr/mc.1.in
 ===================================================================
 --- mc-4.7.0-pre1.orig/doc/man/sr/mc.1.in	2009-08-02 22:04:02.000000000 +0200

Modified: branch/cdbs/debian/patches/man/23_man.patch
===================================================================
--- branch/cdbs/debian/patches/man/23_man.patch	2009-08-02 20:35:48 UTC (rev 216)
+++ branch/cdbs/debian/patches/man/23_man.patch	2009-08-02 21:51:24 UTC (rev 217)
@@ -1,3 +1,4 @@
+Fix hyphen-used-as-minus-sign and manpage-has-errors-from-man
 Index: mc-4.7.0-pre1/doc/man/mc.1.in
 ===================================================================
 --- mc-4.7.0-pre1.orig/doc/man/mc.1.in	2009-08-02 22:24:39.000000000 +0200

Added: branch/cdbs/debian/patches/man/24_mcedit.patch
===================================================================
--- branch/cdbs/debian/patches/man/24_mcedit.patch	                        (rev 0)
+++ branch/cdbs/debian/patches/man/24_mcedit.patch	2009-08-02 21:51:24 UTC (rev 217)
@@ -0,0 +1,221 @@
+Fix hyphen-used-as-minus-sign
+Index: mc-4.7.0-pre1/doc/man/mcedit.1.in
+===================================================================
+--- mc-4.7.0-pre1.orig/doc/man/mcedit.1.in	2009-08-02 23:42:06.000000000 +0200
++++ mc-4.7.0-pre1/doc/man/mcedit.1.in	2009-08-02 23:42:54.000000000 +0200
+@@ -1,4 +1,4 @@
+-.TH MCEDIT 1 "August 2009" "MC Version 4.7.0-pre1" "GNU Midnight Commander"
++.TH MCEDIT 1 "August 2009" "MC Version 4.7.0\-pre1" "GNU Midnight Commander"
+ .SH NAME
+ mcedit \- Internal file editor of GNU Midnight Commander.
+ .SH USAGE
+@@ -42,49 +42,49 @@
+ Disable mouse support.
+ .TP
+ .I "\-f"
+-Display the compiled-in search path for GNU Midnight Commander data
++Display the compiled\-in search path for GNU Midnight Commander data
+ files.
+ .TP
+ .I "\-t"
+ Force using termcap database instead of terminfo.  This option is only
+-applicable if GNU Midnight Commander was compiled with S-Lang library
++applicable if GNU Midnight Commander was compiled with S\-Lang library
+ with terminfo support.
+ .TP
+ .I "\-V"
+ Display the version of the program.
+ .TP
+ .I "\-x"
+-Force xterm mode.  Used when running on xterm-capable terminals (two
++Force xterm mode.  Used when running on xterm\-capable terminals (two
+ screen modes, and able to send mouse escape sequences).
+ .SH FEATURES
+-The internal file editor is a full-featured full screen editor.  It can
++The internal file editor is a full\-featured full screen editor.  It can
+ edit files up to 64 megabytes.  It is possible to edit binary files. 
+ The features it presently supports are: block copy, move, delete, cut,
+-paste; key for key undo; pull-down menus; file insertion; macro
++paste; key for key undo; pull\-down menus; file insertion; macro
+ commands; regular expression search and replace (and our own
+-scanf-printf search and replace); shift-arrow text highlighting (if
+-supported by the terminal); insert-overwrite toggle; word wrap;
++scanf\-printf search and replace); shift\-arrow text highlighting (if
++supported by the terminal); insert\-overwrite toggle; word wrap;
+ autoindent; tunable tab size; syntax highlighting for various file
+ types; and an option to pipe text blocks through shell commands like
+ indent and ispell.
+ .SH KEYS
+ The editor is easy to use and can be used without learning.  The
+-pull-down menu is invoked by pressing F9.  You can learn other keys from
++pull\-down menu is invoked by pressing F9.  You can learn other keys from
+ the menu and from the button bar labels.
+ .PP
+ In addition to that, Shift combined with arrows does text highlighting
+ (if supported by the terminal):
+-.B Ctrl-Ins
++.B Ctrl\-Ins
+ copies to the file
+ .BR ~/.mc/cedit/cooledit.clip ,
+-.B Shift-Ins
++.B Shift\-Ins
+ pastes from
+ .BR ~/.mc/cedit/cooledit.clip ,
+-.B Shift-Del
++.B Shift\-Del
+ cuts to
+ .BR ~/.mc/cedit/cooledit.clip ,
+ and
+-.B Ctrl-Del
++.B Ctrl\-Del
+ deletes highlighted text.  Mouse highlighting also works on some
+ terminals.  To use the standard mouse support provided by your terminal,
+ hold the Shift key.  Please note that the mouse support in the terminal
+@@ -92,19 +92,19 @@
+ .BR mcedit .
+ .PP
+ The completion key (usually
+-.B "Meta-Tab"
++.B "Meta\-Tab"
+ or
+ .BR "Escape Tab" )
+ completes the word under the cursor using the words used earlier in the
+ file.
+ .PP
+ To define a macro, press
+-.B Ctrl-R
++.B Ctrl\-R
+ and then type out the keys you want to be executed.  Press
+-.B Ctrl-R
++.B Ctrl\-R
+ again when finished.  You can then assign the macro to any key you like
+ by pressing that key.  The macro is executed when you press
+-.B Ctrl-A
++.B Ctrl\-A
+ and then the assigned key.  The macro is also executed if you press
+ Meta, Ctrl, or Esc and the assigned key, provided that the key is not
+ used for any other function.  The macro commands are stored in the file
+@@ -125,7 +125,7 @@
+ will be created for you from the default template.  Feel free to edit it
+ if you need.
+ .PP
+-.B C-p
++.B C\-p
+ will run ispell on a block of text in a similar way.  The script file
+ will be called
+ .BR ~/.mc/cedit/edit.spell.rc .
+@@ -139,19 +139,19 @@
+ .B mcedit
+ can be used to navigation through code with tags files created by etags
+ or ctags commands. If there is no file TAGS code navigation would not work.
+-In example, in case of exuberant-ctags for C language command will be:
++In example, in case of exuberant\-ctags for C language command will be:
+ .PP
+-ctags -e --language-force=C -R ./
++ctags \-e \-\-language\-force=C \-R ./
+ .PP
+-.B Meta-Enter 
++.B Meta\-Enter 
+ show list box to select item under cursor (cusor should stand at end of
+ word).
+ .PP
+-.B Meta-Minus 
+-where minus is symbol "-" go to previous function in navigation list (like a browser
++.B Meta\-Minus 
++where minus is symbol "\-" go to previous function in navigation list (like a browser
+ Back).
+ .PP
+-.B Meta-Equal
++.B Meta\-Equal
+ where equal is symbol "=" go to next function in navigation list (like a browser
+ Forward).
+ .PP
+@@ -161,7 +161,7 @@
+ (like C comments, string constants, etc) are highlighted in different
+ colors.  The following section explains the format of the file
+ .BR ~/.mc/cedit/Syntax .
+-If this file is missing, system-wide
++If this file is missing, system\-wide
+ .B @prefix@/share/mc/syntax/Syntax
+ is used.
+ The file
+@@ -452,14 +452,14 @@
+ .TP
+ .I editor_line_state
+ show state line of editor now it show number of file line (in future it
+-can show things like folding, breakpoints, etc.). M-n toglle this option.
++can show things like folding, breakpoints, etc.). M\-n toglle this option.
+ .TP
+ .I editor_visible_spaces
+ Toggle show visible trailing spaces (TWS), if editor_visible_spaces=1 TWS
+ showed as '.'
+ .TP
+ .I editor_visible_tabs
+-Toggle show visible tabs, if editor_visible_tabs=1 tabs showed as '<---->'
++Toggle show visible tabs, if editor_visible_tabs=1 tabs showed as '<\-\-\-\->'
+ .TP
+ .I editor_persistent_selections
+ Do not remove block selection after moving the cursor.
+@@ -480,7 +480,7 @@
+ save file position on exit.
+ .TP
+ .I source_codepage
+-symbol representation of codepage name for file (i.e. CP1251, ~ - default).
++symbol representation of codepage name for file (i.e. CP1251, ~ \- default).
+ .SH MISCELLANEOUS
+ You can use scanf search and replace to search and replace a C format
+ string.  First take a look at the
+@@ -515,7 +515,7 @@
+ treats whitespace as being elastic.  Note that the scanf format %[ is
+ very useful for scanning strings, and whitespace.
+ .PP
+-The editor also displays non-us characters (160+).  When editing
++The editor also displays non\-us characters (160+).  When editing
+ binary files, you should set
+ .B display bits
+ to 7 bits in the Midnight Commander options menu to keep the spacing
+@@ -527,7 +527,7 @@
+ .PP
+ .I @prefix@/share/mc/mc.ini
+ .IP
+-The default system-wide setup for GNU Midnight Commander, used only if
++The default system\-wide setup for GNU Midnight Commander, used only if
+ the user's own ~/.mc/ini file is missing.
+ .PP
+ .I @prefix@/share/mc/mc.lib
+@@ -537,13 +537,13 @@
+ .PP
+ .I @prefix@/share/mc/syntax/*
+ .IP
+-The default system-wide syntax files for mcedit, used only if
++The default system\-wide syntax files for mcedit, used only if
+ the corresponding user's own ~/.mc/cedit/ file is missing.
+ .PP
+ .I $HOME/.mc/ini
+ .IP
+ User's own setup.  If this file is present then the setup is loaded
+-from here instead of the system-wide setup file.
++from here instead of the system\-wide setup file.
+ .PP
+ .I $HOME/.mc/cedit/
+ .IP
+@@ -551,16 +551,16 @@
+ user's own syntax files are located.
+ .SH LICENSE
+ This program is distributed under the terms of the GNU General Public
+-License as published by the Free Software Foundation.  See the built-in
++License as published by the Free Software Foundation.  See the built\-in
+ help of the Midnight Commander for details on the License and the lack
+ of warranty.
+ .SH AVAILABILITY
+ The latest version of this program can be found at
+-http://midnight-commander.org/.
++http://midnight\-commander.org/.
+ .SH SEE ALSO
+ cooledit(1), mc(1), gpm(1), terminfo(1), scanf(3).
+ .SH AUTHORS
+ Paul Sheer (psheer at obsidian.co.za) is the original author of
+ the Midnight Commander's internal editor.
+ .SH BUGS
+-Bugs should be reported to mc-devel at gnome.org
++Bugs should be reported to mc\-devel at gnome.org

Added: branch/cdbs/debian/patches/man/25_mcview.patch
===================================================================
--- branch/cdbs/debian/patches/man/25_mcview.patch	                        (rev 0)
+++ branch/cdbs/debian/patches/man/25_mcview.patch	2009-08-02 21:51:24 UTC (rev 217)
@@ -0,0 +1,68 @@
+Fix hyphen-used-as-minus-sign
+Index: mc-4.7.0-pre1/doc/man/mcview.1.in
+===================================================================
+--- mc-4.7.0-pre1.orig/doc/man/mcview.1.in	2009-08-02 23:44:22.000000000 +0200
++++ mc-4.7.0-pre1/doc/man/mcview.1.in	2009-08-02 23:44:43.000000000 +0200
+@@ -1,9 +1,9 @@
+-.TH MCVIEW 1 "August 2009" "MC Version 4.7.0-pre1" "GNU Midnight Commander"
++.TH MCVIEW 1 "August 2009" "MC Version 4.7.0\-pre1" "GNU Midnight Commander"
+ .SH NAME
+ mcview \- Internal file viewer of GNU Midnight Commander.
+ .SH USAGE
+ .B mcview
+-[-bcCdfhstVx?] file
++[\-bcCdfhstVx?] file
+ .SH DESCRIPTION
+ .LP
+ mcview is a link to
+@@ -32,10 +32,10 @@
+ Disable mouse support.
+ .TP
+ .I "\-f"
+-Display the compiled-in search paths for Midnight Commander files.
++Display the compiled\-in search paths for Midnight Commander files.
+ .TP
+ .I "\-t"
+-Used only if the code was compiled with S-Lang and terminfo: it makes
++Used only if the code was compiled with S\-Lang and terminfo: it makes
+ the Midnight Commander use the value of the
+ .B TERMCAP
+ variable for the terminal information instead of the information on
+@@ -45,7 +45,7 @@
+ Displays the version of the program.
+ .TP
+ .I "\-x"
+-Forces xterm mode.  Used when running on xterm-capable terminals (two
++Forces xterm mode.  Used when running on xterm\-capable terminals (two
+ screen modes, and able to send mouse escape sequences).
+ .PP
+ .SH COLORS
+@@ -67,7 +67,7 @@
+ .PP
+ .I @prefix@/share/mc/mc.ini
+ .IP
+-The default system-wide setup for GNU Midnight Commander, used only if
++The default system\-wide setup for GNU Midnight Commander, used only if
+ the user's own ~/.mc/ini file is missing.
+ .PP
+ .I @prefix@/share/mc/mc.lib
+@@ -78,11 +78,11 @@
+ .I $HOME/.mc/ini
+ .IP
+ User's own setup.  If this file is present, the setup is loaded from
+-here instead of the system-wide startup file.
++here instead of the system\-wide startup file.
+ .PP
+ .SH LICENSE
+ This program is distributed under the terms of the GNU General Public
+-License as published by the Free Software Foundation.  See the built-in
++License as published by the Free Software Foundation.  See the built\-in
+ help of the Midnight Commander for details on the License and the lack
+ of warranty.
+ .SH AVAILABILITY
+@@ -92,4 +92,4 @@
+ mc(1), mcedit(1)
+ .PP
+ .SH BUGS
+-Bugs should be reported to mc-devel at gnome.org
++Bugs should be reported to mc\-devel at gnome.org

Modified: branch/cdbs/debian/patches/series
===================================================================
--- branch/cdbs/debian/patches/series	2009-08-02 20:35:48 UTC (rev 216)
+++ branch/cdbs/debian/patches/series	2009-08-02 21:51:24 UTC (rev 217)
@@ -8,6 +8,7 @@
 vfs/02_ignore_ftp_chmod_error.patch
 vfs/09_choose_correct_urar.patch
 bugs/01_bashism.patch
+bugs/02_uzip_broken_528239.patch
 man/10_FSSTND_hu_man.patch
 man/11_FSSTND_it_man.patch
 man/12_FSSTND_man.patch
@@ -15,7 +16,6 @@
 man/14_FSSTND_ru_man.patch
 man/15_FSSTND_sr_man.patch
 man/16_FSSTND_es_man.patch
-bugs/02_uzip_broken_528239.patch
 man/17_es.patch
 man/18_hu.patch
 man/19_it.patch
@@ -23,3 +23,5 @@
 man/21_ru.patch
 man/22_sr.patch
 man/23_man.patch
+man/24_mcedit.patch
+man/25_mcview.patch

More information about the Pkg-mc-commits mailing list