summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2016-05-18 17:03:19 +0000
committerintrigeri <intrigeri@boum.org>2016-05-18 17:07:47 +0000
commit80fbe06a620429652d491afb17d0bc0cfc9d47a2 (patch)
treea04e1a132714f406df103817e538d8af77e04652
parent7f3f0d7de160a068021164ff66e22af772211e88 (diff)
Adjust release process to match the fact that we're now working on feature/stretch.
-rw-r--r--wiki/src/contribute/release_process.mdwn8
1 files changed, 4 insertions, 4 deletions
diff --git a/wiki/src/contribute/release_process.mdwn b/wiki/src/contribute/release_process.mdwn
index 79d04b5..f8913ac 100644
--- a/wiki/src/contribute/release_process.mdwn
+++ b/wiki/src/contribute/release_process.mdwn
@@ -246,17 +246,17 @@ Update other base branches
1. Merge the release branch into `devel` following the instructions for
[[merging base branches|APT_repository/custom#workflow-merge-main-branch]].
-2. Merge `devel` into `feature/jessie` following the instructions for
+2. Merge `devel` into `feature/stretch` following the instructions for
[[merging base branches|APT_repository/custom#workflow-merge-main-branch]].
Given that these two branches' APT suites have diverged a lot, and
that `tails-merge-suite` currently happily overwrites newer
packages in the target with older packages from the source, it's
probably easier to just merge each individual APT overlay that was
- just merged into the release branch into `feature/jessie`'s APT
+ just merged into the release branch into `feature/stretch`'s APT
suite. Also, most of our just upgraded bundled packages
- (e.g. `tails-greeter`) may need to be rebuilt for Jessie.
+ (e.g. `tails-greeter`) may need to be rebuilt for Stretch.
-3. Ensure that the release, `devel` and `feature/jessie` branches
+3. Ensure that the release, `devel` and `feature/stretch` branches
have the expected content in `config/APT_overlays.d/`: e.g. it must
not list any overlay APT suite that has been merged already.