[Pkg-zsh-commits] [zsh] 05/26: Workflow: Move .pc handling to Setup

[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 639697b81dd715018419f24c1c70a93722acee54
Author: Axel Beckert <abe at deuxchevaux.org>
Date:   Wed Oct 8 21:04:07 2014 +0200

    Workflow: Move .pc handling to Setup
---
 debian/pkg-zsh-workflow.md | 41 ++++++++++++++++++++---------------------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/debian/pkg-zsh-workflow.md b/debian/pkg-zsh-workflow.md
index 2de4ad1..03c0153 100644
--- a/debian/pkg-zsh-workflow.md
+++ b/debian/pkg-zsh-workflow.md
@@ -93,27 +93,6 @@ if so, the patch in question must be dropped before merging a new
 upstream release into the 'debian' branch.
 
 
-#### Dealing with quilt's .pc directory
-
-When quilt works, it keeps track of what it does in a directory by the
-name `.pc`. This directory will show up in the output of `git status`
-etc. It should *never* *ever* by committed to the git repository at
-any point.
-
-We cannot add the directory to `.gitignore` because we would change
-the zsh source directly instead of via `debian/patches`.
-
-To deal with the directory, there is another git-facility, that we can
-use for fun and profit.
-
-    % echo .pc/ >> .git/info/exclude
-
-Now git will ignore quilt's directory for this repository.
-Unfortunately, this has to be done for each checkout. Luckily, this
-only has an impact for people who want to work on 'pkg-zsh'. Everyone
-else can savely ignore the directory.
-
-
 #### Example of adding a fix via a quilt patch
 
 Let's say, there is an issue '#12345' which can be fixed by patching
@@ -458,3 +437,23 @@ To get updates back into origin/upstream, do this:
 (*) This step should *always* result in a fast-forward merge. If it
 does not, something went terribly wrong. Investigate and fix the
 situation *before* pushing to origin.
+
+### Dealing with quilt's .pc directory
+
+When quilt works, it keeps track of what it does in a directory by the
+name `.pc`. This directory will show up in the output of `git status`
+etc. It should *never* *ever* by committed to the git repository at
+any point.
+
+We cannot add the directory to `.gitignore` because we would change
+the zsh source directly instead of via `debian/patches`.
+
+To deal with the directory, there is another git-facility, that we can
+use for fun and profit.
+
+    % echo .pc/ >> .git/info/exclude
+
+Now git will ignore quilt's directory for this repository.
+Unfortunately, this has to be done for each checkout. Luckily, this
+only has an impact for people who want to work on 'pkg-zsh'. Everyone
+else can savely ignore the directory.

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