[Pkg-zsh-commits] [zsh] 01/05: Merge debian-stretch and debian (experimental) branch again

[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 6783a1730fed9dfb044194f96aed9618b7d76f25
Merge: 43f9d6e b2e45bd
Author: Axel Beckert <abe at deuxchevaux.org>
Date:   Sun Dec 4 03:21:52 2016 +0100

    Merge debian-stretch and debian (experimental) branch again

 debian/changelog                    | 35 +++++++++++++++++++++++++++++++++++
 debian/control                      |  4 ++--
 debian/zsh-common.lintian-overrides |  2 +-
 debian/zsh-common.menu              |  2 +-
 debian/zsh.postrm                   |  5 +++++
 5 files changed, 44 insertions(+), 4 deletions(-)

diff --cc debian/changelog
index b346eff,73aef2e..47ef383
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,28 -1,38 +1,63 @@@
+ zsh (5.2-5) unstable; urgency=low
+ 
+   * [f368b96e] Also remove hardcoded /usr/bin/zsh symlink in postrm
+     again. (Closes: #823730)
+ 
+  -- Axel Beckert <abe at 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 at 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 at debian.org>  Mon, 01 Feb 2016 00:42:02 +0100
 +
  zsh (5.2-3) unstable; urgency=medium
  
    [ Axel Beckert ]
diff --cc debian/control
index 3b16b26,bd2b2a1..b447166
--- a/debian/control
+++ b/debian/control
@@@ -23,9 -23,9 +23,9 @@@ Uploaders: Michael Prokop <mika at debian.
             Axel Beckert <abe at debian.org>,
             Frank Terbeck <ft at bewatermyfriend.org>,
             Richard Hartmann <richih at 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-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

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