[Pkg-zsh-commits] [zsh-syntax-highlighting] 01/07: d/changelog: Update master to 0.6.0.

[Daniel Shahaf]

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

danielsh-guest pushed a commit to branch debian/master
in repository zsh-syntax-highlighting.

commit 848f1be101bcce1e32597df54c2a006c01d5bfed
Author: Daniel Shahaf <d.s at daniel.shahaf.name>
Date:   Mon Jul 31 19:34:07 2017 +0000

    d/changelog: Update master to 0.6.0.
    
    Note that with this push, the debian/master ref makes a non-fast-forward
    jump.  This is to correct an error in the value of that ref in the time
    between the 0.5.0 and 0.6.0 releases.
    
    For a while, the debian/master branch was building on top of the
    upstream/0.5.x branch:
    
        % git log --decorate --graph --oneline --abbrev=12
        * f09caa68054f (pkg-debian-upstream/debian/master, debian/0.5.x) Bump Standards-Version to 4.0.0.
        * 3d366c75584a d/changelog: Note that the next release will fix #842994.
        * e0c553d6c6e3 Post-release version number bump.
        * f5197b618ef2 (tag: debian/0.5.0-1) Finalize changelog.
        * 491584d1f9b0 Bump Standards-Version to 3.9.8.
        * e5001bcd240d d/rules: Add _origtar target.
        *   14302e2d937f Update for upstream release 0.5.0
        |\
        | * f25bd83848bd Refresh patches.
        | *   6bf6f90fdfb0 Merge tag '0.5.0' into debian/master
        | |\
        ⋮ ⋮ ⋮
        | * 7338c54a252d Post-release version number bump.
        * | 08723b409e60 (HEAD -> debian/master) changelog: Disambiguate version number in git HEAD
    
    That was wrong, the debian/master branch should have been based on to
    top of the upstream/master branch.  That error is corrected as follows:
    
    1. A branch 'debian/0.5.x' has been created that points to those commit
    objects (f09caa68054f and its ancestors).
    
    2. The branch 'debian/master' was re-pointed to 08723b409e60, thereby
    making that commit, retroactively, the branching point of debian/0.5.x.
    
    3. The non-0.5.x-specific changes to the debian/ tree will be cherry
    picked from debian/0.5.x to this branch in the next few commits.  (This
    is equivalent to doing a merge of only the debian/ dir in certain other
    version control systems.)
    
    If you had code that built on top of the debian/master branch before its
    repointing, you should rebase your branches with a command such as
    
        git checkout your_branch
        git rebase --onto=debian/master debian/0.5.x
        git push $remote +your_branch                # forced push
    
    Apologies for the inconvenience.
---
 debian/changelog | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0da9375..36f3ed9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,8 @@
-zsh-syntax-highlighting (0.5.0-1~git) UNRELEASED; urgency=medium
+zsh-syntax-highlighting (0.6.0-1~git) UNRELEASED; urgency=medium
 
   * New upstream release.
-  * Packaging changes:
-    - Bump Standards-Version to 3.9.7 (no changes needed).
-    - d/control: Use secure protocol (https) for Vcs-Git.
 
- -- Daniel Shahaf <danielsh at apache.org>  Sat, 06 Feb 2016 11:07:08 +0000
+ -- Daniel Shahaf <danielsh at apache.org>  Mon, 31 Jul 2017 19:33:59 +0000
 
 zsh-syntax-highlighting (0.4.1-1) unstable; urgency=medium
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-zsh/zsh-syntax-highlighting.git