summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAxel Beckert <abe@deuxchevaux.org>2014-10-09 00:18:41 +0200
committerAxel Beckert <abe@deuxchevaux.org>2014-10-09 00:20:37 +0200
commit67a6efe2473541633b790036364ef6716fcd4fa6 (patch)
tree92e0c3e17a0e01e62ec78267bf6bcc0b6b109ab8
parent501247bf99b183996641fefd73b894d47f9d6978 (diff)
downloadzsh-67a6efe2473541633b790036364ef6716fcd4fa6.tar.gz
zsh-67a6efe2473541633b790036364ef6716fcd4fa6.zip
Workflow: Don't even mention ancient at2quilt tool in changelog examples
Git-Dch: Ignore
-rw-r--r--debian/pkg-zsh-workflow.md10
1 files changed, 5 insertions, 5 deletions
diff --git a/debian/pkg-zsh-workflow.md b/debian/pkg-zsh-workflow.md
index a7eac77ff..7d9daa6ea 100644
--- a/debian/pkg-zsh-workflow.md
+++ b/debian/pkg-zsh-workflow.md
@@ -242,7 +242,7 @@ linear history again.
Basically, you after merging the upstream release tag into the debian
branch, you'll be left with an history that looks something like this:
- * at2quilt: Updating autotools patches
+ * Updating autotools patches
M Merge commit 'zsh-4.3.13' into debian
|'* unposted: released 4.3.13
| * …
@@ -257,10 +257,10 @@ branch, you'll be left with an history that looks something like this:
|'* unposted: released 4.3.12
… older history
-And what you really want added to debian/changelog is the "atquilt:
-Updating autotools patches" and the "Removing upstream patches due to
-new release" commits. You need to figure out the sha1 sums of the
-commits and then call this:
+And what you really want added to debian/changelog is the "Updating
+autotools patches" and the "Removing upstream patches due to new
+release" commits. You need to figure out the sha1 sums of the commits
+and then call this:
% debian/bin/urcl -p=zsh -v=4.3.13-1 b495ba1e f575f568