7 files changed, 46 insertions, 44 deletions
diff --git a/debian/changelog b/debian/changelog
index 73aef2ed7..47ef383d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -33,6 +33,31 @@ zsh (5.2-4) unstable; urgency=low
 
  -- Axel Beckert <abe@debian.org>  Fri, 06 May 2016 22:08:29 +0200
 
+zsh (5.2-dev-1-1) experimental; 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.
+  * [9789916e] Remove GCC-4.9-specific workaround on s390x from
+    debian/rules.
+  * [0013070a,3b7e91b3] Enable hardening=+all, fixes multiple
+    hardening-related lintian warnings.
+  * [da1b680b,1600c44d,2d082be2] Remove usage of alternatives system for
+    zsh, rzsh and zsh-static. (Closes: #768079)
+  * [3aa2ccff] Switch Vcs-Git from git:// to https://, fixes lintian
+    warning vcs-field-uses-insecure-uri.
+  * [f3384aaf] Add patch by Bart Schaefer to fix segfault in
+    is_cond_binary_op when compiling with -fPIE (and maybe other cases).
+
+  [ Frank Terbeck ]
+  * [c1e9ec06] zshrc: Make expansion robust with NO_UNSET.
+    Thanks to Marc Chantreux on #pkg-zsh (freenode)
+
+ -- Axel Beckert <abe@debian.org>  Mon, 01 Feb 2016 00:42:02 +0100
+
 zsh (5.2-3) unstable; urgency=medium
 
   [ Axel Beckert ]
diff --git a/debian/control b/debian/control
index bd2b2a1aa..b447166fe 100644
--- a/debian/control
+++ b/debian/control
@@ -25,7 +25,7 @@ Uploaders: Michael Prokop <mika@debian.org>,
            Richard Hartmann <richih@debian.org>
 Standards-Version: 3.9.8
 Homepage: http://www.zsh.org/
-Vcs-Git: https://anonscm.debian.org/git/collab-maint/zsh.git -b debian-stretch
+Vcs-Git: https://anonscm.debian.org/git/collab-maint/zsh.git -b debian
 Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/zsh.git
 
 Package: zsh-common
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 505de96f8..5d7f7dd66 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -2,7 +2,7 @@
 
 [DEFAULT]
 upstream-branch = upstream
-debian-branch = debian-stretch
+debian-branch = debian
 upstream-tag = zsh-%(version)s
 debian-tag = debian/%(version)s
 
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 6fcdd1edb..000000000
--- 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@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/fix-segfault-in-is_cond_binary_op.patch b/debian/patches/fix-segfault-in-is_cond_binary_op.patch
new file mode 100644
index 000000000..f03362f5f
--- /dev/null
+++ b/debian/patches/fix-segfault-in-is_cond_binary_op.patch
@@ -0,0 +1,18 @@
+Description: Fix segfault in is_cond_binary_op when compiling with -fPIE
+ The issue possibly also pops up under other circumstances.
+Author: Bart Schaefer <schaefer@brasslantern.com>
+Origin: http://www.zsh.org/mla/workers/2016/msg00394.html
+
+Index: zsh/Src/text.c
+===================================================================
+--- zsh.orig/Src/text.c	2016-01-24 17:19:53.947656591 +0100
++++ zsh/Src/text.c	2016-02-01 00:15:09.098327625 +0100
+@@ -47,7 +47,7 @@
+  */
+ static const char *cond_binary_ops[] = {
+     "=", "!=", "<", ">", "-nt", "-ot", "-ef", "-eq",
+-    "-ne", "-lt", "-gt", "-le", "-ge", "=~"
++    "-ne", "-lt", "-gt", "-le", "-ge", "=~", NULL
+ };
+ 
+ static char *tptr, *tbuf, *tlim, *tpending;
diff --git a/debian/patches/series b/debian/patches/series
index 7fa517010..d0f0c477b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 further-mitigate-test-suite-hangs.patch
-update-apt-completion-808317.patch
-fix-aptitude-completion-for-0.7.5-807906.patch
+fix-segfault-in-is_cond_binary_op.patch
diff --git a/debian/patches/update-apt-completion-808317.patch b/debian/patches/update-apt-completion-808317.patch
deleted file mode 100644
index a743a0c70..000000000
--- 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@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