[SCM] Debian packaging of texinfo) branch, master, updated. upstream/4.13a.dfsg.1-11-g610c3c4

To: debian-tex-maint@lists.debian.org
Subject: [SCM] Debian packaging of texinfo) branch, master, updated. upstream/4.13a.dfsg.1-11-g610c3c4
From: "Norbert Preining" <preining@debian.org>
Date: Fri, 31 Aug 2012 01:18:42 +0000
Message-id: <[🔎] E1T7Fsg-0007QN-CF@vasks.debian.org>
The following commit has been merged in the master branch:
commit 0078881c02e589fdf335be3648f20882bf3ab257
Author: Norbert Preining <preining@debian.org>
Date:   Fri Aug 31 10:11:27 2012 +0900

    remove time stamps from patches

diff --git a/debian/patches/check-nodes-boundaries b/debian/patches/check-nodes-boundaries
index d78d7fe..ce8833c 100644
--- a/debian/patches/check-nodes-boundaries
+++ b/debian/patches/check-nodes-boundaries
@@ -3,13 +3,11 @@ wrong node computation if the .info file is malformed.
 The patch is based on the one checked in to texinfo cvs by 
 Sergey Poznyakoff
 ---
- info/nodes.c |   13 +++++++++++--
- 1 file changed, 11 insertions(+), 2 deletions(-)
+ info/nodes.c |    3 +++
+ 1 file changed, 3 insertions(+)
 
-Index: texinfo-4.13a.dfsg.1/info/nodes.c
-===================================================================
---- texinfo-4.13a.dfsg.1.orig/info/nodes.c	2010-10-08 10:00:22.000000000 +0900
-+++ texinfo-4.13a.dfsg.1/info/nodes.c	2010-10-08 10:13:25.000000000 +0900
+--- texinfo.orig/info/nodes.c
++++ texinfo/info/nodes.c
 @@ -960,6 +960,9 @@
          /* If we were able to find this file and load it, then return
             the node within it. */
diff --git a/debian/patches/dont_build_info b/debian/patches/dont_build_info
index b6fda5f..18ada32 100644
--- a/debian/patches/dont_build_info
+++ b/debian/patches/dont_build_info
@@ -6,10 +6,8 @@ dont build the info documentation, it has been removed
  doc/Makefile.in |   12 ++++++++----
  1 file changed, 8 insertions(+), 4 deletions(-)
 
-Index: texinfo-4.13a.dfsg.1/doc/Makefile.in
-===================================================================
---- texinfo-4.13a.dfsg.1.orig/doc/Makefile.in	2008-09-18 20:46:24.000000000 +0200
-+++ texinfo-4.13a.dfsg.1/doc/Makefile.in	2009-03-09 15:17:15.000000000 +0100
+--- texinfo.orig/doc/Makefile.in
++++ texinfo/doc/Makefile.in
 @@ -121,14 +121,16 @@
  CONFIG_CLEAN_FILES =
  SOURCES =
diff --git a/debian/patches/info_core_dump_small_window b/debian/patches/info_core_dump_small_window
index c085ab6..5b8b18a 100644
--- a/debian/patches/info_core_dump_small_window
+++ b/debian/patches/info_core_dump_small_window
@@ -1,5 +1,9 @@
---- texinfo-4.13a.dfsg.1.orig/info/window.c	2008-09-18 20:31:59.000000000 +0200
-+++ texinfo-4.13a.dfsg.1/info/window.c	2011-02-09 15:51:46.000000000 +0100
+---
+ info/window.c |    8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+--- texinfo.orig/info/window.c
++++ texinfo/info/window.c
 @@ -923,7 +923,13 @@
          break;
      }
diff --git a/debian/patches/info_universal_argument b/debian/patches/info_universal_argument
old mode 100755
new mode 100644
index e007dc1..281e6ca
--- a/debian/patches/info_universal_argument
+++ b/debian/patches/info_universal_argument
@@ -7,10 +7,8 @@ fix crash in info under nl locale
  po/tr.po |    2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
