Commit 8a32c4b9 authored by Tails developers's avatar Tails developers
Browse files

Merge branch 'master' of ssh://webmasters.boum.org/~/wiki

parents 16257f05 232a8cf2
...@@ -162,8 +162,6 @@ If Debian's iceweasel was pushed to Git already ...@@ -162,8 +162,6 @@ If Debian's iceweasel was pushed to Git already
If Debian's iceweasel was not pushed to Git yet If Debian's iceweasel was not pushed to Git yet
----------------------------------------------- -----------------------------------------------
FIXME: test these instructions.
Then, we have to import the source package into Git ourselves, and Then, we have to import the source package into Git ourselves, and
merge from Debian's Vcs-Git later. merge from Debian's Vcs-Git later.
...@@ -171,6 +169,18 @@ merge from Debian's Vcs-Git later. ...@@ -171,6 +169,18 @@ merge from Debian's Vcs-Git later.
* Checkout our `tails/master` branch. * Checkout our `tails/master` branch.
* Unapply all quilt patches and commit:
quilt pop -a
* `git rm` the deleted files
* `git add` the new files and the modified ones
* Commit:
git commit -m 'Remove all quilt patches.'
* Overwrite the files in the Git checkout with the new ones. * Overwrite the files in the Git checkout with the new ones.
Assuming the new extracted iceweasel package is in Assuming the new extracted iceweasel package is in
`iceweasel-17.0.2esr`, and our iceweasel Git repository checkout is `iceweasel-17.0.2esr`, and our iceweasel Git repository checkout is
...@@ -178,14 +188,18 @@ merge from Debian's Vcs-Git later. ...@@ -178,14 +188,18 @@ merge from Debian's Vcs-Git later.
rsync --stats -a --exclude=.git --delete iceweasel-17.0.2esr/ git/ rsync --stats -a --exclude=.git --delete iceweasel-17.0.2esr/ git/
* `git rm` the deleted files
* `git add` the new files and the modified ones * `git add` the new files and the modified ones
* `git rm` the deleted files * Commit:
* Commit. git commit -m "Import $(head -n 1 debian/changelog | sed -e 's,).*,),')"
* Verify with `diff` that the current state of the `tails/master` is * Verify with `diff` that the current state of the `tails/master` is
exactly the same as Debian's iceweasel source package one. exactly the same as Debian's iceweasel source package one:
diff --exclude=.git iceweasel-17.0.2esr/ git/
* Bring our `debian/changelog` and `debian/rules` changes back. * Bring our `debian/changelog` and `debian/rules` changes back.
...@@ -222,20 +236,52 @@ and commit: ...@@ -222,20 +236,52 @@ and commit:
* Import the latest TBB patches: * Import the latest TBB patches:
export TBB_SRC=XXX_PATH_TO_TBB_SRC_XXX - If working on Iceweasel 17:
for patch in $(\ls --reverse ${TBB_SRC}/src/current-patches/firefox/*.patch) ; do
p=$(basename "$patch") export TBB_SRC=XXX_PATH_TO_TBB_SRC_XXX
quilt import -P "torbrowser/$p" "$patch" for patch in $(\ls --reverse ${TBB_SRC}/src/current-patches/firefox/*.patch) ; do
done p=$(basename "$patch")
git add debian/patches/torbrowser debian/patches/series quilt import -P "torbrowser/$p" "$patch"
TBB_COMMIT=$(git --git-dir=$TBB_SRC/.git rev-parse HEAD) done
git commit -a -m "Import Torbrowser patches at commit ${TBB_COMMIT}." git add debian/patches/torbrowser debian/patches/series
TBB_COMMIT=$(git --git-dir=$TBB_SRC/.git rev-parse HEAD)
* Remove from the quilt series, using `quilt delete`, the Torbrowser git commit -a -m "Import Torbrowser patches at commit ${TBB_COMMIT}."
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 * Remove from the quilt series, using `quilt delete`, the
about new or updated patches, use common sense. Commit with Torbrowser patches we don't want: see `debian/changelog` for the
a message explaining your decisions. 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.0
that is an import from Mozilla (see e.g. 5175d069); save its ID:
export LAST_MOZILLA_COMMIT=XXX
* Export the Torbrowser patches:
TORBROWSER_PATCHES_DIR=$(mktemp -d)
git format-patch -o "$TORBROWSER_PATCHES_DIR" \
"$LAST_MOZILLA_COMMIT..mikeperry/torbrowser-firefox24.0"
* Remove from $TORBROWSER_PATCHES_DIR the patches we don't want.
See the section about Iceweasel 17 above for details.
* 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.0)
git commit -a -m "Import Torbrowser 24 patches at commit ${TBB_COMMIT}."
* Apply Torbrowser patches: * Apply Torbrowser patches:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment