[SCM] Debian packaging of texinfo) branch, master, updated. debian/4.13.93.dfsg.1-1-5-g2839069
The following commit has been merged in the master branch:
commit 2912b0c1fe402b21be09d4649582dbb26ede089d
Author: Norbert Preining <preining@debian.org>
Date: Sun Jan 20 20:24:52 2013 +0900
update patches to new release
diff --git a/debian/patches/dont_build_info b/debian/patches/dont_build_info
index 01cc763..b0e4da2 100644
--- a/debian/patches/dont_build_info
+++ b/debian/patches/dont_build_info
@@ -24,7 +24,7 @@ dont build the info documentation, it has been removed
TEXI2DVI = texi2dvi
TEXI2PDF = $(TEXI2DVI) --pdf --batch
MAKEINFOHTML = $(MAKEINFO) --html
-@@ -1000,8 +1002,10 @@
+@@ -1001,8 +1003,10 @@
SUBDIRS = tp_api
# Put texinfo.txi first because that's the most important.
diff --git a/debian/patches/fix-broken-po-files b/debian/patches/fix-broken-po-files
index 8267cd9..525b8b7 100644
--- a/debian/patches/fix-broken-po-files
+++ b/debian/patches/fix-broken-po-files
@@ -3,8 +3,7 @@ See Ubuntu bug 707931
https://bugs.launchpad.net/ubuntu/+source/texinfo/+bug/707931
---
po/id.po | 2 +-
- po/it.po | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
--- texinfo.orig/po/id.po
+++ texinfo/po/id.po
@@ -17,16 +16,3 @@ https://bugs.launchpad.net/ubuntu/+source/texinfo/+bug/707931
"%s\tIni adalah tingkat paling atas dari pohon INFO\n"
"\n"
" Ini (titik Direktori) memberikan sebuah menu dari topik utama.\n"
---- texinfo.orig/po/it.po
-+++ texinfo/po/it.po
-@@ -2175,8 +2175,8 @@
- "Questo è il file .../info/dir, che contiene il\n"
- "nodo più in alto della gerarchia di Info, chiamata (dir)Top.\n"
- "La prima volta che invochi il programma Info esso parte da questo nodo.\n"
--"^_\n"
--"%s\\tQuesto è il nodo più alto dell'albero INFO\n"
-+" \n"
-+"%s\tQuesto è il nodo più alto dell'albero INFO\n"
- "\n"
- " Questo (il nodo principale) fornisce un menù che contiene le voci "
- "principali.\n"
diff --git a/debian/patches/series b/debian/patches/series
index ef62b76..1c494de 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,4 +3,3 @@ warn_missing_tex
numerical-signal-names
info_universal_argument
dont_build_info
-upstream_fix_displaced_cursor
diff --git a/debian/patches/upstream_fix_displaced_cursor b/debian/patches/upstream_fix_displaced_cursor
deleted file mode 100644
index 8018ceb..0000000
--- a/debian/patches/upstream_fix_displaced_cursor
+++ /dev/null
@@ -1,16 +0,0 @@
-Fix for Debian bug #652204 and texinfo bug #37823
-displaced cursor on search
----
- info/window.c | 1 +
- 1 file changed, 1 insertion(+)
-
---- texinfo.orig/info/window.c
-+++ texinfo/info/window.c
-@@ -855,6 +855,7 @@
- calc_closure_expand (&closure);
- window->line_starts[window->line_count] = NULL;
- window->log_line_no[window->line_count] = 0;
-+ window_line_map_init (window);
- }
-
- /* Given WINDOW, recalculate the line starts for the node it displays. */
--
Debian packaging of texinfo)
Reply to: