summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTails developers <amnesia@boum.org>2013-11-30 15:22:34 +0000
committerTails developers <amnesia@boum.org>2013-11-30 15:22:34 +0000
commite35d8ed8bd240251b49781fbcaf7cf1312c24346 (patch)
tree9de63e52aaae81fe1dfc80d04529fe2b6449eb65
parent4cb19c4705251a381aee87203862adc27ef7c6ea (diff)
Various release process doc improvements.
-rw-r--r--wiki/src/contribute/APT_repository.mdwn4
-rw-r--r--wiki/src/contribute/release_process/liveusb-creator.mdwn11
-rw-r--r--wiki/src/contribute/release_process/persistence-setup.mdwn4
3 files changed, 9 insertions, 10 deletions
diff --git a/wiki/src/contribute/APT_repository.mdwn b/wiki/src/contribute/APT_repository.mdwn
index 155f8c5..6b0dcff 100644
--- a/wiki/src/contribute/APT_repository.mdwn
+++ b/wiki/src/contribute/APT_repository.mdwn
@@ -226,8 +226,8 @@ Freezing devel into testing
---------------------------
1. Merge `devel` branch into `testing` in Git
-2. (Manually) hard reset `testing` suite to the current state of the
- `devel` one: [[APT_repository#workflow-reset]].
+2. (Manually) [[hard reset|APT_repository#workflow-reset]] `testing`
+ suite to the current state of the `devel` one.
<a id="workflow-post-tag"></a>
diff --git a/wiki/src/contribute/release_process/liveusb-creator.mdwn b/wiki/src/contribute/release_process/liveusb-creator.mdwn
index d96c855..2b8bc0b 100644
--- a/wiki/src/contribute/release_process/liveusb-creator.mdwn
+++ b/wiki/src/contribute/release_process/liveusb-creator.mdwn
@@ -41,7 +41,7 @@ Merge upstream changes:
Update `debian/changelog`:
- git-dch
+ git-dch && dch -e
(Do not forget to set the appropriate release.)
@@ -58,13 +58,10 @@ then manually download the corresponding tarball (which can be found
in our Debian repo unless upstream just had a new release) and place
it in `..`, and then re-run the command with `--git-no-pristine-tar`.
-Add a signed tag to the Git repository:
+Add a signed tag to the Git repository and push the changes:
- git-buildpackage --git-tag-only --git-sign-tags
-
-Push the changes:
-
- git push && git push --tags
+ git-buildpackage --git-tag-only --git-sign-tags && \
+ git push && git push --tags
(Make sure both `master` and `debian` are pushed.)
diff --git a/wiki/src/contribute/release_process/persistence-setup.mdwn b/wiki/src/contribute/release_process/persistence-setup.mdwn
index 4df2c15..5c1e105 100644
--- a/wiki/src/contribute/release_process/persistence-setup.mdwn
+++ b/wiki/src/contribute/release_process/persistence-setup.mdwn
@@ -86,7 +86,9 @@ Commit `debian/changelog`:
git commit debian/changelog -m "$(head -n 1 debian/changelog | sed -e 's,).*,),')"
-Build a Debian package (use a Squeeze/i386 + backports chroot):
+Build a Debian package (use a Squeeze/i386 + backports chroot, that
+has either tails-perl5lib installed, or the Tails APT repository
+configured):
git-buildpackage