[Pkg-zsh-commits] [zsh] 13/26: Workflow: Use "Transitioning to a new upstream version" from Axel's pkg-zsh-doc repo

[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 26e20bb9c495df23ff9c5ac95c7fe4586b215d2d
Author: Axel Beckert <abe at deuxchevaux.org>
Date:   Wed Oct 8 22:05:59 2014 +0200

    Workflow: Use "Transitioning to a new upstream version" from Axel's pkg-zsh-doc repo
    
    Based upon https://github.com/xtaran/pkg-zsh-doc/blob/master/pkg-zsh-git.org
---
 debian/pkg-zsh-workflow.md | 43 +++++++++++++++++++++++++++++--------------
 1 file changed, 29 insertions(+), 14 deletions(-)

diff --git a/debian/pkg-zsh-workflow.md b/debian/pkg-zsh-workflow.md
index 5aebf1e..3b1252e 100644
--- a/debian/pkg-zsh-workflow.md
+++ b/debian/pkg-zsh-workflow.md
@@ -223,28 +223,43 @@ Transitioning to a new upstream version
 
 When upstream releases a new version, we should follow these steps:
 
+### Merging new upstream tag (`zsh-$version`) into our upstream branch
 
-### Removing non deb_* quilt patches
+    % git checkout upstream
+    % git pull origin
+    % git fetch zsh
+    % git merge zsh-$version
+
+If that doesn't do a fast-forward merge, a fast-forward merge can be
+enforced as follows:
+
+    % git checkout upstream
+    % git reset --hard zsh-$version
+
+### Create the fake orig tar ball (until we can work with upstream's tarball)
 
-All non deb_* patches should be removed from 'debian/patches'
-directory, unless they fix an issue that was *not* addressed upstream
-and is therefore missing from upstream's code base.
+    % git archive --format=tar --output=../zsh_$version.orig.tar \
+          --prefix=zsh-$version/ zsh-$version
+    % bzip2 -9v ../zsh_$version.orig.tar
 
-If such a change should prove to be required to be kept with the
-package permanently (e.g. because upstream refuses to apply the
-patch), the patch should eventually be renamed to match the `deb_*`
-nameing convention.
+### Remove all quilt patches which are applied upstream
 
+All patches applied should be removed from `debian/patches` directory,
+unless they fix an issue that was *not* addressed upstream and is
+therefore missing from upstream's code base.
 
-### Merging 'upstream' into 'debian'
+### Merging the branch upstream into the branch debian
 
-After the 'debian/patches' directory was cleaned up in the
-previous step, merging 'upstream' into 'debian' should generally
-lead to a working package again.
+After the `debian/patches` directory was cleaned up in the previous
+step, merging `upstream` into `debian` should generally lead to a
+working package again.
 
-If old patches were still around, that could lead to conflicts when
-those would be applied during the build process.
+If old patches were still around, that could lead to conflicts
+when those would be applied during the build process.
 
+The message for the merge commit should be set to "New upstream
+release" to allow `git-dch' to pick it up correctly later. **TODO**:
+Doesn't really work.
 
 ### Insert initial changelog for the new upstream release
 

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