[Pkg-zsh-commits] [zsh] 02/02: Update changelog for new beta release, remove patches applied upstream

[Axel Beckert]

This is an automated email from the git hooks/post-receive script.

abe pushed a commit to branch debian
in repository zsh.

commit 94efa9da5c2be3b5f6be587839b695c3c5efa796
Author: Axel Beckert <abe at deuxchevaux.org>
Date:   Sun Jan 24 17:26:12 2016 +0100

    Update changelog for new beta release, remove patches applied upstream
---
 debian/changelog                                   | 15 +++++++++++++++
 .../fix-aptitude-completion-for-0.7.5-807906.patch | 18 ------------------
 debian/patches/series                              |  2 --
 debian/patches/update-apt-completion-808317.patch  | 22 ----------------------
 4 files changed, 15 insertions(+), 42 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5813292..fff272b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+zsh (5.2-dev-1-1) UNRELEASED; urgency=low
+
+  [ Axel Beckert ]
+  * [86ca06fb] Import new upstream beta release.
+  * [a25e7f1f] Add "--ddeb-migration=zsh-dbg" to "dh_strip -pzsh" for
+    proper Breaks/Replaces. Thanks to Mattia Rizzolo!
+  * [370659ae] Add rosbash to bug-script's fallback list of packages with
+    code to be sourced in .zshrc.
+
+  [ Frank Terbeck ]
+  * [c1e9ec06] zshrc: Make expansion robust with NO_UNSET.
+    Thanks to Marc Chantreux on #pkg-zsh (freenode)
+
+ -- Axel Beckert <abe at debian.org>  Sun, 24 Jan 2016 17:21:44 +0100
+
 zsh (5.2-3) unstable; urgency=medium
 
   [ Axel Beckert ]
diff --git a/debian/patches/fix-aptitude-completion-for-0.7.5-807906.patch b/debian/patches/fix-aptitude-completion-for-0.7.5-807906.patch
deleted file mode 100644
index 6fcdd1e..0000000
--- a/debian/patches/fix-aptitude-completion-for-0.7.5-807906.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Also parse --help output of aptitude 0.7.5 and later
-Author: Axel Beckert <abe at debian.org>
-Bug-Debian: https://bugs.debian.org/807906
-Forwarded: http://www.zsh.org/mla/workers/2015/msg03350.html
-
-Index: zsh/Completion/Debian/Command/_aptitude
-===================================================================
---- zsh.orig/Completion/Debian/Command/_aptitude	2015-09-08 23:39:06.026975805 +0200
-+++ zsh/Completion/Debian/Command/_aptitude	2015-12-26 19:26:14.681265798 +0100
-@@ -80,7 +80,7 @@
- 
- case $state in
-   cmds)
--    cmds=( ${${(M)${(f)"$(LC_ALL=C _call_program commands aptitude -h 2>/dev/null)"}:#* - *}/(#b) (*[^ ]) #- (*)/$match[1]:$match[2]:l})
-+    cmds=( ${${(M)${(f)"$(LC_ALL=C _call_program commands aptitude -h 2>/dev/null)"}:# [^- ][^ ]## *}/(#b) ([^ ]##) ##(- )#([^- ]*)/$match[1]:$match[3]:l})
- 
-     _describe -t commands 'aptitude command' cmds && ret=0
-   ;;
diff --git a/debian/patches/series b/debian/patches/series
index 7fa5170..857f0f2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
 further-mitigate-test-suite-hangs.patch
-update-apt-completion-808317.patch
-fix-aptitude-completion-for-0.7.5-807906.patch
diff --git a/debian/patches/update-apt-completion-808317.patch b/debian/patches/update-apt-completion-808317.patch
deleted file mode 100644
index a743a0c..0000000
--- a/debian/patches/update-apt-completion-808317.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Description: Add missing apt purge and autoremove subcommands
-Author: Felipe Sateler <fsateler at debian.org>
-Bug-Debian: https://bugs.debian.org/808317
-Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=808317;att=1;filename=_apt.diff;msg=5
-Forwarded: http://www.zsh.org/mla/workers/2015/msg03348.html
-
---- a/Completion/Debian/Command/_apt	2015-12-03 20:44:53.000000000 -0300
-+++ b/Completion/Debian/Command/_apt	2015-12-18 12:36:49.326848831 -0300
-@@ -407,10 +407,12 @@
-     /$'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' \# \| \
-+    /$'purge\0'/ /$'[^\0]#\0'/ ':packages::_deb_packages "$expl_packages[@]" installed' \# \| \
-     /$'upgrade\0'/ \| \
-+    /$'autoremove\0'/ \| \
-     /$'full-upgrade\0'/ \| \
-     /$'edit-sources\0'/ \| \
--    /"[]"/	':argument-1::compadd "$expl_action[@]" list search show update install remove upgrade full-upgrade edit-sources'
-+    /"[]"/	':argument-1::compadd "$expl_action[@]" list search show update install remove upgrade full-upgrade edit-sources autoremove purge'
- 
-   _apt-cmd () {
-     local expl_action expl_packages

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/zsh.git