[Pkg-zsh-commits] [zsh] 06/06: Merge branch 'debian' of git://anonscm.debian.org/git/collab-maint/zsh into debian

[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 db1a2fa9ea251737395161eb0b29f9182623320b
Merge: f6320ae e2803a7
Author: Axel Beckert <abe at deuxchevaux.org>
Date:   Mon Aug 11 21:03:36 2014 +0200

    Merge branch 'debian' of git://anonscm.debian.org/git/collab-maint/zsh into debian
    
    Conflicts:
    	debian/changelog

 debian/changelog                    | 12 +++++++++++
 debian/rules                        |  4 +---
 debian/zsh-static.lintian-overrides |  2 ++
 debian/zsh.bug-script               | 40 +++++++++++++++++++++++++++----------
 debian/zsh.lintian-overrides        |  2 ++
 5 files changed, 47 insertions(+), 13 deletions(-)

diff --cc debian/changelog
index 4ea63fc,d90ffc0..c8c551f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,15 +1,27 @@@
 +zsh (5.0.5-dev-1-1) UNRELEASED; urgency=medium
 +
 +  * New upstream pre-release
 +    + TODO: Go through all fixed-upstream tagged bugs.
 +
 +  [ Axel Beckert ]
 +  * [73508e34] Remove all patches which were cherry-picked from upstream
 +  * [51b9ee37] Refresh patch replace-texi2html-with-makeinfo
 +  * [e47c9866] Add patch to fix source vs build directory mixup
 +
 + -- Axel Beckert <abe at debian.org>  Mon, 11 Aug 2014 20:22:29 +0200
 +
+ zsh (5.0.5-4) unstable; urgency=medium
+ 
+   * [5cebe890] Fix output file descriptor of bug script. reportbug
+     only captures output to fd 3 and ignores STDOUT.
+   * [11486424] Simplify helpfiles generation in debian/rules.
+     + nroff is no more called twice (Closes: #737582)
+     + There's no more need to replace any ISO Latin-1 character.
+     + debian/rules is now pure 7-bit ASCII again
+   * [d1d4dabe] Add lintian overrides for spelling error false positives.
+ 
+  -- Axel Beckert <abe at debian.org>  Sat, 28 Jun 2014 17:37:54 +0200
+ 
  zsh (5.0.5-3) unstable; urgency=medium
  
    [ Axel Beckert ]

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