[Pkg-zsh-commits] [SCM] Debian zsh package branch, debian, updated. debian/5.0.0-1-5-g1c75bcc

[Axel Beckert]

The following commit has been merged in the debian branch:
commit fa8ea69e292ecbeeab180635f0cd0a787c9f3ef3
Author: Axel Beckert <abe at deuxchevaux.org>
Date:   Wed Aug 8 19:25:49 2012 +0200

    Fix documentation about debian/do-dch
    
    Also accept previously documented tag in do-dch

diff --git a/debian/do-dch b/debian/do-dch
index cf3a89a..52ddca2 100755
--- a/debian/do-dch
+++ b/debian/do-dch
@@ -24,7 +24,7 @@ cl="debian/changelog"
 
 rm -f "$old"
 cp "$cl" "$old"
-sed -e '/^  \* \[[a-f0-9]*\] \[dch-ignore\] /d' < "$old" > "$cl"
+sed -e '/^  \* \[[a-f0-9]*\] \[dch-ignored?\] /d' < "$old" > "$cl"
 rm -f "$old"
 
 ${VISUAL:-${EDITOR:-vi}} "$cl"
diff --git a/debian/pkg-zsh-workflow.org b/debian/pkg-zsh-workflow.org
index 8d9389e..57a651d 100644
--- a/debian/pkg-zsh-workflow.org
+++ b/debian/pkg-zsh-workflow.org
@@ -254,7 +254,7 @@
     "[dch-ignore] ", so those commits can be weeded out easily.
 
     There is a helper script "debian/do-dch" which takes care of all
-    formatting options as well as the "[dch-ignored] " weeding. The
+    formatting options as well as the "[dch-ignore] " weeding. The
     script should be used unless there is a good reason not to.
 
 

-- 
Debian zsh package