diff options
| -rwxr-xr-x | debian/do-dch | 4 | ||||
| -rw-r--r-- | debian/gbp.conf | 3 | ||||
| -rw-r--r-- | debian/pkg-zsh-workflow.org | 6 |
3 files changed, 5 insertions, 8 deletions
diff --git a/debian/do-dch b/debian/do-dch index 52ddca295..f07b9bd41 100755 --- a/debian/do-dch +++ b/debian/do-dch @@ -12,10 +12,6 @@ # At the end an editor is spawned on debian/changelog no matter what. git-dch \ - --debian-branch=debian \ - --id-length=8 \ - --multimaint-merge \ - --upstream-tag='zsh-%(version)' \ --spawn-editor=never \ "$@" diff --git a/debian/gbp.conf b/debian/gbp.conf index 8c381dbf3..bc1dd705e 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -8,5 +8,6 @@ debian-tag = debian/%(version)s # Options only affecting git-dch [git-dch] -id-length = 7 +id-length = 8 meta = True +multimaint-merge = True diff --git a/debian/pkg-zsh-workflow.org b/debian/pkg-zsh-workflow.org index 57a651dd5..64b5447f7 100644 --- a/debian/pkg-zsh-workflow.org +++ b/debian/pkg-zsh-workflow.org @@ -242,11 +242,11 @@ each author should only appear once in the series with all her/his changes listed below her/him in chronological order. - Here is a command line which will result in the desired changelog - format: + Given that debian/gbp.conf is up-to-date, using the git-dch(1) + tool will result in the desired changelog format: #+BEGIN_EXAMPLE - % git-dch --debian-branch=debian --id-length=8 --multimaint-merge + % git-dch #+END_EXAMPLE If you absolutely *must* make changelog entries by other means, you |