[Pkg-zsh-commits] [SCM] Debian zsh package branch, debian, updated. debian/5.0.2-2-43-g73a3eb1

[Axel Beckert]

The following commit has been merged in the debian branch:
commit 73a3eb15ecc20822c32dbe1b150f0247fd5a4b3b
Author: Axel Beckert <abe at deuxchevaux.org>
Date:   Thu May 9 19:00:02 2013 +0200

    Fix FTBFS with texinfo versions >= 5
    
    Cherry-picked upstream patches
    67a4be36c6203c26c3912c07441f42e3965f0fa8 and
    b174a0df054929efd7804922750c71adeb8e0b57
    
    Also add a build-dependency on texlive-latex-recommended if only
    texinfo >= 5 is available.

diff --git a/debian/control b/debian/control
index 2ef98f4..b58d9b8 100644
--- a/debian/control
+++ b/debian/control
@@ -13,6 +13,7 @@ Build-Depends: bsdmainutils,
                libpcre3-dev,
                texi2html (>= 1.76-3),
                texinfo,
+               texinfo (<< 5~) | texlive-latex-recommended,
                texlive-latex-base,
                yodl
 Maintainer: Debian Zsh Maintainers <pkg-zsh-devel at lists.alioth.debian.org>
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..d201235 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+updates_needed_with_latest_texinfo.patch
+suppress_texinfo_warning_by_adding_item_arguments.patch
diff --git a/debian/patches/suppress_texinfo_warning_by_adding_item_arguments.patch b/debian/patches/suppress_texinfo_warning_by_adding_item_arguments.patch
new file mode 100644
index 0000000..be78fa9
--- /dev/null
+++ b/debian/patches/suppress_texinfo_warning_by_adding_item_arguments.patch
@@ -0,0 +1,26 @@
+Description: 31263: suppress texinfo warning by giving item an argument
+Author: Peter Stephenson <p.w.stephenson at ntlworld.com>
+Date: Fri Apr 12 23:01:25 2013 +0100
+Upstream-Commit: 67a4be36c6203c26c3912c07441f42e3965f0fa8
+Revised: Axel Beckert <abe at debian.org>
+Debian-Bug: 707483
+
+diff --git a/Doc/Zsh/mod_curses.yo b/Doc/Zsh/mod_curses.yo
+index d3f8ad2..7ad772a 100644
+--- a/Doc/Zsh/mod_curses.yo
++++ b/Doc/Zsh/mod_curses.yo
+@@ -84,11 +84,11 @@ The subcommand tt(position) writes various positions associated with
+ var(targetwin) into the array named var(array).
+ These are, in order:
+ startsitem()
+-sitem()(The y and x coordinates of the cursor relative to the top left
++sitem(-)(The y and x coordinates of the cursor relative to the top left
+ of var(targetwin))
+-sitem()(The y and x coordinates of the top left of var(targetwin) on the
++sitem(-)(The y and x coordinates of the top left of var(targetwin) on the
+ screen)
+-sitem()(The size of var(targetwin) in y and x dimensions.)
++sitem(-)(The size of var(targetwin) in y and x dimensions.)
+ endsitem()
+ 
+ Outputting characters and strings are achieved by tt(char) and tt(string)
diff --git a/debian/patches/updates_needed_with_latest_texinfo.patch b/debian/patches/updates_needed_with_latest_texinfo.patch
new file mode 100644
index 0000000..70f5d07
--- /dev/null
+++ b/debian/patches/updates_needed_with_latest_texinfo.patch
@@ -0,0 +1,36 @@
+Description: 31261: updates needed with latest texinfo
+Author: Peter Stephenson <p.w.stephenson at ntlworld.com>
+Date: Fri Apr 12 22:47:22 2013 +0100
+Upstream-Commit: b174a0df054929efd7804922750c71adeb8e0b57
+Revised: Axel Beckert <abe at debian.org>
+Debian-Bug: 707483
+
+diff --git a/Doc/Zsh/compsys.yo b/Doc/Zsh/compsys.yo
+index 2991c1f..4a436da 100644
+--- a/Doc/Zsh/compsys.yo
++++ b/Doc/Zsh/compsys.yo
+@@ -4414,8 +4414,7 @@ tt(ambiguous), tt(special-dirs), tt(list-suffixes) and tt(file-sort)
+ described above.
+ )
+ findex(_pick_variant)
+-xitem(tt(_pick_variant) [ tt(-b) var(builtin-label) ] [ tt(-c)
+-var(command) ] [ tt(-r) var(name) ])
++xitem(tt(_pick_variant) [ tt(-b) var(builtin-label) ] [ tt(-c) var(command) ] [ tt(-r) var(name) ])
+ item(   var(label)tt(=)var(pattern) ... var(label) [ var(args) ... ])(
+ This function is used to resolve situations where a single command name
+ requires more than one type of handling, either because it
+diff --git a/Doc/ztexi.yo b/Doc/ztexi.yo
+index ed0236b..513452b 100644
+--- a/Doc/ztexi.yo
++++ b/Doc/ztexi.yo
+@@ -193,8 +193,8 @@ def(startlist)(0)(\
+   startitem()\
+ )
+ def(endlist)(0)(\
+-  NOTRANS(@item)+NL()\
+-  enditem()\
++  enditem()+NL()\
++  NOTRANS(@sp 1)\
+ )
+ def(list)(1)(\
+   item(ARG1)()\

-- 
Debian zsh package