- updated info and danish patches (builds now)

- fixed typos in pl description

Changed files:
    texinfo-danish.patch -> 1.2
    texinfo-info.patch -> 1.6
    texinfo.spec -> 1.44

diff --git a/texinfo-danish.patch b/texinfo-danish.patch
index 1facaa0b95ad74842fb2798a79709ac460c014e3..e79b1e1233bf5e121caa06c28abcd2fa0591dbfc 100644 (file)
--- a/texinfo-danish.patch
+++ b/texinfo-danish.patch
@@ -9030,8 +9030,8 @@ diff -Nru texinfo-4.0/configure.in texinfo-4.0.new/configure.in
  AC_SUBST(TERMLIBS)
  
  dnl Set of available languages and i18n macros.
  AC_SUBST(TERMLIBS)
  
  dnl Set of available languages and i18n macros.

--ALL_LINGUAS="cs de de_AT eo fr nl no ru"
-+ALL_LINGUAS="cs da de de_AT eo fr nl no ru"
+-ALL_LINGUAS="cs de de_AT eo fr ja nl no ru"
++ALL_LINGUAS="cs da de de_AT eo fr ja nl no ru"

  AM_GNU_GETTEXT
  
  AC_OUTPUT([Makefile             \
  AM_GNU_GETTEXT
  
  AC_OUTPUT([Makefile             \

diff --git a/texinfo-info.patch b/texinfo-info.patch
index c6b513d787f2baedecf0dddecc7e08205f447eb5..583b66043481d9a72b4d31e1ff1a51113c00bf40 100644 (file)
--- a/texinfo-info.patch
+++ b/texinfo-info.patch
@@ -1,6 +1,36 @@
-diff -Nru texinfo-3.12s/doc/texinfo.txi texinfo-3.12s.new/doc/texinfo.txi
---- texinfo-3.12s/doc/texinfo.txi      Mon Aug  9 22:43:55 1999
-+++ texinfo-3.12s.new/doc/texinfo.txi  Wed Sep  8 22:06:16 1999
+diff -Nur texinfo-4.0b.orig/doc/info-stnd.texi texinfo-4.0b/doc/info-stnd.texi
+--- texinfo-4.0b.orig/doc/info-stnd.texi       Fri Jun 25 23:57:05 1999
++++ texinfo-4.0b/doc/info-stnd.texi    Tue May 22 19:55:40 2001
+@@ -10,9 +10,9 @@
+ 
+ @include version.texi
+ 
+-@dircategory Texinfo documentation system
++@dircategory Texinfo documentation system:
+ @direntry
+-* Standalone info program: (info-stnd).    Standalone Info-reading program.
++* Standalone info program: (info-stnd).       Standalone Info-reading program
+ @end direntry
+ 
+ @ifinfo
+diff -Nur texinfo-4.0b.orig/doc/info.texi texinfo-4.0b/doc/info.texi
+--- texinfo-4.0b.orig/doc/info.texi    Tue May  1 21:45:12 2001
++++ texinfo-4.0b/doc/info.texi Tue May 22 19:55:40 2001
+@@ -8,9 +8,9 @@
+ @comment %**end of header
+ @comment $Id$
+ 
+-@dircategory Texinfo documentation system
++@dircategory Texinfo documentation system:
+ @direntry
+-* Info: (info).                 Documentation browsing system.
++* Info: (info).                               Documentation browsing system
+ @end direntry
+ 
+ @ifinfo
+diff -Nur texinfo-4.0b.orig/doc/texinfo.txi texinfo-4.0b/doc/texinfo.txi
+--- texinfo-4.0b.orig/doc/texinfo.txi  Tue May  1 21:36:20 2001
++++ texinfo-4.0b/doc/texinfo.txi       Tue May 22 20:00:29 2001

 @@ -22,13 +22,13 @@
  
  @comment %**end of header
 @@ -22,13 +22,13 @@
  
  @comment %**end of header


@@ -12,7 +42,7 @@ diff -Nru texinfo-3.12s/doc/texinfo.txi texinfo-3.12s.new/doc/texinfo.txi
 -* install-info: (texinfo)Invoking install-info. Update info/dir entries.
 -* texi2dvi: (texinfo)Format with texi2dvi.      Print Texinfo documents.
 -* texindex: (texinfo)Format with tex/texindex.  Sort Texinfo index files.
 -* install-info: (texinfo)Invoking install-info. Update info/dir entries.
 -* texi2dvi: (texinfo)Format with texi2dvi.      Print Texinfo documents.
 -* texindex: (texinfo)Format with tex/texindex.  Sort Texinfo index files.

--* makeinfo: (texinfo)makeinfo Preferred.        Translate Texinfo source.
+-* makeinfo: (texinfo)Invoking makeinfo.         Translate Texinfo source.

 +* Texinfo: (texinfo)                  The GNU documentation format
 +* install-info: (texinfo)install-info Update info/dir entries
 +* texi2dvi: (texinfo)texi2dvi         Print Texinfo documents
 +* Texinfo: (texinfo)                  The GNU documentation format
 +* install-info: (texinfo)install-info Update info/dir entries
 +* texi2dvi: (texinfo)texi2dvi         Print Texinfo documents


@@ -21,7 +51,7 @@ diff -Nru texinfo-3.12s/doc/texinfo.txi texinfo-3.12s.new/doc/texinfo.txi
  @end direntry
  
  @c Before release, run C-u C-c C-u C-a (texinfo-all-menus-update with a
  @end direntry
  
  @c Before release, run C-u C-c C-u C-a (texinfo-all-menus-update with a

-@@ -538,8 +538,8 @@
+@@ -520,8 +520,8 @@

  Formatting and Printing Hardcopy
  
  * Use TeX::                     Use @TeX{} to format for hardcopy.
  Formatting and Printing Hardcopy
  
  * Use TeX::                     Use @TeX{} to format for hardcopy.


@@ -32,16 +62,16 @@ diff -Nru texinfo-3.12s/doc/texinfo.txi texinfo-3.12s.new/doc/texinfo.txi
  * Print with lpr::              How to print.
  * Within Emacs::                How to format and print from an Emacs shell.
  * Texinfo Mode Printing::       How to format and print in Texinfo mode.
  * Print with lpr::              How to print.
  * Within Emacs::                How to format and print from an Emacs shell.
  * Texinfo Mode Printing::       How to format and print in Texinfo mode.

-@@ -582,7 +582,7 @@
+@@ -564,7 +564,7 @@

                                    located in other directories.
  * Installing Dir Entries::      How to specify what menu entry to add
                                    to the Info directory.
 -* Invoking install-info::       @code{install-info} options.
 +* install-info::              @code{install-info} options.
  
                                    located in other directories.
  * Installing Dir Entries::      How to specify what menu entry to add
                                    to the Info directory.
 -* Invoking install-info::       @code{install-info} options.
 +* install-info::              @code{install-info} options.
  

- Sample Permissions
+ Include Files

  
  

-@@ -610,7 +610,7 @@
+@@ -586,7 +586,7 @@

  
  Formatting Mistakes
  
  
  Formatting Mistakes
  


@@ -50,7 +80,7 @@ diff -Nru texinfo-3.12s/doc/texinfo.txi texinfo-3.12s.new/doc/texinfo.txi
  * Debugging with Info::         How to catch errors with Info formatting.
  * Debugging with TeX::          How to catch errors with @TeX{} formatting.
  * Using texinfo-show-structure::  How to use @code{texinfo-show-structure}.
  * Debugging with Info::         How to catch errors with Info formatting.
  * Debugging with TeX::          How to catch errors with @TeX{} formatting.
  * Using texinfo-show-structure::  How to use @code{texinfo-show-structure}.

-@@ -2286,7 +2286,7 @@
+@@ -2260,7 +2260,7 @@

  you must run the @code{texindex} command after first running the
  @code{tex} typesetting command; and then you must run the @code{tex}
  command again.  Or else run the @code{texi2dvi} command which
  you must run the @code{texindex} command after first running the
  @code{tex} typesetting command; and then you must run the @code{tex}
  command again.  Or else run the @code{texi2dvi} command which


@@ -59,7 +89,7 @@ diff -Nru texinfo-3.12s/doc/texinfo.txi texinfo-3.12s.new/doc/texinfo.txi
  
  Often, when you are writing a document, you want to typeset and print
  only part of a file to see what it will look like.  You can use the
  
  Often, when you are writing a document, you want to typeset and print
  only part of a file to see what it will look like.  You can use the

-@@ -3877,8 +3877,8 @@
+@@ -3848,8 +3848,8 @@

  
  You need to include the @code{@@set@dots{}contentsaftertitlepage}
  commands early in the document (just after @code{@@setfilename}, for
  
  You need to include the @code{@@set@dots{}contentsaftertitlepage}
  commands early in the document (just after @code{@@setfilename}, for


@@ -70,7 +100,7 @@ diff -Nru texinfo-3.12s/doc/texinfo.txi texinfo-3.12s.new/doc/texinfo.txi
  without altering the source file at all.  For example:
  @example
  texi2dvi --texinfo=@@setshortcontentsaftertitlepage foo.texi
  without altering the source file at all.  For example:
  @example
  texi2dvi --texinfo=@@setshortcontentsaftertitlepage foo.texi

-@@ -12629,8 +12629,8 @@
+@@ -12759,8 +12759,8 @@

  
  @menu
  * Use TeX::                     Use @TeX{} to format for hardcopy.
  
  @menu
  * Use TeX::                     Use @TeX{} to format for hardcopy.


@@ -81,7 +111,7 @@ diff -Nru texinfo-3.12s/doc/texinfo.txi texinfo-3.12s.new/doc/texinfo.txi
  * Print with lpr::              How to print.
  * Within Emacs::                How to format and print from an Emacs shell.
  * Texinfo Mode Printing::       How to format and print in Texinfo mode.
  * Print with lpr::              How to print.
  * Within Emacs::                How to format and print from an Emacs shell.
  * Texinfo Mode Printing::       How to format and print in Texinfo mode.

-@@ -12660,7 +12660,7 @@
+@@ -12790,7 +12790,7 @@

  make an Info file (@pxref{Creating an Info File}).
  
  
  make an Info file (@pxref{Creating an Info File}).
  
  


@@ -90,7 +120,7 @@ diff -Nru texinfo-3.12s/doc/texinfo.txi texinfo-3.12s.new/doc/texinfo.txi
  @section Format with @code{tex} and @code{texindex}
  @cindex Shell formatting with @code{tex} and @code{texindex}
  @cindex Formatting with @code{tex} and @code{texindex}
  @section Format with @code{tex} and @code{texindex}
  @cindex Shell formatting with @code{tex} and @code{texindex}
  @cindex Formatting with @code{tex} and @code{texindex}

-@@ -12681,7 +12681,7 @@
+@@ -12811,7 +12811,7 @@

  @pindex texindex
  The @code{tex} formatting command itself does not sort the indices; it
  writes an output file of unsorted index data.  (The @code{texi2dvi}
  @pindex texindex
  The @code{tex} formatting command itself does not sort the indices; it
  writes an output file of unsorted index data.  (The @code{texi2dvi}


@@ -99,7 +129,7 @@ diff -Nru texinfo-3.12s/doc/texinfo.txi texinfo-3.12s.new/doc/texinfo.txi
  Format with @code{texi2dvi}}.)  To generate a printed index after
  running the @code{tex} command, you first need a sorted index to work
  from.  The @code{texindex} command sorts indices.  (The source file
  Format with @code{texi2dvi}}.)  To generate a printed index after
  running the @code{tex} command, you first need a sorted index to work
  from.  The @code{texindex} command sorts indices.  (The source file

-@@ -12755,7 +12755,7 @@
+@@ -12888,7 +12888,7 @@

  
  @pindex texi2dvi
  Alternatively, it's a one-step process: run @code{texi2dvi}
  
  @pindex texi2dvi
  Alternatively, it's a one-step process: run @code{texi2dvi}


@@ -108,7 +138,7 @@ diff -Nru texinfo-3.12s/doc/texinfo.txi texinfo-3.12s.new/doc/texinfo.txi
  
  You need not run @code{texindex} each time after you run @code{tex}.  If
  you do not, on the next run, the @code{tex} formatting command will use
  
  You need not run @code{texindex} each time after you run @code{tex}.  If
  you do not, on the next run, the @code{tex} formatting command will use

-@@ -12787,7 +12787,7 @@
+@@ -12920,7 +12920,7 @@

  (@pxref{Pointer Validation}).
  
  
  (@pxref{Pointer Validation}).
  
  


@@ -117,7 +147,7 @@ diff -Nru texinfo-3.12s/doc/texinfo.txi texinfo-3.12s.new/doc/texinfo.txi
  @section Format with @code{texi2dvi}
  @pindex texi2dvi @r{(shell script)}
  
  @section Format with @code{texi2dvi}
  @pindex texi2dvi @r{(shell script)}
  

-@@ -12823,7 +12823,7 @@
+@@ -12956,7 +12956,7 @@

  For a list of other options, run @samp{texi2dvi --help}.
  
  
  For a list of other options, run @samp{texi2dvi --help}.
  
  


@@ -126,7 +156,7 @@ diff -Nru texinfo-3.12s/doc/texinfo.txi texinfo-3.12s.new/doc/texinfo.txi
  @section Shell Print Using @code{lpr -d}
  @pindex lpr @r{(DVI print command)}
  
  @section Shell Print Using @code{lpr -d}
  @pindex lpr @r{(DVI print command)}
  

-@@ -13331,7 +13331,7 @@
+@@ -13465,7 +13465,7 @@

  @xref{small}, for information about
  commands that make it easier to produce examples for a smaller manual.
  
  @xref{small}, for information about
  commands that make it easier to produce examples for a smaller manual.
  


@@ -135,16 +165,16 @@ diff -Nru texinfo-3.12s/doc/texinfo.txi texinfo-3.12s.new/doc/texinfo.txi
  @TeX{}}, for other ways to format with @code{@@smallbook} that do not
  require changing the source file.
  
  @TeX{}}, for other ways to format with @code{@@smallbook} that do not
  require changing the source file.
  

-@@ -13360,7 +13360,7 @@
+@@ -13495,7 +13495,7 @@

  @end group
  @end example
  
 -@xref{Format with texi2dvi}, and @ref{Preparing for TeX,,Preparing for
 +@xref{texi2dvi}, and @ref{Preparing for TeX,,Preparing for
  @end group
  @end example
  
 -@xref{Format with texi2dvi}, and @ref{Preparing for TeX,,Preparing for
 +@xref{texi2dvi}, and @ref{Preparing for TeX,,Preparing for

- @TeX{}}, for other ways to format with @code{@@afourpaper} that do not
+ @TeX{}}, for other ways to format for different paper sizes that do not

  require changing the source file.
  
  require changing the source file.
  

-@@ -13406,7 +13406,7 @@
+@@ -13541,7 +13541,7 @@

  margins, you must define a new command in @file{texinfo.tex} (or
  @file{texinfo.cnf}, @pxref{Preparing for TeX,,Preparing for @TeX{}}).
  
  margins, you must define a new command in @file{texinfo.tex} (or
  @file{texinfo.cnf}, @pxref{Preparing for TeX,,Preparing for @TeX{}}).
  


@@ -153,7 +183,7 @@ diff -Nru texinfo-3.12s/doc/texinfo.txi texinfo-3.12s.new/doc/texinfo.txi
  @TeX{}}, for other ways to specify @code{@@pagesizes} that do not
  require changing the source file.
  
  @TeX{}}, for other ways to specify @code{@@pagesizes} that do not
  require changing the source file.
  

-@@ -14222,7 +14222,7 @@
+@@ -14386,7 +14386,7 @@

                                    located in other directories.
  * Installing Dir Entries::      How to specify what menu entry to add
                                    to the Info directory.
                                    located in other directories.
  * Installing Dir Entries::      How to specify what menu entry to add
                                    to the Info directory.


@@ -162,16 +192,7 @@ diff -Nru texinfo-3.12s/doc/texinfo.txi texinfo-3.12s.new/doc/texinfo.txi
  @end menu
  
  
  @end menu
  
  

-@@ -14447,7 +14447,7 @@
- special CTRL-_ character that Info needs will be present.
- 
- 
--@node Installing Dir Entries, Invoking install-info, Other Info Directories, Install an Info File
-+@node Installing Dir Entries, install-info, Other Info Directories, Install an Info File
- @subsection Installing Info Directory Files
- 
- When you install an Info file onto your system, you can use the program
-@@ -14468,7 +14468,7 @@
+@@ -14633,7 +14633,7 @@

  @@dircategory Texinfo documentation system
  @@direntry
  * Texinfo: (texinfo).           The GNU documentation format.
  @@dircategory Texinfo documentation system
  @@direntry
  * Texinfo: (texinfo).           The GNU documentation format.


@@ -180,7 +201,7 @@ diff -Nru texinfo-3.12s/doc/texinfo.txi texinfo-3.12s.new/doc/texinfo.txi
  @dots{}
  @@end direntry
  @end smallexample
  @dots{}
  @@end direntry
  @end smallexample

-@@ -14479,7 +14479,7 @@
+@@ -14644,7 +14644,7 @@

  INFO-DIR-SECTION Texinfo documentation system
  START-INFO-DIR-ENTRY
  * Texinfo: (texinfo).           The GNU documentation format.
  INFO-DIR-SECTION Texinfo documentation system
  START-INFO-DIR-ENTRY
  * Texinfo: (texinfo).           The GNU documentation format.


@@ -189,7 +210,7 @@ diff -Nru texinfo-3.12s/doc/texinfo.txi texinfo-3.12s.new/doc/texinfo.txi
  @dots{}
  END-INFO-DIR-ENTRY
  @end smallexample
  @dots{}
  END-INFO-DIR-ENTRY
  @end smallexample

-@@ -14505,8 +14505,8 @@
+@@ -14670,8 +14670,8 @@

  entry for the manual as a whole in the appropriate other category.
  
  
  entry for the manual as a whole in the appropriate other category.
  
  


@@ -200,7 +221,7 @@ diff -Nru texinfo-3.12s/doc/texinfo.txi texinfo-3.12s.new/doc/texinfo.txi
  
  @pindex install-info
  
  
  @pindex install-info
  

-@@ -17047,7 +17047,7 @@
+@@ -17064,7 +17064,7 @@

  command and you can use the @kbd{M-x Info-validate} command.@refill
  
  @menu
  command and you can use the @kbd{M-x Info-validate} command.@refill
  
  @menu


@@ -209,7 +230,7 @@ diff -Nru texinfo-3.12s/doc/texinfo.txi texinfo-3.12s.new/doc/texinfo.txi
  * Debugging with Info::         How to catch errors with Info formatting.
  * Debugging with TeX::          How to catch errors with @TeX{} formatting.
  * Using texinfo-show-structure::  How to use @code{texinfo-show-structure}.
  * Debugging with Info::         How to catch errors with Info formatting.
  * Debugging with TeX::          How to catch errors with @TeX{} formatting.
  * Using texinfo-show-structure::  How to use @code{texinfo-show-structure}.

-@@ -17055,7 +17055,7 @@
+@@ -17072,7 +17072,7 @@

  * Running Info-Validate::       How to find badly referenced nodes.
  @end menu
  
  * Running Info-Validate::       How to find badly referenced nodes.
  @end menu
  


@@ -218,7 +239,7 @@ diff -Nru texinfo-3.12s/doc/texinfo.txi texinfo-3.12s.new/doc/texinfo.txi
  @ifinfo
  @heading @code{makeinfo} Find Errors
  @end ifinfo
  @ifinfo
  @heading @code{makeinfo} Find Errors
  @end ifinfo

-@@ -17074,7 +17074,7 @@
+@@ -17091,7 +17091,7 @@

  cannot use @code{makeinfo}, or your problem is very puzzling, then you
  may want to use the tools described in this appendix.@refill
  
  cannot use @code{makeinfo}, or your problem is very puzzling, then you
  may want to use the tools described in this appendix.@refill
  


@@ -227,33 +248,3 @@ diff -Nru texinfo-3.12s/doc/texinfo.txi texinfo-3.12s.new/doc/texinfo.txi
  @comment  node-name,  next,  previous,  up
  @section Catching Errors with Info Formatting
  @cindex Catching errors with Info formatting
  @comment  node-name,  next,  previous,  up
  @section Catching Errors with Info Formatting
  @cindex Catching errors with Info formatting

-diff -Nru texinfo-4.0/doc/info-stnd.texi texinfo-4.0.new/doc/info-stnd.texi
---- texinfo-4.0/doc/info-stnd.texi     Fri Jun 25 23:57:05 1999
-+++ texinfo-4.0.new/doc/info-stnd.texi Fri Oct  1 12:51:32 1999
-@@ -10,9 +10,9 @@
- 
- @include version.texi
- 
--@dircategory Texinfo documentation system
-+@dircategory Texinfo documentation system:
- @direntry
--* Standalone info program: (info-stnd).    Standalone Info-reading program.
-+* Standalone info program: (info-stnd).       Standalone Info-reading program
- @end direntry
- 
- @ifinfo
-diff -Nru texinfo-4.0/doc/info.texi texinfo-4.0.new/doc/info.texi
---- texinfo-4.0/doc/info.texi  Mon Apr 19 23:37:23 1999
-+++ texinfo-4.0.new/doc/info.texi      Fri Oct  1 13:06:51 1999
-@@ -5,9 +5,9 @@
- @comment %**end of header
- @comment $Id$
- 
--@dircategory Texinfo documentation system
-+@dircategory Texinfo documentation system:
- @direntry
--* Info: (info).                 Documentation browsing system.
-+* Info: (info).                               Documentation browsing system
- @end direntry
- 
- @ifinfo

diff --git a/texinfo.spec b/texinfo.spec
index 2e00582548a9e7643118db99a1612452e8d195e9..82268d93b531f4b152304dded0997e0097415961 100644 (file)
--- a/texinfo.spec
+++ b/texinfo.spec
@@ -57,13 +57,13 @@ documentations.
 
 %description -l pl
 Texinfo jest systemem dokumentowania umo¿liwiaj±cym wyprodukowanie
 
 %description -l pl
 Texinfo jest systemem dokumentowania umo¿liwiaj±cym wyprodukowanie

-zarówno dokumentacji online jak i postaci do wydruku z pojedynczego
-pliku ¼ród³owego. bardzo czêsto piszê siedwie dokumentacje: jedna do
-przegl±dania online i inna do przyszykowanai wysokiej jako¶ci postaci
-drukowane. U¿ywaj±c Texinfo do powy¿szego potzrebujesz przygotowaæ
+zarówno dokumentacji online jak i w postaci do wydruku z pojedynczego
+pliku ¼ród³owego. Bardzo czêsto pisze siê dwie dokumentacje: jedn± do
+przegl±dania online i drug± do przyszykowania wysokiej jako¶ci postaci
+drukowanej. U¿ywaj±c Texinfo do powy¿szego potrzebujesz przygotowaæ

 dokumentacjê tylko w jednej postaci ¼ród³owej. Podczas modyfikacji
 dokumentacji modyfikujesz w takim razie tylko jeden dokument.
 dokumentacjê tylko w jednej postaci ¼ród³owej. Podczas modyfikacji
 dokumentacji modyfikujesz w takim razie tylko jeden dokument.

-Wiêkszo¶æ projektów GNU u¿ywa do dukumentowania formatu Texinfo.
+Wiêkszo¶æ projektów GNU u¿ywa do dokumentowania formatu Texinfo.

 
 %description -l tr
 GNU projesi, belgelemesinin büyük bölümünde texinfo dosyalarýný
 
 %description -l tr
 GNU projesi, belgelemesinin büyük bölümünde texinfo dosyalarýný


@@ -116,7 +116,7 @@ bulunur.
 %patch6 -p1
 
 %build
 %patch6 -p1
 
 %build

-ln -s version.texi doc/version2.texi
+ln -sf version.texi doc/version2.texi

 gettextize --copy --force
 aclocal
 autoconf
 gettextize --copy --force
 aclocal
 autoconf


@@ -135,7 +135,7 @@ install -d $RPM_BUILD_ROOT{%{_applnkdir}/Utilities,%{_sbindir},/sbin}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
 mv -f $RPM_BUILD_ROOT%{_bindir}/install-info $RPM_BUILD_ROOT%{_sbindir}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
 mv -f $RPM_BUILD_ROOT%{_bindir}/install-info $RPM_BUILD_ROOT%{_sbindir}

-ln -s %{_sbindir}/install-info $RPM_BUILD_ROOT/sbin/install-info
+ln -sf %{_sbindir}/install-info $RPM_BUILD_ROOT/sbin/install-info

 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_applnkdir}/Utilities
 
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_applnkdir}/Utilities