maintainer-notes: Use git dch --multimaint-merge on examples

No point in linking to the resolved bug, just use the git
buildpackage feature, which landed in time for squeeze.

Also fix a parsing, where the `v' prefix of the git tags was forgotten.
Remove protective parenthesis around id-length and use meta there not
full.

While at it s/stable/oldstable/ for git-core package.

Signed-off-by: maximilian attems <max@stro.at>
Reviewed-by: Michael Prokop <mika@debian.org>
This commit is contained in:
maximilian attems 2011-02-23 18:43:56 +01:00
parent 7ff2998ed9
commit e789cdd67b

View File

@ -74,7 +74,7 @@ or online at <a
<ol>
<li>Install required software (notice: git is named git-core on Debian/stable):
<li>Install required software (notice: git is named git-core on Debian/oldstable):
<pre>
<b># apt-get install git git-buildpackage dpkg-dev</b>
</pre>
@ -211,7 +211,7 @@ any stale remote branches locally by executing:
<li>Adjust debian/changelog accordingly:
<pre>
<b>% git dch --debian-branch=&quot;$(git branch | awk -F\*\&nbsp;&nbsp; '/^* / { print $2}' )&quot; \
--since=&quot;v$(dpkg-parsechangelog | awk '/^Version:/ {print $2}')&quot; -S --id-length=7 --meta</b>
--since=&quot;v$(dpkg-parsechangelog | awk '/^Version:/ {print $2}')&quot; -S --id-length=7 --meta --multimaint-merge</b>
</pre>
</li>
@ -233,7 +233,7 @@ any stale remote branches locally by executing:
<li>Adjust debian/changelog accordingly:
<pre>
<b>% git dch --debian-branch=&quot;$(git branch | awk -F\*\&nbsp;&nbsp; '/^* / { print $2}' )&quot; \
--since=&quot;$(dpkg-parsechangelog | awk '/^Version:/ {print $2}')&quot; -S --id-length=7 --meta</b>
--since=&quot;v$(dpkg-parsechangelog | awk '/^Version:/ {print $2}')&quot; -S --id-length=7 --meta --multimaint-merge</b>
</pre>
</li>
@ -287,12 +287,11 @@ of these lists.</li>
or more dynamically:
<pre>
<b>% git dch --meta --release --since v$(dpkg-parsechangelog | awk '/^Version:/ {print $2}') --debian-branch=&quot;$(git branch | awk -F\*\ '/^* / { print $2}' )&quot; [--id-length=7] [--full]</b>
<b>% git dch --meta --release --since v$(dpkg-parsechangelog | awk '/^Version:/ {print $2}') --debian-branch=&quot;$(git branch | awk -F\*\ '/^* / { print $2}' )&quot; --id-length=7 --meta --multimaint-merge</b>
</pre>
<b>NOTE:</b> we do not use history based sorting for the changelog entries but
sort them by author (doing that manually when reviewing the changelog, see <a
href="http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=586165">#586165</a>).
sort them by author.
</li>