-Index: texinfo-4.13a.dfsg.1/po/ro.po
-===================================================================
---- texinfo-4.13a.dfsg.1.orig/po/ro.po	2008-09-18 20:38:32.000000000 +0200
-+++ texinfo-4.13a.dfsg.1/po/ro.po	2009-03-09 15:17:06.000000000 +0100
+--- texinfo.orig/po/ro.po
++++ texinfo/po/ro.po
 @@ -1681,7 +1681,7 @@
  
  #: info/session.c:5149
@@ -20,10 +18,8 @@ Index: texinfo-4.13a.dfsg.1/po/ro.po
  
  #: info/tilde.c:336
  #, c-format
-Index: texinfo-4.13a.dfsg.1/po/tr.po
-===================================================================
---- texinfo-4.13a.dfsg.1.orig/po/tr.po	2008-09-18 20:38:33.000000000 +0200
-+++ texinfo-4.13a.dfsg.1/po/tr.po	2009-03-09 15:17:06.000000000 +0100
+--- texinfo.orig/po/tr.po
++++ texinfo/po/tr.po
 @@ -1683,7 +1683,7 @@
  
  #: info/session.c:5149
diff --git a/debian/patches/int2size_t-fix-page-truncation b/debian/patches/int2size_t-fix-page-truncation
index ab9ca67..d7feb9e 100644
--- a/debian/patches/int2size_t-fix-page-truncation
+++ b/debian/patches/int2size_t-fix-page-truncation
@@ -1,5 +1,9 @@
---- a/info/window.c
-+++ b/info/window.c
+---
+ info/window.c |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- texinfo.orig/info/window.c
++++ texinfo/info/window.c
 @@ -1587,7 +1587,7 @@
        const char *carried_over_ptr;
        size_t carried_over_len, carried_over_count;
diff --git a/debian/patches/minor-buffer-size-fix b/debian/patches/minor-buffer-size-fix
index fa418ff..721bbe9 100644
--- a/debian/patches/minor-buffer-size-fix
+++ b/debian/patches/minor-buffer-size-fix
@@ -4,10 +4,12 @@ Description: extend stack buffers to be large enough for the type values
 Bug: https://savannah.gnu.org/bugs/?32122
 Bug-Ubuntu: https://launchpad.net/bugs/569802
 
-Index: texinfo-4.13a.dfsg.1/makeinfo/sectioning.c
-===================================================================
---- texinfo-4.13a.dfsg.1.orig/makeinfo/sectioning.c	2011-01-13 14:12:35.382016526 -0800
-+++ texinfo-4.13a.dfsg.1/makeinfo/sectioning.c	2011-01-13 14:14:41.285127427 -0800
+---
+ makeinfo/sectioning.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- texinfo.orig/makeinfo/sectioning.c
++++ texinfo/makeinfo/sectioning.c
 @@ -256,13 +256,13 @@
      return xstrdup ("");
    else if (enum_marker == APPENDIX_MAGIC)
diff --git a/debian/patches/replace_egrep_fgrep_sigs b/debian/patches/replace_egrep_fgrep_sigs
old mode 100755
new mode 100644
index e00fca3..ce82311
--- a/debian/patches/replace_egrep_fgrep_sigs
+++ b/debian/patches/replace_egrep_fgrep_sigs
@@ -10,10 +10,8 @@ by signal names
  util/texi2dvi       |    2 +-
  4 files changed, 13 insertions(+), 13 deletions(-)
 
-Index: texinfo-4.13a.dfsg.1/makeinfo/tests/cond
-===================================================================
---- texinfo-4.13a.dfsg.1.orig/makeinfo/tests/cond	2005-04-05 23:04:16.000000000 +0200
-+++ texinfo-4.13a.dfsg.1/makeinfo/tests/cond	2009-03-09 15:16:58.000000000 +0100
+--- texinfo.orig/makeinfo/tests/cond
++++ texinfo/makeinfo/tests/cond
 @@ -6,28 +6,28 @@
  
  # Default Info output.
