mirror of
https://salsa.debian.org/kernel-team/initramfs-tools.git
synced 2026-01-27 01:44:25 +00:00
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:
parent
7ff2998ed9
commit
e789cdd67b
@ -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="$(git branch | awk -F\*\ '/^* / { print $2}' )" \
|
||||
--since="v$(dpkg-parsechangelog | awk '/^Version:/ {print $2}')" -S --id-length=7 --meta</b>
|
||||
--since="v$(dpkg-parsechangelog | awk '/^Version:/ {print $2}')" -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="$(git branch | awk -F\*\ '/^* / { print $2}' )" \
|
||||
--since="$(dpkg-parsechangelog | awk '/^Version:/ {print $2}')" -S --id-length=7 --meta</b>
|
||||
--since="v$(dpkg-parsechangelog | awk '/^Version:/ {print $2}')" -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="$(git branch | awk -F\*\ '/^* / { print $2}' )" [--id-length=7] [--full]</b>
|
||||
<b>% git dch --meta --release --since v$(dpkg-parsechangelog | awk '/^Version:/ {print $2}') --debian-branch="$(git branch | awk -F\*\ '/^* / { print $2}' )" --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>
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user