tags 695777 + patch thanks Dear maintainer,
I've prepared an NMU for gtypist (versioned as 2.9.1-2.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Regards. David
diff -Nru gtypist-2.9.1/debian/changelog gtypist-2.9.1/debian/changelog --- gtypist-2.9.1/debian/changelog 2011-11-30 17:41:45.000000000 -0400 +++ gtypist-2.9.1/debian/changelog 2012-12-31 12:44:57.000000000 -0400 @@ -1,3 +1,12 @@ +gtypist (2.9.1-2.1) unstable; urgency=low + + * Non-maintainer upload. + * debian/patches/695777_update_info_doc.patch: Update info doc to latest + 2.9.2, now released with a DFSG-compliant license (closes: #695777). + * debian/copyright: Document the doc/ license. + + -- David Prévot <taf...@debian.org> Mon, 31 Dec 2012 12:44:40 -0400 + gtypist (2.9.1-2) unstable; urgency=low * debian/control: Suggest vim-addon-manager for vim syntax highlighting. diff -Nru gtypist-2.9.1/debian/copyright gtypist-2.9.1/debian/copyright --- gtypist-2.9.1/debian/copyright 2011-11-13 18:33:59.000000000 -0400 +++ gtypist-2.9.1/debian/copyright 2012-12-31 12:40:30.000000000 -0400 @@ -22,7 +22,7 @@ Copyright (C) 2001 Felix Natter <fnat...@gmx.net> Copyright (C) 2003 Dmitry Rutsky <rut...@school.ioffe.rssi.ru> - Copyright (C) 1987-2008 Free Software Foundation, Inc. + Copyright (C) 1987-2012 Free Software Foundation, Inc. License: @@ -63,6 +63,17 @@ On Debian system the complete text of the GNU Lesser General Public License version 2 is available at `/usr/share/common-licenses/LGPL-2'. + GFDL-1.3+ (doc/*) + + Permission is granted to copy, distribute and/or modify this document + under the terms of the GNU Free Documentation License, Version 1.3 or + any later version published by the Free Software Foundation; with no + Invariant Sections, with no Front-Cover Texts, and with no Back-Cover + Texts. A copy of the license is included in the section entitled + ``GNU Free Documentation License''. + + On Debian system the complete text of the GNU Lesser General Public License + version 1.3 is available at `/usr/share/common-licenses/GFDL-1.3'. The Debian packaging is Copyright (C) 2000-2006 by Ben Armstrong and Copyright (C) 2009,2011 Daniel Leidert. diff -Nru gtypist-2.9.1/debian/patches/695777_update_info_doc.patch gtypist-2.9.1/debian/patches/695777_update_info_doc.patch --- gtypist-2.9.1/debian/patches/695777_update_info_doc.patch 1969-12-31 20:00:00.000000000 -0400 +++ gtypist-2.9.1/debian/patches/695777_update_info_doc.patch 2012-12-31 12:34:38.000000000 -0400 @@ -0,0 +1,853 @@ +Description: Update info doc to latest 2.9.2 + Upstream immediately released a new point release with license text + fixed by removing cover texts after #695777 was open. Updating the docs + to this last version (only the licence text is changed, and some text + added, so the “old” files are also covered by the new licence). +Origin: upstream +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=695777 +Forwarded: not-needed +Applied-Upstream: 2.9.2 +Reviewed-by: David Prévot <taf...@debian.org> +Last-Update: 2012-12-31 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/doc/gtypist.cs.html ++++ b/doc/gtypist.cs.html +@@ -7,25 +7,19 @@ + <link title="Top" rel="top" href="#Top"> + <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage"> + <!-- +-Toto je manuál pro GNU Typist (verze 2.9.1, 1 November 2011), ++Toto je manuál pro GNU Typist (verze 2.9.2, 17 December 2012), + program určený k výuce psaní na klávesnici pro několik + jazyků a různé klávesové rozložení. + +-Copyright (C) 1998, 1999, 2000, 2001, 2002 +-Free Software Foundation, Inc. ++Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2008, ++2011, 2012 Free Software Foundation, Inc. + +- Dáváme povolení ke kopírování, distribuci a/nebo provádění změn v +- tomto dokumentu pod podmínkami GNU Free Documentation License +- verze 1.2 nebo jakékoliv pozdější verze publikované Nadací pro +- svobodný software (Free Software Foundation); text neobsahuje +- žádnou Invariant Section, Front Cover text je ,,GNU Manuál" a +- Back-Cover Text je uveden v (a) níže. Kopie licence je přiložena +- v sekci nazvané ,,GNU Free Docuemntation License". +- +- (a) Back Cover Text FSF je: ,,Máte svobodu kopírovat a modifikovat +- tento GNU manuál stejně jako GNU software. Výtěžek z kopií +- publikovaných Nadací pro svobodný software jsou použity na vývoj +- GNU." ++ Permission is granted to copy, distribute and/or modify this ++ document under the terms of the GNU Free Documentation License, ++ Version 1.3 or any later version published by the Free Software ++ Foundation; with no Invariant Sections, with no Front-Cover Texts, ++ and with no Back-Cover Texts. A copy of the license is included ++ in the section entitled "GNU Free Documentation License". + --> + <meta http-equiv="Content-Style-Type" content="text/css"> + <style type="text/css"><!-- +@@ -79,27 +73,20 @@ + + <h2 class="unnumbered">GNU Typist - psaní všemi deseti</h2> + +-<p>Toto je manuál pro GNU Typist (verze 2.9.1, 1 November 2011), ++<p>Toto je manuál pro GNU Typist (verze 2.9.2, 17 December 2012), + program určený k výuce psaní na klávesnici pro několik + jazyků a různé klávesové rozložení. + +- <p>Copyright © 1998, 1999, 2000, 2001, 2002 +-Free Software Foundation, Inc. ++ <p>Copyright © 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2008, ++2011, 2012 Free Software Foundation, Inc. + + <blockquote> +-Dáváme povolení ke kopírování, distribuci a/nebo provádění +-změn v tomto dokumentu pod podmínkami GNU Free Documentation +-License verze 1.2 nebo jakékoliv pozdější verze publikované +-Nadací pro svobodný software (Free Software Foundation); text +-neobsahuje žádnou Invariant Section, Front Cover text je +-,,GNU Manuál” a Back-Cover Text je uveden v (a) níže. +-Kopie licence je přiložena v sekci nazvané ,,GNU Free +-Docuemntation License”. +- +- <p>(a) Back Cover Text FSF je: ,,Máte svobodu kopírovat +-a modifikovat tento GNU manuál stejně jako GNU software. +-Výtěžek z kopií publikovaných Nadací pro svobodný software +-jsou použity na vývoj GNU.” ++Permission is granted to copy, distribute and/or modify this document ++under the terms of the GNU Free Documentation License, Version 1.3 or ++any later version published by the Free Software Foundation; with no ++Invariant Sections, with no Front-Cover Texts, and with no Back-Cover ++Texts. A copy of the license is included in the section entitled ++“GNU Free Documentation License”. + </blockquote> + + <p>GNU Typist je interaktivní výukový program, který vám pomůže +--- a/doc/gtypist.cs.info ++++ b/doc/gtypist.cs.info +@@ -1,25 +1,19 @@ + This is gtypist.cs.info, produced by makeinfo version 4.13 from + gtypist.cs.texi. + +-Toto je manuál pro GNU Typist (verze 2.9.1, 1 November 2011), program ++Toto je manuál pro GNU Typist (verze 2.9.2, 17 December 2012), program + určený k výuce psaní na klávesnici pro několik jazyků a různé klávesové + rozložení. + +- Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, +-Inc. ++ Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2008, 2011, ++2012 Free Software Foundation, Inc. + +- Dáváme povolení ke kopírování, distribuci a/nebo provádění změn v +- tomto dokumentu pod podmínkami GNU Free Documentation License +- verze 1.2 nebo jakékoliv pozdější verze publikované Nadací pro +- svobodný software (Free Software Foundation); text neobsahuje +- žádnou Invariant Section, Front Cover text je ,,GNU Manuál" a +- Back-Cover Text je uveden v (a) níže. Kopie licence je přiložena +- v sekci nazvané ,,GNU Free Docuemntation License". +- +- (a) Back Cover Text FSF je: ,,Máte svobodu kopírovat a modifikovat +- tento GNU manuál stejně jako GNU software. Výtěžek z kopií +- publikovaných Nadací pro svobodný software jsou použity na vývoj +- GNU." ++ Permission is granted to copy, distribute and/or modify this ++ document under the terms of the GNU Free Documentation License, ++ Version 1.3 or any later version published by the Free Software ++ Foundation; with no Invariant Sections, with no Front-Cover Texts, ++ and with no Back-Cover Texts. A copy of the license is included ++ in the section entitled "GNU Free Documentation License". + + INFO-DIR-SECTION Education + START-INFO-DIR-ENTRY +@@ -33,25 +27,19 @@ + GNU Typist - psaní všemi deseti + ********************************* + +-Toto je manuál pro GNU Typist (verze 2.9.1, 1 November 2011), program ++Toto je manuál pro GNU Typist (verze 2.9.2, 17 December 2012), program + určený k výuce psaní na klávesnici pro několik jazyků a různé klávesové + rozložení. + +- Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, +-Inc. ++ Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2008, 2011, ++2012 Free Software Foundation, Inc. + +- Dáváme povolení ke kopírování, distribuci a/nebo provádění změn v +- tomto dokumentu pod podmínkami GNU Free Documentation License +- verze 1.2 nebo jakékoliv pozdější verze publikované Nadací pro +- svobodný software (Free Software Foundation); text neobsahuje +- žádnou Invariant Section, Front Cover text je ,,GNU Manuál" a +- Back-Cover Text je uveden v (a) níže. Kopie licence je přiložena +- v sekci nazvané ,,GNU Free Docuemntation License". +- +- (a) Back Cover Text FSF je: ,,Máte svobodu kopírovat a modifikovat +- tento GNU manuál stejně jako GNU software. Výtěžek z kopií +- publikovaných Nadací pro svobodný software jsou použity na vývoj +- GNU." ++ Permission is granted to copy, distribute and/or modify this ++ document under the terms of the GNU Free Documentation License, ++ Version 1.3 or any later version published by the Free Software ++ Foundation; with no Invariant Sections, with no Front-Cover Texts, ++ and with no Back-Cover Texts. A copy of the license is included ++ in the section entitled "GNU Free Documentation License". + + GNU Typist je interaktivní výukový program, který vám pomůže osvojit + si principy správného psaní na klávesnici všemi deseti prsty. Obsahuje +@@ -1989,23 +1977,23 @@ + + + Tag Table: +-Node: Top1221 +-Node: Distribuce3726 +-Node: Kopírování4716 +-Node: Úvod42262 +-Node: Spouštění45154 +-Node: Dostupné lekce49034 +-Node: Používání typefortune50651 +-Node: Příkazy skriptovacího jazyka51579 +-Node: Vytvořte nové lekce59935 +-Node: Ktouch lessons60434 +-Node: Exercises from fortune62787 +-Node: Design patterns for lessons63378 +-Node: Mód Emacsu64267 +-Node: Proměnné prostředí66742 +-Node: Chyby a opominutí68874 +-Node: Historie69560 +-Node: Kopírování tohoto manuálu71443 ++Node: Top936 ++Node: Distribuce3156 ++Node: Kopírování4146 ++Node: Úvod41692 ++Node: Spouštění44584 ++Node: Dostupné lekce48464 ++Node: Používání typefortune50081 ++Node: Příkazy skriptovacího jazyka51009 ++Node: Vytvořte nové lekce59365 ++Node: Ktouch lessons59864 ++Node: Exercises from fortune62217 ++Node: Design patterns for lessons62808 ++Node: Mód Emacsu63697 ++Node: Proměnné prostředí66172 ++Node: Chyby a opominutí68304 ++Node: Historie68990 ++Node: Kopírování tohoto manuálu70873 + + End Tag Table + +--- a/doc/gtypist.cs.texi ++++ b/doc/gtypist.cs.texi +@@ -11,23 +11,16 @@ + program určený k výuce psaní na klávesnici pro několik + jazyků a různé klávesové rozložení. + +-Copyright @copyright{} 1998, 1999, 2000, 2001, 2002 +-Free Software Foundation, Inc. ++Copyright @copyright{} 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2008, ++2011, 2012 Free Software Foundation, Inc. + + @quotation +-Dáváme povolení ke kopírování, distribuci a/nebo provádění +-změn v tomto dokumentu pod podmínkami GNU Free Documentation +-License verze 1.2 nebo jakékoliv pozdější verze publikované +-Nadací pro svobodný software (Free Software Foundation); text +-neobsahuje žádnou Invariant Section, Front Cover text je +-,,GNU Manuál'' a Back-Cover Text je uveden v (a) níže. +-Kopie licence je přiložena v sekci nazvané ,,GNU Free +-Docuemntation License''. +- +-(a) Back Cover Text FSF je: ,,Máte svobodu kopírovat +-a modifikovat tento GNU manuál stejně jako GNU software. +-Výtěžek z kopií publikovaných Nadací pro svobodný software +-jsou použity na vývoj GNU.'' ++Permission is granted to copy, distribute and/or modify this document ++under the terms of the GNU Free Documentation License, Version 1.3 or ++any later version published by the Free Software Foundation; with no ++Invariant Sections, with no Front-Cover Texts, and with no Back-Cover ++Texts. A copy of the license is included in the section entitled ++``GNU Free Documentation License''. + @end quotation + @end copying + +--- a/doc/gtypist.es.html ++++ b/doc/gtypist.es.html +@@ -7,27 +7,22 @@ + <link title="Top" rel="top" href="#Top"> + <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage"> + <!-- +-Este es el manual de GNU Typist (versión 2.9.1, +-1 November 2011), un programa para aprender a mecanografiar en varios ++Este es el manual de GNU Typist (versión 2.9.2, ++17 December 2012), un programa para aprender a mecanografiar en varios + idiomas y con distintas disposiciones de teclado. La traducción al + castellano está en {No value for `FASE'}. + +-Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 +-Free Software Foundation, Inc. ++Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2008, ++2011, 2012 Free Software Foundation, Inc. + + Copyright (C) de la traducción 2010-11, TMJQ, SL. + + Permission is granted to copy, distribute and/or modify this + document under the terms of the GNU Free Documentation License, +- Version 1.2 or any later version published by the Free Software +- Foundation; with no Invariant Sections, with the Front-Cover texts +- being "A GNU Manual," and with the Back-Cover Texts as in (a) +- below. A copy of the license is included in the section entitled +- "GNU Free Documentation License." +- +- (a) The FSF's Back-Cover Text is: "You have freedom to copy and +- modify this GNU Manual, like GNU software. Copies published by +- the Free Software Foundation raise funds for GNU development." ++ Version 1.3 or any later version published by the Free Software ++ Foundation; with no Invariant Sections, with no Front-Cover Texts, ++ and with no Back-Cover Texts. A copy of the license is included ++ in the section entitled "GNU Free Documentation License". + --> + <meta http-equiv="Content-Style-Type" content="text/css"> + <style type="text/css"><!-- +@@ -85,27 +80,23 @@ + + <h2 class="unnumbered">GNU Typist, el tutor mecanográfico</h2> + +-<p>Este es el manual de GNU Typist (versión 2.9.1, +-1 November 2011), un programa para aprender a mecanografiar en varios ++<p>Este es el manual de GNU Typist (versión 2.9.2, ++17 December 2012), un programa para aprender a mecanografiar en varios + idiomas y con distintas disposiciones de teclado. La traducción al + castellano está en {No value for `FASE'}. + +- <p>Copyright © 1998, 1999, 2000, 2001, 2002, 2003 +-Free Software Foundation, Inc. ++ <p>Copyright © 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2008, ++2011, 2012 Free Software Foundation, Inc. + + <p>Copyright © de la traducción 2010-11, TMJQ, SL. + + <blockquote> + Permission is granted to copy, distribute and/or modify this document +-under the terms of the GNU Free Documentation License, Version 1.2 or ++under the terms of the GNU Free Documentation License, Version 1.3 or + any later version published by the Free Software Foundation; with no +-Invariant Sections, with the Front-Cover texts being “A GNU Manual,” +-and with the Back-Cover Texts as in (a) below. A copy of the license is +-included in the section entitled “GNU Free Documentation License.” +- +- <p>(a) The FSF's Back-Cover Text is: “You have freedom to copy and modify +-this GNU Manual, like GNU software. Copies published by the Free +-Software Foundation raise funds for GNU development.” ++Invariant Sections, with no Front-Cover Texts, and with no Back-Cover ++Texts. A copy of the license is included in the section entitled ++“GNU Free Documentation License”. + </blockquote> + + <p>GNU Typist es un tutor interactivo de mecanografiado que ayuda a +--- a/doc/gtypist.es.info ++++ b/doc/gtypist.es.info +@@ -1,27 +1,22 @@ + This is gtypist.es.info, produced by makeinfo version 4.13 from + gtypist.es.texi. + +-Este es el manual de GNU Typist (versión 2.9.1, 1 November 2011), un ++Este es el manual de GNU Typist (versión 2.9.2, 17 December 2012), un + programa para aprender a mecanografiar en varios idiomas y con + distintas disposiciones de teclado. La traducción al castellano está + en {No value for `FASE'}. + +- Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 Free Software +-Foundation, Inc. ++ Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2008, 2011, ++2012 Free Software Foundation, Inc. + + Copyright (C) de la traducción 2010-11, TMJQ, SL. + + Permission is granted to copy, distribute and/or modify this + document under the terms of the GNU Free Documentation License, +- Version 1.2 or any later version published by the Free Software +- Foundation; with no Invariant Sections, with the Front-Cover texts +- being "A GNU Manual," and with the Back-Cover Texts as in (a) +- below. A copy of the license is included in the section entitled +- "GNU Free Documentation License." +- +- (a) The FSF's Back-Cover Text is: "You have freedom to copy and +- modify this GNU Manual, like GNU software. Copies published by +- the Free Software Foundation raise funds for GNU development." ++ Version 1.3 or any later version published by the Free Software ++ Foundation; with no Invariant Sections, with no Front-Cover Texts, ++ and with no Back-Cover Texts. A copy of the license is included ++ in the section entitled "GNU Free Documentation License". + + INFO-DIR-SECTION Education + START-INFO-DIR-ENTRY +@@ -34,27 +29,22 @@ + GNU Typist, el tutor mecanográfico + *********************************** + +-Este es el manual de GNU Typist (versión 2.9.1, 1 November 2011), un ++Este es el manual de GNU Typist (versión 2.9.2, 17 December 2012), un + programa para aprender a mecanografiar en varios idiomas y con + distintas disposiciones de teclado. La traducción al castellano está + en {No value for `FASE'}. + +- Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 Free Software +-Foundation, Inc. ++ Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2008, 2011, ++2012 Free Software Foundation, Inc. + + Copyright (C) de la traducción 2010-11, TMJQ, SL. + + Permission is granted to copy, distribute and/or modify this + document under the terms of the GNU Free Documentation License, +- Version 1.2 or any later version published by the Free Software +- Foundation; with no Invariant Sections, with the Front-Cover texts +- being "A GNU Manual," and with the Back-Cover Texts as in (a) +- below. A copy of the license is included in the section entitled +- "GNU Free Documentation License." +- +- (a) The FSF's Back-Cover Text is: "You have freedom to copy and +- modify this GNU Manual, like GNU software. Copies published by +- the Free Software Foundation raise funds for GNU development." ++ Version 1.3 or any later version published by the Free Software ++ Foundation; with no Invariant Sections, with no Front-Cover Texts, ++ and with no Back-Cover Texts. A copy of the license is included ++ in the section entitled "GNU Free Documentation License". + + GNU Typist es un tutor interactivo de mecanografiado que ayuda a + escribir correctamente. Tiene varias lecciones para diversas +@@ -2198,24 +2188,24 @@ + + + Tag Table: +-Node: Top1264 +-Node: Distribucion3842 +-Node: Copiado4888 +-Node: Introduccion42437 +-Node: Invocacion45964 +-Node: Lecciones suministradas50943 +-Node: Uso de typefortune52673 +-Node: Sintaxis de las lecciones53574 +-Node: Lecciones nuevas63291 +-Node: Lecciones Ktouch64078 +-Node: Ejercicios de fortune66663 +-Node: Patrones para lecciones67282 +-Node: Findwords68498 +-Node: Modo para Emacs71008 +-Node: Variables de entorno73597 +-Node: Errores y omisiones75809 +-Node: Historia77057 +-Node: Copia del manual79546 ++Node: Top1038 ++Node: Distribucion3390 ++Node: Copiado4436 ++Node: Introduccion41985 ++Node: Invocacion45512 ++Node: Lecciones suministradas50491 ++Node: Uso de typefortune52221 ++Node: Sintaxis de las lecciones53122 ++Node: Lecciones nuevas62839 ++Node: Lecciones Ktouch63626 ++Node: Ejercicios de fortune66211 ++Node: Patrones para lecciones66830 ++Node: Findwords68046 ++Node: Modo para Emacs70556 ++Node: Variables de entorno73145 ++Node: Errores y omisiones75357 ++Node: Historia76605 ++Node: Copia del manual79094 + + End Tag Table + +--- a/doc/gtypist.es.texi ++++ b/doc/gtypist.es.texi +@@ -12,22 +12,18 @@ + idiomas y con distintas disposiciones de teclado. La traducción al + castellano está en @value{FASE}. + +-Copyright @copyright{} 1998, 1999, 2000, 2001, 2002, 2003 +-Free Software Foundation, Inc. ++Copyright @copyright{} 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2008, ++2011, 2012 Free Software Foundation, Inc. + + Copyright @copyright{} de la traducción 2010-11, TMJQ, SL. + + @quotation + Permission is granted to copy, distribute and/or modify this document +-under the terms of the GNU Free Documentation License, Version 1.2 or ++under the terms of the GNU Free Documentation License, Version 1.3 or + any later version published by the Free Software Foundation; with no +-Invariant Sections, with the Front-Cover texts being ``A GNU Manual,'' +-and with the Back-Cover Texts as in (a) below. A copy of the license is +-included in the section entitled ``GNU Free Documentation License.'' +- +-(a) The FSF's Back-Cover Text is: ``You have freedom to copy and modify +-this GNU Manual, like GNU software. Copies published by the Free +-Software Foundation raise funds for GNU development.'' ++Invariant Sections, with no Front-Cover Texts, and with no Back-Cover ++Texts. A copy of the license is included in the section entitled ++``GNU Free Documentation License''. + @end quotation + @end copying + +--- a/doc/gtypist.html ++++ b/doc/gtypist.html +@@ -7,24 +7,19 @@ + <link title="Top" rel="top" href="#Top"> + <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage"> + <!-- +-This manual is for GNU Typist (version 2.9.1, 22 November 2011), ++This manual is for GNU Typist (version 2.9.2, 17 December 2012), + a program to learn typing in several languages and for different + keyboard layouts. + +-Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2008, 2011 +-Free Software Foundation, Inc. ++Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2008, ++2011, 2012 Free Software Foundation, Inc. + + Permission is granted to copy, distribute and/or modify this + document under the terms of the GNU Free Documentation License, +- Version 1.2 or any later version published by the Free Software +- Foundation; with no Invariant Sections, with the Front-Cover texts +- being "A GNU Manual," and with the Back-Cover Texts as in (a) +- below. A copy of the license is included in the section entitled +- "GNU Free Documentation License." +- +- (a) The FSF's Back-Cover Text is: "You have freedom to copy and +- modify this GNU Manual, like GNU software. Copies published by +- the Free Software Foundation raise funds for GNU development." ++ Version 1.3 or any later version published by the Free Software ++ Foundation; with no Invariant Sections, with no Front-Cover Texts, ++ and with no Back-Cover Texts. A copy of the license is included ++ in the section entitled "GNU Free Documentation License". + --> + <meta http-equiv="Content-Style-Type" content="text/css"> + <style type="text/css"><!-- +@@ -83,24 +78,20 @@ + + <h2 class="unnumbered">GNU Typist - Typing Tutor</h2> + +-<p>This manual is for GNU Typist (version 2.9.1, 22 November 2011), ++<p>This manual is for GNU Typist (version 2.9.2, 17 December 2012), + a program to learn typing in several languages and for different + keyboard layouts. + +- <p>Copyright © 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2008, 2011 +-Free Software Foundation, Inc. ++ <p>Copyright © 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2008, ++2011, 2012 Free Software Foundation, Inc. + + <blockquote> + Permission is granted to copy, distribute and/or modify this document +-under the terms of the GNU Free Documentation License, Version 1.2 or ++under the terms of the GNU Free Documentation License, Version 1.3 or + any later version published by the Free Software Foundation; with no +-Invariant Sections, with the Front-Cover texts being “A GNU Manual,” +-and with the Back-Cover Texts as in (a) below. A copy of the license is +-included in the section entitled “GNU Free Documentation License.” +- +- <p>(a) The FSF's Back-Cover Text is: “You have freedom to copy and modify +-this GNU Manual, like GNU software. Copies published by the Free +-Software Foundation raise funds for GNU development.” ++Invariant Sections, with no Front-Cover Texts, and with no Back-Cover ++Texts. A copy of the license is included in the section entitled ++“GNU Free Documentation License”. + </blockquote> + + <p>GNU Typist is an interactive typing tutor that can help you to type +@@ -1573,8 +1564,8 @@ + + <h2 class="chapter">8 VIM Syntax highlighting</h2> + +-<p class="noindent">File <samp><span class="file">tools/gtypist.vim</span></samp> provides syntax highlighting for Vim +-5.x, 6.x and 7.x. ++<p class="noindent">File <samp><span class="file">tools/gtypist.vim</span></samp> provides vim syntax highlighting for ++gtypist lesson files (vim 5.x, 6.x and 7.x (and higher)). + + <p>To install it for version 5.x (or any version on Windows), copy the + file to where the syntax-files go (for example +@@ -1589,6 +1580,11 @@ + + <pre class="example"> autocmd BufNewFile,BufRead *.typ setf gtypist + </pre> ++ <p>In case you are using the debian package, <samp><span class="file">gtypist.vim</span></samp> will already ++be installed for you, but you need to enable it explicitly: ++<pre class="example"> sudo apt-get install vim-addon-manager ++ vim-addons install gtypist ++</pre> + <p>In any case, make sure that the <samp><span class="file">vimrc</span></samp> file has the following + command at the top ahead of all other <code>autocmd</code>-commands: + +@@ -1596,11 +1592,14 @@ + </pre> + <p>(which avoids problems if <samp><span class="file">vimrc</span></samp> is sourced more than once). + And if you haven\'t done it already, you need to enable syntax +-highlighting (this may need to be <em>before</em> the autocomd). ++highlighting (this may need to be <em>before</em> the autocmd ... gtypist). + + <pre class="example"> syntax on " turn on syntax highlighting + </pre> +- <p class="noindent">All this is also mentioned in the README-section of <samp><span class="file">tools/gtypist.vim</span></samp>. ++ <p>You can verify that <samp><span class="file">tools/gtypist.vim</span></samp> is active by running ++<code>:set ft?</code> in vim, which should return <em>filetype=gtypist</em>. ++ ++<p class="noindent">All of this is also mentioned in the README-section of <samp><span class="file">tools/gtypist.vim</span></samp>. + + <p><a name="Environment-Variables"></a> + +--- a/doc/gtypist.info ++++ b/doc/gtypist.info +@@ -1,24 +1,19 @@ + This is gtypist.info, produced by makeinfo version 4.13 from + gtypist.texi. + +-This manual is for GNU Typist (version 2.9.1, 22 November 2011), a ++This manual is for GNU Typist (version 2.9.2, 17 December 2012), a + program to learn typing in several languages and for different keyboard + layouts. + +- Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2008, 2011 +-Free Software Foundation, Inc. ++ Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2008, 2011, ++2012 Free Software Foundation, Inc. + + Permission is granted to copy, distribute and/or modify this + document under the terms of the GNU Free Documentation License, +- Version 1.2 or any later version published by the Free Software +- Foundation; with no Invariant Sections, with the Front-Cover texts +- being "A GNU Manual," and with the Back-Cover Texts as in (a) +- below. A copy of the license is included in the section entitled +- "GNU Free Documentation License." +- +- (a) The FSF's Back-Cover Text is: "You have freedom to copy and +- modify this GNU Manual, like GNU software. Copies published by +- the Free Software Foundation raise funds for GNU development." ++ Version 1.3 or any later version published by the Free Software ++ Foundation; with no Invariant Sections, with no Front-Cover Texts, ++ and with no Back-Cover Texts. A copy of the license is included ++ in the section entitled "GNU Free Documentation License". + + INFO-DIR-SECTION Education + START-INFO-DIR-ENTRY +@@ -31,24 +26,19 @@ + GNU Typist - Typing Tutor + ************************* + +-This manual is for GNU Typist (version 2.9.1, 22 November 2011), a ++This manual is for GNU Typist (version 2.9.2, 17 December 2012), a + program to learn typing in several languages and for different keyboard + layouts. + +- Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2008, 2011 +-Free Software Foundation, Inc. ++ Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2008, 2011, ++2012 Free Software Foundation, Inc. + + Permission is granted to copy, distribute and/or modify this + document under the terms of the GNU Free Documentation License, +- Version 1.2 or any later version published by the Free Software +- Foundation; with no Invariant Sections, with the Front-Cover texts +- being "A GNU Manual," and with the Back-Cover Texts as in (a) +- below. A copy of the license is included in the section entitled +- "GNU Free Documentation License." +- +- (a) The FSF's Back-Cover Text is: "You have freedom to copy and +- modify this GNU Manual, like GNU software. Copies published by +- the Free Software Foundation raise funds for GNU development." ++ Version 1.3 or any later version published by the Free Software ++ Foundation; with no Invariant Sections, with no Front-Cover Texts, ++ and with no Back-Cover Texts. A copy of the license is included ++ in the section entitled "GNU Free Documentation License". + + GNU Typist is an interactive typing tutor that can help you to type + correctly. It has several lessons for different keyboard layouts and in +@@ -1628,8 +1618,8 @@ + 8 VIM Syntax highlighting + ************************* + +-File `tools/gtypist.vim' provides syntax highlighting for Vim 5.x, 6.x +-and 7.x. ++File `tools/gtypist.vim' provides vim syntax highlighting for gtypist ++lesson files (vim 5.x, 6.x and 7.x (and higher)). + + To install it for version 5.x (or any version on Windows), copy the + file to where the syntax-files go (for example +@@ -1644,6 +1634,11 @@ + + autocmd BufNewFile,BufRead *.typ setf gtypist + ++ In case you are using the debian package, `gtypist.vim' will already ++be installed for you, but you need to enable it explicitly: ++ sudo apt-get install vim-addon-manager ++ vim-addons install gtypist ++ + In any case, make sure that the `vimrc' file has the following + command at the top ahead of all other `autocmd'-commands: + +@@ -1651,11 +1646,15 @@ + + (which avoids problems if `vimrc' is sourced more than once). And + if you haven\'t done it already, you need to enable syntax highlighting +-(this may need to be _before_ the autocomd). ++(this may need to be _before_ the autocmd ... gtypist). + + syntax on " turn on syntax highlighting + +-All this is also mentioned in the README-section of `tools/gtypist.vim'. ++ You can verify that `tools/gtypist.vim' is active by running `:set ++ft?' in vim, which should return _filetype=gtypist_. ++ ++All of this is also mentioned in the README-section of ++`tools/gtypist.vim'. + + + File: gtypist.info, Node: Environment Variables, Next: Errors and omissions, Prev: VIM Syntax highlighting, Up: Top +@@ -2220,25 +2219,25 @@ + + + Tag Table: +-Node: Top1124 +-Node: Distribution3464 +-Node: Copying4239 +-Node: Introduction41785 +-Node: Invoking44704 +-Node: Supplied lessons49305 +-Node: Using typefortune52149 +-Node: Script file commands53001 +-Node: Create new lessons61588 +-Node: Ktouch lessons62175 +-Node: Exercises from fortune65798 +-Node: Design patterns for lessons66383 +-Node: Findwords script67295 +-Node: Emacs mode69604 +-Node: VIM Syntax highlighting72060 +-Node: Environment Variables73359 +-Node: Errors and omissions75484 +-Node: History76297 +-Node: Copying this manual78776 ++Node: Top879 ++Node: Distribution2974 ++Node: Copying3749 ++Node: Introduction41295 ++Node: Invoking44214 ++Node: Supplied lessons48815 ++Node: Using typefortune51659 ++Node: Script file commands52511 ++Node: Create new lessons61098 ++Node: Ktouch lessons61685 ++Node: Exercises from fortune65308 ++Node: Design patterns for lessons65893 ++Node: Findwords script66805 ++Node: Emacs mode69114 ++Node: VIM Syntax highlighting71570 ++Node: Environment Variables73256 ++Node: Errors and omissions75381 ++Node: History76194 ++Node: Copying this manual78673 + + End Tag Table + +--- a/doc/gtypist.texi ++++ b/doc/gtypist.texi +@@ -10,20 +10,16 @@ + a program to learn typing in several languages and for different + keyboard layouts. + +-Copyright @copyright{} 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2008, 2011 +-Free Software Foundation, Inc. ++Copyright @copyright{} 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2008, ++2011, 2012 Free Software Foundation, Inc. + + @quotation + Permission is granted to copy, distribute and/or modify this document +-under the terms of the GNU Free Documentation License, Version 1.2 or ++under the terms of the GNU Free Documentation License, Version 1.3 or + any later version published by the Free Software Foundation; with no +-Invariant Sections, with the Front-Cover texts being ``A GNU Manual,'' +-and with the Back-Cover Texts as in (a) below. A copy of the license is +-included in the section entitled ``GNU Free Documentation License.'' +- +-(a) The FSF's Back-Cover Text is: ``You have freedom to copy and modify +-this GNU Manual, like GNU software. Copies published by the Free +-Software Foundation raise funds for GNU development.'' ++Invariant Sections, with no Front-Cover Texts, and with no Back-Cover ++Texts. A copy of the license is included in the section entitled ++``GNU Free Documentation License''. + @end quotation + @end copying + +@@ -949,8 +945,8 @@ + @chapter VIM Syntax highlighting + + @noindent +-File @file{tools/gtypist.vim} provides syntax highlighting for Vim +-5.x, 6.x and 7.x. ++File @file{tools/gtypist.vim} provides vim syntax highlighting for ++gtypist lesson files (vim 5.x, 6.x and 7.x (and higher)). + + To install it for version 5.x (or any version on Windows), copy the + file to where the syntax-files go (for example +@@ -969,6 +965,13 @@ + autocmd BufNewFile,BufRead *.typ setf gtypist + @end example + ++In case you are using the debian package, @file{gtypist.vim} will already ++be installed for you, but you need to enable it explicitly: ++@example ++sudo apt-get install vim-addon-manager ++vim-addons install gtypist ++@end example ++ + In any case, make sure that the @file{vimrc} file has the following + command at the top ahead of all other @code{autocmd}-commands: + +@@ -978,15 +981,17 @@ + + (which avoids problems if @file{vimrc} is sourced more than once). + And if you haven\'t done it already, you need to enable syntax +-highlighting (this may need to be @emph{before} the autocomd). ++highlighting (this may need to be @emph{before} the autocmd ... gtypist). + + @example + syntax on " turn on syntax highlighting + @end example + +-@noindent +-All this is also mentioned in the README-section of @file{tools/gtypist.vim}. ++You can verify that @file{tools/gtypist.vim} is active by running ++@code{:set ft?} in vim, which should return @emph{filetype=gtypist}. + ++@noindent ++All of this is also mentioned in the README-section of @file{tools/gtypist.vim}. + + @node Environment Variables, Errors and omissions, VIM Syntax highlighting, Top + @chapter Environment Variables +--- a/doc/stamp-1 ++++ b/doc/stamp-1 +@@ -1,4 +1,4 @@ +-@set UPDATED 1 November 2011 +-@set UPDATED-MONTH November 2011 +-@set EDITION 2.9.1 +-@set VERSION 2.9.1 ++@set UPDATED 17 December 2012 ++@set UPDATED-MONTH December 2012 ++@set EDITION 2.9.2 ++@set VERSION 2.9.2 +--- a/doc/stamp-2 ++++ b/doc/stamp-2 +@@ -1,4 +1,4 @@ +-@set UPDATED 1 November 2011 +-@set UPDATED-MONTH November 2011 +-@set EDITION 2.9.1 +-@set VERSION 2.9.1 ++@set UPDATED 17 December 2012 ++@set UPDATED-MONTH December 2012 ++@set EDITION 2.9.2 ++@set VERSION 2.9.2 +--- a/doc/stamp-vti ++++ b/doc/stamp-vti +@@ -1,4 +1,4 @@ +-@set UPDATED 22 November 2011 +-@set UPDATED-MONTH November 2011 +-@set EDITION 2.9.1 +-@set VERSION 2.9.1 ++@set UPDATED 17 December 2012 ++@set UPDATED-MONTH December 2012 ++@set EDITION 2.9.2 ++@set VERSION 2.9.2 +--- a/doc/version.texi ++++ b/doc/version.texi +@@ -1,4 +1,4 @@ +-@set UPDATED 22 November 2011 +-@set UPDATED-MONTH November 2011 +-@set EDITION 2.9.1 +-@set VERSION 2.9.1 ++@set UPDATED 17 December 2012 ++@set UPDATED-MONTH December 2012 ++@set EDITION 2.9.2 ++@set VERSION 2.9.2 +--- a/doc/version2.texi ++++ b/doc/version2.texi +@@ -1,4 +1,4 @@ +-@set UPDATED 1 November 2011 +-@set UPDATED-MONTH November 2011 +-@set EDITION 2.9.1 +-@set VERSION 2.9.1 ++@set UPDATED 17 December 2012 ++@set UPDATED-MONTH December 2012 ++@set EDITION 2.9.2 ++@set VERSION 2.9.2 +--- a/doc/version3.texi ++++ b/doc/version3.texi +@@ -1,4 +1,4 @@ +-@set UPDATED 1 November 2011 +-@set UPDATED-MONTH November 2011 +-@set EDITION 2.9.1 +-@set VERSION 2.9.1 ++@set UPDATED 17 December 2012 ++@set UPDATED-MONTH December 2012 ++@set EDITION 2.9.2 ++@set VERSION 2.9.2 diff -Nru gtypist-2.9.1/debian/patches/series gtypist-2.9.1/debian/patches/series --- gtypist-2.9.1/debian/patches/series 2011-11-29 17:38:40.000000000 -0400 +++ gtypist-2.9.1/debian/patches/series 2012-12-31 12:23:52.000000000 -0400 @@ -1,2 +1,3 @@ 220581_gtypist_vim_support.patch fix_manual_page_issues.patch +695777_update_info_doc.patch
signature.asc
Description: Digital signature