@@ -51,10 +49,8 @@ Index: texinfo-4.13a.dfsg.1/makeinfo/tests/cond
 +test `grep -F -c ' text.' cond.out` -eq 5 || exit 3
  
  rm -f cond.out cond.info
-Index: texinfo-4.13a.dfsg.1/util/fixfonts
-===================================================================
---- texinfo-4.13a.dfsg.1.orig/util/fixfonts	2002-08-26 01:38:39.000000000 +0200
-+++ texinfo-4.13a.dfsg.1/util/fixfonts	2009-03-09 15:16:58.000000000 +0100
+--- texinfo.orig/util/fixfonts
++++ texinfo/util/fixfonts
 @@ -33,7 +33,7 @@
  tempfile2="${TMPDIR}/circ2$$"
  
@@ -64,10 +60,8 @@ Index: texinfo-4.13a.dfsg.1/util/fixfonts
  
  # Find all the fonts with names that include `circle'.
  (cd "${texfontdir}"; find . -name '*circle*' -print > "${tempfile}")
-Index: texinfo-4.13a.dfsg.1/util/gen-dir-node
-===================================================================
---- texinfo-4.13a.dfsg.1.orig/util/gen-dir-node	2004-04-11 19:56:47.000000000 +0200
-+++ texinfo-4.13a.dfsg.1/util/gen-dir-node	2009-03-09 15:16:58.000000000 +0100
+--- texinfo.orig/util/gen-dir-node
++++ texinfo/util/gen-dir-node
 @@ -79,7 +79,7 @@
  ### then generate entries for those in the same way, putting the info for 
  ### those at the end....
@@ -88,10 +82,8 @@ Index: texinfo-4.13a.dfsg.1/util/gen-dir-node
  	      sort -t: -k2 -k1 | tr ' ' '_')`
  for sectdata in ${filesectdata}; do
    file=`echo ${sectdata} | cut -d: -f1`
-Index: texinfo-4.13a.dfsg.1/util/texi2dvi
-===================================================================
---- texinfo-4.13a.dfsg.1.orig/util/texi2dvi	2009-03-09 15:16:49.000000000 +0100
-+++ texinfo-4.13a.dfsg.1/util/texi2dvi	2009-03-09 15:16:58.000000000 +0100
+--- texinfo.orig/util/texi2dvi
++++ texinfo/util/texi2dvi
 @@ -1760,7 +1760,7 @@
  	     sed 's,/,!,g'`
    esac
diff --git a/debian/patches/texi-allow-shell-escape.diff b/debian/patches/texi-allow-shell-escape.diff
index a9d5870..c0dc5d6 100644
--- a/debian/patches/texi-allow-shell-escape.diff
+++ b/debian/patches/texi-allow-shell-escape.diff
@@ -1,6 +1,9 @@
-diff -urN texinfo-4.13a.dfsg.1_svn/util/texi2dvi texinfo-4.13a.dfsg.1/util/texi2dvi
---- texinfo-4.13a.dfsg.1_svn/util/texi2dvi	2012-02-07 13:45:49.000000000 +0100
-+++ texinfo-4.13a.dfsg.1/util/texi2dvi	2012-02-07 13:47:53.000000000 +0100
+---
+ util/texi2dvi |    6 ++++++
+ 1 file changed, 6 insertions(+)
+
+--- texinfo.orig/util/texi2dvi
++++ texinfo/util/texi2dvi
 @@ -69,6 +69,7 @@
  recode=false
  set_language=
diff --git a/debian/patches/texi-allow-tilde b/debian/patches/texi-allow-tilde
index cd83522..4af7d38 100644
--- a/debian/patches/texi-allow-tilde
+++ b/debian/patches/texi-allow-tilde
@@ -19,10 +19,8 @@ directory portion, at least.  Besides being cleaner in general.
  util/texi2dvi |   26 +++++++++++++++++++++-----
  1 file changed, 21 insertions(+), 5 deletions(-)
 
