summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTails developers <amnesia@boum.org>2013-12-09 11:36:58 +0000
committerTails developers <amnesia@boum.org>2013-12-09 11:36:58 +0000
commita8b415ba1fc094150fd7d79196ec6bd87de1af18 (patch)
tree0e034ca4eff3cb6f5979be39da163588ae2686a3
parent467dc9b778bc84f33535c6fd89d637920c2068e0 (diff)
Update browser release process for 24.2.0esr, add some missing steps.HEADmaster
-rw-r--r--wiki/src/contribute/release_process/iceweasel.mdwn64
1 files changed, 28 insertions, 36 deletions
diff --git a/wiki/src/contribute/release_process/iceweasel.mdwn b/wiki/src/contribute/release_process/iceweasel.mdwn
index 4c6d54f..de933ae 100644
--- a/wiki/src/contribute/release_process/iceweasel.mdwn
+++ b/wiki/src/contribute/release_process/iceweasel.mdwn
@@ -24,7 +24,7 @@
It might have been updated in one of these sources:
-* branch `esr17/master` in `git://git.debian.org/git/pkg-mozilla/iceweasel.git`
+* branch `esr/master` in `git://git.debian.org/git/pkg-mozilla/iceweasel.git`
* <http://mozilla.debian.net/pool/iceweasel-esr/i/iceweasel/>
**If** it was updated, then skip to [[New Iceweasel release|iceweasel#new-iceweasel-release]].
@@ -74,8 +74,8 @@ stuff ready in time for the security announce.
* Trick the tarball importer to import the correct version:
- cp ../mozilla-esr17/browser/config/version.txt browser/config/ && \
- cp ../mozilla-esr17/debian/changelog debian/
+ cp ../mozilla-esr24/browser/config/version.txt browser/config/ && \
+ cp ../mozilla-esr24/debian/changelog debian/
* Import the new upstream release into the `upstream` branch:
@@ -212,7 +212,7 @@ merge from Debian's Vcs-Git later.
First, check if the Torbrowser patches were updated since the last
time we imported them (that's why we always record in
-`debian/changelog` the TBB Git commit we are importing from).
+`debian/changelog` the TorBrowser Git commit we are importing from).
**If** the Torbrowser patches were not updated, then just apply them
and commit:
@@ -238,54 +238,39 @@ and commit:
git commit -a -m 'Remove Torbrowser patches.'
-* Import the latest TBB patches:
+* Import the latest TorBroswer patches:
- - If working on Iceweasel 17:
+ - Ensure you have Mike Perry's latest stuff available:
- export TBB_SRC=XXX_PATH_TO_TBB_SRC_XXX
- for patch in $(\ls --reverse ${TBB_SRC}/src/current-patches/firefox/*.patch) ; do
- p=$(basename "$patch")
- quilt import -P "torbrowser/$p" "$patch"
- done
- git add debian/patches/torbrowser debian/patches/series
- TBB_COMMIT=$(git --git-dir=$TBB_SRC/.git rev-parse HEAD)
- git commit -a -m "Import Torbrowser patches at commit ${TBB_COMMIT}."
+ git remote add -f mikeperry https://git.torproject.org/user/mikeperry/tor-browser.git
+ git remote add -f ttp https://git.torproject.org/tor-browser.git
- * Remove from the quilt series, using `quilt delete`, the
- Torbrowser patches we don't want: see `debian/changelog` for the
- list of patches skipped last time, see the TBB Git log to make
- your opinion about new or updated patches, use common sense.
- Commit with a message explaining your decisions.
-
- - If working on Iceweasel 24:
- * Ensure you have Mike Perry's latest stuff available:
-
- git remote add mikeperry https://git.torproject.org/user/mikeperry/tor-browser.git
- git fetch mikeperry
-
- * Find the most recent commit in mikeperry/torbrowser-firefox24.1.0esr
- that is an import from Mozilla (see e.g. 5175d069); save its ID:
+ - Find the most recent commit in ttp/tor-browser-24.2.0esr-1
+ that is an import from Mozilla (see e.g. 5175d069); save its ID:
export LAST_MOZILLA_COMMIT=XXX
- * Export the Torbrowser patches:
+ - Export the Torbrowser patches:
TORBROWSER_PATCHES_DIR=$(mktemp -d)
git format-patch -o "$TORBROWSER_PATCHES_DIR" \
- "$LAST_MOZILLA_COMMIT..mikeperry/torbrowser-firefox24.1.0esr"
+ "$LAST_MOZILLA_COMMIT..ttp/tor-browser-24.2.0esr-1"
- * Remove from $TORBROWSER_PATCHES_DIR the patches we don't want.
- See the section about Iceweasel 17 above for details.
+ - Remove from $TORBROWSER_PATCHES_DIR the patches we don't want.
+ See `debian/changelog` for the - list of patches skipped last
+ time, see the TorBrowser Git log to make your opinion about new or
+ updated patches, use common sense. Take note of your decisions and
+ its rationale, you will need it later.
- * Import the Torbrowser patches:
+ - Import the Torbrowser patches:
for patch in $(\ls --reverse ${TORBROWSER_PATCHES_DIR}/*.patch) ; do
p=$(basename "$patch")
quilt import -P "torbrowser/$p" "$patch"
done
git add debian/patches/torbrowser debian/patches/series
- TBB_COMMIT=$(git rev-parse mikeperry/torbrowser-firefox24.1.0esr)
- git commit -m "Import Torbrowser 24 patches at commit ${TBB_COMMIT}."
+ TORBROWSER_COMMIT=$(git rev-parse ttp/tor-browser-24.2.0esr-1)
+ git commit -m "Import Torbrowser patches at commit ${TORBROWSER_COMMIT}."
* Apply Torbrowser patches:
@@ -293,6 +278,10 @@ and commit:
* Add untracked files *but* `.pc` and `commit --amend`.
+* Push to Git:
+
+ git push origin tails/master && git push --tags
+
6. Build packages
=================
@@ -303,7 +292,7 @@ Update debian/changelog
dch -v "${VERSION}-0+tails1"
-* list our changes, especially the TBB commit at which the
+* list our changes, especially the TorBrowser commit at which the
patches were imported, and the ones we skipped
* set distribution to unstable
* commit:
@@ -369,6 +358,9 @@ Build for squeeze-backports
* Merge this APT suite where you need it: generally, that's `devel`,
`experimental`, one of `stable` or `testing`, and maybe
a release tag.
+* Push to Git:
+
+ git push origin tails/squeeze && git push --tags
Import bundled preferences
--------------------------