Remove all patches which were cherry-picked from upstream

4 files changed, 0 insertions, 262 deletions

diff --git a/debian/patches/cherry-pick-60bedea3e712178beac392af1ca6ed7291630459-apt-mark-completion b/debian/patches/cherry-pick-60bedea3e712178beac392af1ca6ed7291630459-apt-mark-completion
deleted file mode 100644
index 8bcbe11cf..000000000
--- a/debian/patches/cherry-pick-60bedea3e712178beac392af1ca6ed7291630459-apt-mark-completion
+++ /dev/null
@@ -1,59 +0,0 @@
-commit 60bedea3e712178beac392af1ca6ed7291630459
-Author: Sebastian Ramacher <sebastian@ramacher.at>
-Date:   Sun Apr 6 18:04:39 2014 +0200
-
-    32533: add completion for "apt-mark"
-
-diff --git a/Completion/Debian/Command/_apt b/Completion/Debian/Command/_apt
-index 6f0bded..bf5343a 100644
---- a/Completion/Debian/Command/_apt
-+++ b/Completion/Debian/Command/_apt
-@@ -1,4 +1,4 @@
--#compdef apt apt-get apt-cache apt-cdrom apt-config
-+#compdef apt apt-get apt-cache apt-cdrom apt-config apt-mark
- 
- _apt () {
-   case "$service" in
-@@ -7,6 +7,7 @@ _apt () {
-     apt-cache) _apt-cache "$@";;
-     apt-cdrom) _apt-cdrom "$@";;
-     apt-config) _apt-config "$@";;
-+    apt-mark) _apt-mark "$@";;
-     *) _message "unknown command $service";;
-   esac
- }
-@@ -619,4 +620,34 @@ _apt_caching_policy () {
-      /var/lib/dpkg/available -nt "$1" ]]
- }
- 
-+_apt-mark () {
-+  _apt_arguments _apt-mark_sm \
-+    -h,--help:bool \
-+    -v,--version:bool \
-+    -f,--file:configfile \
-+    -c,--config-file:configfile \
-+    -o,--option:arbitem \
-+    -qq:bool \
-+    -s:bool \
-+    -- \
-+    /$'auto\0'/ /$'[^\0]#\0'/ ':packages::_deb_packages "$expl_packages[@]" installed' \# \| \
-+    /$'manual\0'/ /$'[^\0]#\0'/ ':packages::_deb_packages "$expl_packages[@]" installed' \# \| \
-+    /$'hold\0'/ /$'[^\0]#\0'/ ':packages::_deb_packages "$expl_packages[@]" installed' \# \| \
-+    /$'unhold\0'/ /$'[^\0]#\0'/ ':packages::_deb_packages "$expl_packages[@]" installed' \# \| \
-+    /$'showauto\0'/ /$'[^\0]#\0'/ ':packages::_deb_packages "$expl_packages[@]" installed' \# \| \
-+    /$'showmanual\0'/ /$'[^\0]#\0'/ ':packages::_deb_packages "$expl_packages[@]" installed' \# \| \
-+    /$'showhold\0'/ /$'[^\0]#\0'/ ':packages::_deb_packages "$expl_packages[@]" installed' \# \| \
-+    /"[]"/	':argument-1::compadd "$expl_action[@]" auto manual hold unhold showauto showmanual showhold'
-+
-+  _apt-mark () {
-+    local expl_action expl_packages
-+    _description actions expl_action 'action'
-+    _description packages expl_packages 'package'
-+
-+    _apt-mark_sm
-+  }
-+
-+  _apt-mark "$@"
-+}
-+
- _apt "$@"
diff --git a/debian/patches/cherry-pick-7f6dc0fe8e3c9aaec8aa295cc4459eabb8f2ada2-INC_APPEND_HISTORY_TIME b/debian/patches/cherry-pick-7f6dc0fe8e3c9aaec8aa295cc4459eabb8f2ada2-INC_APPEND_HISTORY_TIME
deleted file mode 100644
index 3a7185f01..000000000
--- a/debian/patches/cherry-pick-7f6dc0fe8e3c9aaec8aa295cc4459eabb8f2ada2-INC_APPEND_HISTORY_TIME
+++ /dev/null
@@ -1,141 +0,0 @@
-commit 7f6dc0fe8e3c9aaec8aa295cc4459eabb8f2ada2
-Author: Peter Stephenson <p.w.stephenson@ntlworld.com>
-Date:   Fri Jun 6 21:56:47 2014 +0100
-
-    32682 with tweaks: Add INC_APPEND_HISTORY_TIME.
-    Revert INC_APPEND_HISTORY behaviour.
-
-Index: zsh/Doc/Zsh/options.yo
-===================================================================
---- zsh.orig/Doc/Zsh/options.yo	2014-06-09 22:49:42.443674688 +0200
-+++ zsh/Doc/Zsh/options.yo	2014-06-09 22:49:42.439674738 +0200
-@@ -971,6 +971,23 @@
- number of lines grows 20% beyond the value specified by
- tt($SAVEHIST) (see also the HIST_SAVE_BY_COPY option).
- )
-+pindex(INC_APPEND_HISTORY_TIME)
-+pindex(NO_INC_APPEND_HISTORY_TIME)
-+pindex(INCAPPENDHISTORYTIME)
-+pindex(NOINCAPPENDHISTORYTIME)
-+cindex(history, incremental appending to a file with time)
-+item(tt(INC_APPEND_HISTORY_TIME))(
-+This option is a variant of tt(INC_APPEND_HISTORY) in which, where
-+possible, the history entry is written out to the file after the
-+command is finished, so that the time taken by the command is recorded
-+correctly in the history file in tt(EXTENDED_HISTORY) format.  This
-+means that the history entry will not be available immediately from
-+other instances of the shell that are using the same history file.
-+
-+This option is only useful if tt(INC_APPEND_HISTORY) and
-+tt(SHARE_HISTORY) are turned off.  The three options should be
-+considered mutually exclusive.
-+)
- pindex(SHARE_HISTORY)
- pindex(NO_SHARE_HISTORY)
- pindex(SHAREHISTORY)
-@@ -981,10 +998,10 @@
- 
- This option both imports new commands from the history file, and also
- causes your typed commands to be appended to the history file (the
--latter is like specifying tt(INC_APPEND_HISTORY)).
--The history lines are also output with timestamps ala
--tt(EXTENDED_HISTORY) (which makes it easier to find the spot where
--we left off reading the file after it gets re-written).
-+latter is like specifying tt(INC_APPEND_HISTORY), which should be turned
-+off if this option is in effect).  The history lines are also output
-+with timestamps ala tt(EXTENDED_HISTORY) (which makes it easier to find
-+the spot where we left off reading the file after it gets re-written).
- 
- By default, history movement commands visit the imported lines as
- well as the local lines, but you can toggle this on and off with the
-@@ -994,8 +1011,9 @@
- 
- If you find that you want more control over when commands
- get imported, you may wish to turn tt(SHARE_HISTORY) off,
--tt(INC_APPEND_HISTORY) on, and then manually import
--commands whenever you need them using `tt(fc -RI)'.
-+tt(INC_APPEND_HISTORY) or tt(INC_APPEND_HISTORY_TIME) (see above) on,
-+and then manually import commands whenever you need them using `tt(fc
-+-RI)'.
- )
- enditem()
- 
-Index: zsh/Src/hist.c
-===================================================================
---- zsh.orig/Src/hist.c	2014-06-09 22:49:42.443674688 +0200
-+++ zsh/Src/hist.c	2014-06-09 22:49:42.439674738 +0200
-@@ -935,9 +935,11 @@
- 
-     hf = getsparam("HISTFILE");
-     /*
--     * For INCAPPENDHISTORY, when interactive, save the history here
-+     * For INCAPPENDHISTORYTIME, when interactive, save the history here
-      * as it gives a better estimate of the times of commands.
-      *
-+     * If INCAPPENDHISTORY is also set we've already done it.
-+     *
-      * If SHAREHISTORY is also set continue to do so in the
-      * standard place, because that's safer about reading and
-      * rewriting history atomically.
-@@ -950,7 +952,8 @@
-      * so that (correctly) nothing happens here.  But it shows
-      * I thought about it.
-      */
--    if (isset(INCAPPENDHISTORY) && !isset(SHAREHISTORY) &&
-+    if (isset(INCAPPENDHISTORYTIME) && !isset(SHAREHISTORY) &&
-+	!isset(INCAPPENDHISTORY) &&
- 	!(histactive & HA_NOINC) && !strin && histsave_stack_pos == 0)
- 	savehistfile(hf, 0, HFILE_USE_OPTIONS | HFILE_FAST);
- }
-@@ -1378,7 +1381,8 @@
-      * For normal INCAPPENDHISTORY case and reasoning, see hbegin().
-      */
-     if (isset(SHAREHISTORY) ? histfileIsLocked() :
--	(isset(INCAPPENDHISTORY) && histsave_stack_pos != 0))
-+	(isset(INCAPPENDHISTORY) || (isset(INCAPPENDHISTORYTIME) &&
-+				     histsave_stack_pos != 0)))
- 	savehistfile(hf, 0, HFILE_USE_OPTIONS | HFILE_FAST);
-     unlockhistfile(hf); /* It's OK to call this even if we aren't locked */
-     /*
-@@ -2541,7 +2545,7 @@
-     }
-     if (writeflags & HFILE_USE_OPTIONS) {
- 	if (isset(APPENDHISTORY) || isset(INCAPPENDHISTORY)
--	 || isset(SHAREHISTORY))
-+	 || isset(INCAPPENDHISTORYTIME) || isset(SHAREHISTORY))
- 	    writeflags |= HFILE_APPEND | HFILE_SKIPOLD;
- 	else
- 	    histfile_linect = 0;
-@@ -2577,7 +2581,7 @@
- 		tmpfile = NULL;
- 		if (err) {
- 		    if (isset(APPENDHISTORY) || isset(INCAPPENDHISTORY)
--		     || isset(SHAREHISTORY))
-+		     || isset(INCAPPENDHISTORYTIME) || isset(SHAREHISTORY))
- 			zerr("rewriting %s would change its ownership -- skipped", fn);
- 		    else
- 			zerr("rewriting %s would change its ownership -- history not saved", fn);
-Index: zsh/Src/options.c
-===================================================================
---- zsh.orig/Src/options.c	2014-06-09 22:49:42.443674688 +0200
-+++ zsh/Src/options.c	2014-06-09 22:49:42.439674738 +0200
-@@ -165,6 +165,7 @@
- {{NULL, "ignoreclosebraces",  OPT_EMULATE},		 IGNORECLOSEBRACES},
- {{NULL, "ignoreeof",	      0},			 IGNOREEOF},
- {{NULL, "incappendhistory",   0},			 INCAPPENDHISTORY},
-+{{NULL, "incappendhistorytime",   0},			 INCAPPENDHISTORYTIME},
- {{NULL, "interactive",	      OPT_SPECIAL},		 INTERACTIVE},
- {{NULL, "interactivecomments",OPT_BOURNE},		 INTERACTIVECOMMENTS},
- {{NULL, "ksharrays",	      OPT_EMULATE|OPT_BOURNE},	 KSHARRAYS},
-Index: zsh/Src/zsh.h
-===================================================================
---- zsh.orig/Src/zsh.h	2014-06-09 22:49:42.443674688 +0200
-+++ zsh/Src/zsh.h	2014-06-09 22:49:42.439674738 +0200
-@@ -2092,6 +2092,7 @@
-     IGNORECLOSEBRACES,
-     IGNOREEOF,
-     INCAPPENDHISTORY,
-+    INCAPPENDHISTORYTIME,
-     INTERACTIVE,
-     INTERACTIVECOMMENTS,
-     KSHARRAYS,
diff --git a/debian/patches/cherry-pick-d397599cea5aa39492e5914c876a3991b8543445-apt-completion b/debian/patches/cherry-pick-d397599cea5aa39492e5914c876a3991b8543445-apt-completion
deleted file mode 100644
index e5001b6a1..000000000
--- a/debian/patches/cherry-pick-d397599cea5aa39492e5914c876a3991b8543445-apt-completion
+++ /dev/null
@@ -1,59 +0,0 @@
-commit d397599cea5aa39492e5914c876a3991b8543445
-Author: Alessandro Ghedini <alessandro@ghedini.me>
-Date:   Sun Apr 6 18:04:38 2014 +0200
-
-    32532: completion for "apt" command
-
-diff --git a/Completion/Debian/Command/_apt b/Completion/Debian/Command/_apt
-index b51b2fc..6f0bded 100644
---- a/Completion/Debian/Command/_apt
-+++ b/Completion/Debian/Command/_apt
-@@ -1,7 +1,8 @@
--#compdef apt-get apt-cache apt-cdrom apt-config
-+#compdef apt apt-get apt-cache apt-cdrom apt-config
- 
- _apt () {
-   case "$service" in
-+    apt) _apt-cmd "$@";;
-     apt-get) _apt-get "$@";;
-     apt-cache) _apt-cache "$@";;
-     apt-cdrom) _apt-cdrom "$@";;
-@@ -389,6 +390,38 @@ _apt_consume_long () {
-   return 0
- }
- 
-+_apt-cmd () {
-+  _apt_arguments _apt-cmd_sm \
-+    -h,--help:bool \
-+    -v,--version:bool \
-+    -c,--config-file:configfile \
-+    -o,--option:arbitem \
-+    -t,--target-release:release \
-+    -- \
-+    /$'list\0'/ \| \
-+    /$'search\0'/ /$'[^\0]#\0'/ ':strings:pattern:' \| \
-+    /$'show\0'/ /$'[^\0]#\0'/ ':packages::_deb_packages "$expl_packages[@]" avail' \# \
-+    /$'update\0'/ \| \
-+    \( \
-+    /$'install\0'/ /$'[^\0]#\0'/ ':packages::_deb_packages "$expl_packages[@]" avail' \# \
-+    /$'[^\0/]#/'/ /$'[^\0/]#\0'/ ':release name::_apt_releases' \) \| \
-+    /$'remove\0'/ /$'[^\0]#\0'/ ':packages::_deb_packages "$expl_packages[@]" installed' \# \| \
-+    /$'upgrade\0'/ \| \
-+    /$'full-upgrade\0'/ \| \
-+    /$'edit-sources\0'/ \| \
-+    /"[]"/	':argument-1::compadd "$expl_action[@]" list search show update install remove upgrade full-upgrade edit-sources'
-+
-+  _apt-cmd () {
-+    local expl_action expl_packages
-+    _description actions expl_action 'action'
-+    _description packages expl_packages 'package'
-+
-+    _apt-cmd_sm
-+  }
-+
-+  _apt-cmd "$@"
-+}
-+
- _apt-get () {
-   _apt_arguments _apt-get_sm \
-     -h,--help:bool \
diff --git a/debian/patches/series b/debian/patches/series
index c6f165561..8d7c83249 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1 @@
 replace-texi2html-with-makeinfo
-cherry-pick-d397599cea5aa39492e5914c876a3991b8543445-apt-completion
-cherry-pick-60bedea3e712178beac392af1ca6ed7291630459-apt-mark-completion
-cherry-pick-7f6dc0fe8e3c9aaec8aa295cc4459eabb8f2ada2-INC_APPEND_HISTORY_TIME