-Index: texinfo-4.13a.dfsg.1/util/texi2dvi
-===================================================================
---- texinfo-4.13a.dfsg.1.orig/util/texi2dvi	2009-03-18 14:40:08.000000000 +0100
-+++ texinfo-4.13a.dfsg.1/util/texi2dvi	2009-03-18 14:40:18.000000000 +0100
+--- texinfo.orig/util/texi2dvi
++++ texinfo/util/texi2dvi
 @@ -56,6 +56,7 @@
  # Instead, assign them an empty value.
  action=compile
diff --git a/debian/patches/texi2dvi-local-fallback-syntax.diff b/debian/patches/texi2dvi-local-fallback-syntax.diff
index a68bcdf..343c401 100644
--- a/debian/patches/texi2dvi-local-fallback-syntax.diff
+++ b/debian/patches/texi2dvi-local-fallback-syntax.diff
@@ -1,10 +1,8 @@
  util/texi2dvi |    4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
-Index: texinfo/util/texi2dvi
-===================================================================
---- texinfo.orig/util/texi2dvi	2012-08-31 10:00:36.000000000 +0900
-+++ texinfo/util/texi2dvi	2012-08-31 10:00:39.000000000 +0900
+--- texinfo.orig/util/texi2dvi
++++ texinfo/util/texi2dvi
 @@ -141,11 +141,13 @@
    }
    test_local
diff --git a/debian/patches/texi2dvi_non-C_locale b/debian/patches/texi2dvi_non-C_locale
index 2e4d119..1693c7c 100644
--- a/debian/patches/texi2dvi_non-C_locale
+++ b/debian/patches/texi2dvi_non-C_locale
@@ -3,10 +3,8 @@
  util/texi2dvi |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
   
-Index: texinfo/util/texi2dvi
-===================================================================
---- texinfo.orig/util/texi2dvi	2012-08-31 10:00:39.000000000 +0900
-+++ texinfo/util/texi2dvi	2012-08-31 10:00:49.000000000 +0900
+--- texinfo.orig/util/texi2dvi
++++ texinfo/util/texi2dvi
 @@ -1712,7 +1712,7 @@
  
    # If the COMMAND_LINE_FILENAME is not absolute (e.g., --debug.tex),
diff --git a/debian/patches/warn_missing_tex b/debian/patches/warn_missing_tex
old mode 100755
new mode 100644
index 7e04ff6..82f4bc3
--- a/debian/patches/warn_missing_tex
+++ b/debian/patches/warn_missing_tex
@@ -4,10 +4,8 @@
  util/texi2dvi |   11 +++++++++++
  1 file changed, 11 insertions(+)
 
-Index: texinfo-4.13a.dfsg.1/util/texi2dvi
-===================================================================
---- texinfo-4.13a.dfsg.1.orig/util/texi2dvi	2008-09-18 20:46:01.000000000 +0200
-+++ texinfo-4.13a.dfsg.1/util/texi2dvi	2009-03-09 15:16:49.000000000 +0100
+--- texinfo.orig/util/texi2dvi
++++ texinfo/util/texi2dvi
 @@ -32,6 +32,17 @@
  # No failure shall remain unpunished.
  set -e

-- 
Debian packaging of texinfo)
Reply to:
Prev by Date: [SCM] Debian packaging of texinfo) branch, master, updated. upstream/4.13a.dfsg.1-11-g610c3c4
Next by Date: Re: Converting to git
Previous by thread: [SCM] Debian packaging of texinfo) branch, master, updated. upstream/4.13a.dfsg.1-11-g610c3c4
Next by thread: Bug#686335: texlive-base: updmap.pl does not recognize option "dvipsDownloadBase35" set in updmap.cfg
Index(es):
- Date
- Thread