Merge debian-stretch and debian (experimental) branch again

5 files changed, 44 insertions, 4 deletions

diff --git a/debian/changelog b/debian/changelog
index b346effa9..47ef383d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,38 @@
+zsh (5.2-5) unstable; urgency=low
+
+  * [f368b96e] Also remove hardcoded /usr/bin/zsh symlink in postrm
+    again. (Closes: #823730)
+
+ -- Axel Beckert <abe@debian.org>  Sun, 08 May 2016 18:25:58 +0200
+
+zsh (5.2-4) unstable; urgency=low
+
+  [ Axel Beckert ]
+  * [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.
+  * [1922c900] Remove GCC-4.9-specific workaround on s390x from
+    debian/rules.
+  * [64eed86b] Enable hardening=+all, fixes multiple hardening-no-*
+    lintian warnings.
+  * [cafce990] Remove usage of alternatives system for zsh, rzsh and
+    zsh-static.  (Closes: #768079)
+  * [7db7f765] Switch Vcs-Git from git:// to https://, fixes lintian
+    warning vcs-field-uses-insecure-uri.
+  * [826ec19e] Declare compliance with Debian Policy 3.9.8. (No other
+    changes were required.)
+  * [a2021b04] Use "debian-stretch" as debian branch until a new upstream
+    release is out.
+  * [f9dba1a3] Update yodl build-dependency to exclude the broken 3.08.00
+    upstream release. (See #823043 for details.)
+
+  [ Frank Terbeck ]
+  * [c1e9ec06] zshrc: Make expansion robust with NO_UNSET.
+    Thanks to Marc Chantreux on #pkg-zsh (freenode)
+
+ -- Axel Beckert <abe@debian.org>  Fri, 06 May 2016 22:08:29 +0200
+
 zsh (5.2-dev-1-1) experimental; urgency=low
 
   [ Axel Beckert ]
diff --git a/debian/control b/debian/control
index 3b16b263e..b447166fe 100644
--- a/debian/control
+++ b/debian/control
@@ -17,13 +17,13 @@ Build-Depends: autotools-dev,
                texlive-fonts-recommended,
                texlive-latex-base,
                texlive-latex-recommended,
-               yodl
+               yodl (>= 3.08.01) | yodl (<< 3.08.00)
 Maintainer: Debian Zsh Maintainers <pkg-zsh-devel@lists.alioth.debian.org>
 Uploaders: Michael Prokop <mika@debian.org>,
            Axel Beckert <abe@debian.org>,
            Frank Terbeck <ft@bewatermyfriend.org>,
            Richard Hartmann <richih@debian.org>
-Standards-Version: 3.9.6
+Standards-Version: 3.9.8
 Homepage: http://www.zsh.org/
 Vcs-Git: https://anonscm.debian.org/git/collab-maint/zsh.git -b debian
 Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/zsh.git
diff --git a/debian/zsh-common.lintian-overrides b/debian/zsh-common.lintian-overrides
index 9f0d39c6b..29ec13968 100644
--- a/debian/zsh-common.lintian-overrides
+++ b/debian/zsh-common.lintian-overrides
@@ -1,4 +1,4 @@
-zsh-common: menu-command-not-in-package usr/share/menu/zsh-common:1 bin/zsh5
+zsh-common: menu-command-not-in-package usr/share/menu/zsh-common:1 bin/zsh
 zsh-common: pkg-not-in-package-test zsh usr/share/menu/zsh-common
 # Clearly a false positive:
 zsh-common: extra-license-file usr/share/zsh/functions/Completion/BSD.zwc
diff --git a/debian/zsh-common.menu b/debian/zsh-common.menu
index a7cbd2d64..485997e72 100644
--- a/debian/zsh-common.menu
+++ b/debian/zsh-common.menu
@@ -1 +1 @@
-?package(zsh):needs="text" section="Applications/Shells"  title="Zsh" command="/bin/zsh5"
+?package(zsh):needs="text" section="Applications/Shells"  title="Zsh" command="/bin/zsh"
diff --git a/debian/zsh.postrm b/debian/zsh.postrm
index a8921f6d6..82649c6ee 100644
--- a/debian/zsh.postrm
+++ b/debian/zsh.postrm
@@ -9,4 +9,9 @@ case "$1" in
 	;;
 esac
 
+# Remove hardcoded symlink again
+if [ -L /usr/bin/zsh ]; then
+  rm -f /usr/bin/zsh
+fi
+
 #DEBHELPER#