[Pkg-zsh-commits] [zsh] 02/02: Remove patches applied upstream
Axel Beckert
abe at deuxchevaux.org
Thu Nov 7 14:40:38 UTC 2013
This is an automated email from the git hooks/post-receive script.
abe pushed a commit to branch debian
in repository zsh.
commit b95cf81b2aa59d41cebcee34359a35b562b86f11
Author: Axel Beckert <abe at deuxchevaux.org>
Date: Thu Nov 7 15:02:53 2013 +0100
Remove patches applied upstream
---
debian/patches/fix-segfault-in-compinit-get_cvdef | 19 ----------
debian/patches/series | 5 ---
..._texinfo_warning_by_adding_item_arguments.patch | 26 --------------
.../texinfo_remove_leading_whitespace.patch | 20 -----------
.../updates_needed_with_latest_texinfo.patch | 37 --------------------
debian/patches/vcs_info_guilt_support.patch | 23 ------------
6 files changed, 130 deletions(-)
diff --git a/debian/patches/fix-segfault-in-compinit-get_cvdef b/debian/patches/fix-segfault-in-compinit-get_cvdef
deleted file mode 100644
index a43ea5b..0000000
--- a/debian/patches/fix-segfault-in-compinit-get_cvdef
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Fixes segfault on "task <Tab><Tab>"
-Bug: http://www.zsh.org/mla/workers/2013/msg00772.html
-Forwarded: http://www.zsh.org/mla/workers/2013/msg00790.html
-Author: Axel Beckert <abe at debian.org>
-Applied-Upstream: http://sourceforge.net/p/zsh/code/ci/844e569b632fc032576edc039f793be47fde724e/
-
-Index: zsh/Src/Zle/computil.c
-===================================================================
---- zsh.orig/Src/Zle/computil.c 2013-09-18 23:09:08.000000000 +0200
-+++ zsh/Src/Zle/computil.c 2013-09-18 23:28:55.000000000 +0200
-@@ -2992,7 +2992,7 @@
- return *p;
- } else if (!min || !*p || (*p)->lastt < (*min)->lastt)
- min = p;
-- if (i)
-+ if (i > 0)
- min = p;
- if ((new = parse_cvdef(nam, args))) {
- freecvdef(*min);
diff --git a/debian/patches/series b/debian/patches/series
index ead3e20..2268b43 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,2 @@
-updates_needed_with_latest_texinfo.patch
-suppress_texinfo_warning_by_adding_item_arguments.patch
-texinfo_remove_leading_whitespace.patch
-vcs_info_guilt_support.patch
replace-texi2html-with-makeinfo
-fix-segfault-in-compinit-get_cvdef
use-dev-null-instead-of-dev-tty-for-dash-c-test.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
deleted file mode 100644
index 0c67f82..0000000
--- a/debian/patches/suppress_texinfo_warning_by_adding_item_arguments.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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
-Origin: commit:67a4be36c6203c26c3912c07441f42e3965f0fa8
-Revieved-By: Axel Beckert <abe at debian.org>
-Bug-Debian: http://bugs.debian.org/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/texinfo_remove_leading_whitespace.patch b/debian/patches/texinfo_remove_leading_whitespace.patch
deleted file mode 100644
index ff079d3..0000000
--- a/debian/patches/texinfo_remove_leading_whitespace.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Remove leading whitespace from texinfo directory entry
- The leading whitespace makes Emacs' info menu not work as expected,
- at least With newer version or combinations of texinfo and/or yodl.
-Author: Bruce Stephens <bruce.stephens at isode.com>
-Bug-Debian: http://bugs.debian.org/711516
-Forwarded: http://www.zsh.org/mla/workers/2013/msg00520.html
-
-Index: zsh/Doc/ztexi.yo
-===================================================================
---- zsh.orig/Doc/ztexi.yo 2013-06-13 02:31:40.743480301 +0200
-+++ zsh/Doc/ztexi.yo 2013-06-13 02:32:50.236628923 +0200
-@@ -71,7 +71,7 @@
- NOTRANS(@ifinfo)+NL()\
- NOTRANS(@dircategory Utilities)+NL()\
- NOTRANS(@direntry)+NL()\
-- NOTRANS( * ZSH: (zsh). The Z Shell Manual.)+NL()\
-+ NOTRANS(* ZSH: (zsh). The Z Shell Manual.)+NL()\
- NOTRANS(@end direntry)+NL()\
- NOTRANS(@end ifinfo)+NL()\
- )
diff --git a/debian/patches/updates_needed_with_latest_texinfo.patch b/debian/patches/updates_needed_with_latest_texinfo.patch
deleted file mode 100644
index c80296a..0000000
--- a/debian/patches/updates_needed_with_latest_texinfo.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-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
-Origin: commit:b174a0df054929efd7804922750c71adeb8e0b57
-Reviewed-By: Axel Beckert <abe at debian.org>
-Bug-Debian: 707483
-Bug: http://www.zsh.org/mla/workers/2013/msg00321.html
-
-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)()\
diff --git a/debian/patches/vcs_info_guilt_support.patch b/debian/patches/vcs_info_guilt_support.patch
deleted file mode 100644
index 8677c72..0000000
--- a/debian/patches/vcs_info_guilt_support.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Description: Fix warnings in VCS_INFO's stgit support when guilt is used
- Without this patch, a git repository with guilt based patches would
- cause VCS_INFO to emit the following warning:
- "VCS_INFO_get_data_git:134: no such file or directory:
- .git/patches/master/applied"
-Author: Frank Terbeck <ft at bewatermyfriend.org>
-Bug: http://www.zsh.org/mla/workers/2013/msg00546.html
-
-Index: zsh/Functions/VCS_Info/Backends/VCS_INFO_get_data_git
-===================================================================
---- zsh.orig/Functions/VCS_Info/Backends/VCS_INFO_get_data_git 2013-01-05 04:47:29.000000000 +0100
-+++ zsh/Functions/VCS_Info/Backends/VCS_INFO_get_data_git 2013-06-17 17:44:18.000000000 +0200
-@@ -128,7 +128,9 @@
- rrn=${gitbase:t}
-
- local patchdir=${gitdir}/patches/${gitbranch}
--if [[ -d $patchdir ]] ; then
-+if [[ -d $patchdir ]] && [[ -f $patchdir/applied ]] \
-+ && [[ -f $patchdir/unapplied ]]
-+then
- local -a stgit_applied stgit_unapplied stgit_all
-
- stgit_applied=(${(f)"$(< "${patchdir}/applied")"})
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/zsh.git
More information about the Pkg-zsh-commits
mailing list