- pl.po update for 4.7 (they changed some strings since the last prerelease :/)

[packages/texinfo.git] / texinfo-zlib.patch

diff --git a/texinfo-zlib.patch b/texinfo-zlib.patch
index 6131e2adfada898a93d12975e169a85ac5ed12e7..c888a5acc60da0595b86679797412a8739b8aa6a 100644 (file)
--- a/texinfo-zlib.patch
+++ b/texinfo-zlib.patch
@@ -1,5 +1,19 @@
---- texinfo-3.12f/util/install-info.c.zlib     Wed Mar 17 18:35:46 1999
-+++ texinfo-3.12f/util/install-info.c  Wed Mar 17 18:35:47 1999
+diff -ur texinfo-4.1-/util/Makefile.am texinfo-4.1/util/Makefile.am
+--- texinfo-4.1-/util/Makefile.am      Mon Feb 25 17:23:45 2002
++++ texinfo-4.1/util/Makefile.am       Sat Mar  9 15:55:11 2002
+@@ -7,7 +7,7 @@
+ 
+ localedir = $(datadir)/locale
+ INCLUDES = -I$(top_srcdir)/lib -I../intl -DLOCALEDIR=\"$(localedir)\"
+-LDADD = ../lib/libtxi.a @LIBINTL@
++LDADD = ../lib/libtxi.a @LIBINTL@ -lz
+ 
+ # Most of these are for fun.  The only one that's really supported is texi2dvi.
+ EXTRA_DIST = README deref.c fix-info-dir fixfonts \
+Only in texinfo-4.1/util: Makefile.am.orig
+diff -ur texinfo-4.1-/util/install-info.c texinfo-4.1/util/install-info.c
+--- texinfo-4.1-/util/install-info.c   Sat Jan 19 02:12:29 2002
++++ texinfo-4.1/util/install-info.c    Sat Mar  9 15:54:50 2002
 @@ -19,6 +19,7 @@
  
  #include "system.h"
@@ -8,7 +22,7 @@
  
  static char *progname = "install-info";
  
-@@ -474,7 +475,7 @@
+@@ -481,7 +482,7 @@
     COMPRESSION_PROGRAM.  The compression program is determined by the
     magic number, not the filename.  */
  
@@ -17,7 +31,7 @@
  open_possibly_compressed_file (filename, create_callback,
                                 opened_filename, compression_program, is_pipe)
       char *filename;
-@@ -486,7 +487,7 @@
+@@ -493,7 +494,7 @@
    char *local_opened_filename, *local_compression_program;
    int nread;
    char data[4];
@@ -26,7 +40,7 @@
  
    /* We let them pass NULL if they don't want this info, but it's easier
       to always determine it.  */
-@@ -494,23 +495,23 @@
+@@ -501,23 +502,23 @@
      opened_filename = &local_opened_filename;
  
    *opened_filename = filename;
@@ -54,7 +68,7 @@
          }
  #endif
        if (!f)
-@@ -522,7 +523,7 @@
+@@ -529,7 +530,7 @@
                /* And try opening it again.  */
                free (*opened_filename);
                *opened_filename = filename;
@@ -63,7 +77,7 @@
                if (!f)
                  pfatal_with_name (filename);
              }
-@@ -531,54 +532,7 @@
+@@ -538,54 +539,7 @@
          }
      }
  
@@ -73,9 +87,9 @@
 -  if (nread != 1)
 -    {
 -      /* Empty files don't set errno, so we get something like
--       "install-info: No error for foo", which is confusing.  */
+-         "install-info: No error for foo", which is confusing.  */
 -      if (nread == 0)
--        fatal (_("%s: empty file"), *opened_filename);
+-        fatal (_("%s: empty file"), *opened_filename, 0);
 -      pfatal_with_name (*opened_filename);
 -    }
 -
@@ -119,7 +133,7 @@
  
    return f;
  }
-@@ -601,7 +555,7 @@
+@@ -608,7 +562,7 @@
       char **compression_program;
  {
    char *real_name;
@@ -128,7 +142,7 @@
    int pipe_p;
    int filled = 0;
    int data_size = 8192;
-@@ -615,7 +569,7 @@
+@@ -622,7 +576,7 @@
  
    for (;;)
      {
@@ -137,7 +151,7 @@
        if (nread < 0)
          pfatal_with_name (real_name);
        if (nread == 0)
-@@ -634,10 +588,7 @@
+@@ -641,10 +595,7 @@
    /* We need to close the stream, since on some systems the pipe created
       by popen is simulated by a temporary file which only gets removed
       inside pclose.  */
@@ -149,8 +163,8 @@
  
    *sizep = filled;
    return data;
-@@ -1245,7 +1196,7 @@
-     warning (_("no entries found for `%s'; nothing deleted"), infile);
+@@ -1409,7 +1360,7 @@
+     warning (_("no entries found for `%s'; nothing deleted"), infile, 0);
  
    output_dirfile (opened_dirfilename, dir_nlines, dir_lines, n_entries_to_add,
 -                  entries_to_add, input_sections, compression_program);
@@ -158,14 +172,3 @@
  
    xexit (0);
  }
---- texinfo-3.12f/util/Makefile.in.zlib        Wed Mar 17 18:36:17 1999
-+++ texinfo-3.12f/util/Makefile.in     Wed Mar 17 18:36:25 1999
-@@ -102,7 +102,7 @@
- DEFS = @DEFS@ -I. -I$(srcdir) -I..
- CPPFLAGS = @CPPFLAGS@
- LDFLAGS = @LDFLAGS@
--LIBS = @LIBS@
-+LIBS = @LIBS@ -lz
- install_info_SOURCES = install-info.c
- install_info_OBJECTS =  install-info.o
- install_info_LDADD = $(LDADD)