Commit 09a55f9e authored by Tails developers's avatar Tails developers
Browse files

We now patch control{,.in} too, for FF24.

parent 93642fa6
......@@ -156,7 +156,7 @@ If Debian's iceweasel was pushed to Git already
git diff --stat debian/17.0.8esr-1..tails/master
All expected differences should be in `debian/{changelog,rules}`,
All expected differences should be in `debian/{changelog,rules,control,control.in}`,
and the addition of the Torbrowser patches.
If Debian's iceweasel was not pushed to Git yet
......@@ -201,7 +201,8 @@ merge from Debian's Vcs-Git later.
diff --exclude=.git iceweasel-17.0.2esr/ git/
* Bring our `debian/changelog` and `debian/rules` changes back.
* Bring our `debian/changelog`, `debian/rules`, `debian/control` and
`debian/control.in` changes back.
5. Update 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