[texinfo] 10/18: update patches, remove upstream patch
This is an automated email from the git hooks/post-receive script.
preining pushed a commit to branch master
in repository texinfo.
commit ca43698b4d420d00e68a2807eeb46d62eec41bda
Author: Norbert Preining <preining@debian.org>
Date: Wed Dec 30 15:32:21 2015 +0900
update patches, remove upstream patch
---
debian/patches/numerical-signal-names | 2 +-
debian/patches/series | 1 -
debian/patches/upstream-fix-info-terminal | 23 -----------------------
3 files changed, 1 insertion(+), 25 deletions(-)
diff --git a/debian/patches/numerical-signal-names b/debian/patches/numerical-signal-names
index 1f363d0..fdb66ce 100644
--- a/debian/patches/numerical-signal-names
+++ b/debian/patches/numerical-signal-names
@@ -7,7 +7,7 @@ replace numerical signal names with symbolical
--- texinfo.orig/util/texi2dvi
+++ texinfo/util/texi2dvi
-@@ -1951,7 +1951,7 @@
+@@ -1941,7 +1941,7 @@
$SED "s,^$orig_pwd/,,;s,^\./,,;s,/,!,g"`
esac
# Remove it at exit if clean mode.
diff --git a/debian/patches/series b/debian/patches/series
index e4bc630..bb53fa0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,4 +3,3 @@ numerical-signal-names
dont_build_info
info-manpage-mentiones-nonfree
#do-not-require-automake-1.15
-upstream-fix-info-terminal
diff --git a/debian/patches/upstream-fix-info-terminal b/debian/patches/upstream-fix-info-terminal
deleted file mode 100644
index 28d511d..0000000
--- a/debian/patches/upstream-fix-info-terminal
+++ /dev/null
@@ -1,23 +0,0 @@
----
- info/display.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- texinfo.orig/info/display.c
-+++ texinfo/info/display.c
-@@ -540,7 +540,7 @@
- mbi_avail (iter);
- while (1)
- {
-- int delim = 0;
-+ int delim;
- mbi_copy (&bol_iter, &iter);
- bol_ref_index = ref_index;
- bol_match_index = match_index;
-@@ -552,6 +552,7 @@
-
- text_buffer_reset (&tb_printed_line);
-
-+ delim = 0;
- /* Check if we have processed all the lines in the window. */
- if (pl_num == win->height)
- break;
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-tex/texinfo.git
Reply to: