Commit c8437d9c authored by Tails translators's avatar Tails translators
Browse files

merge with main git using merge_canonical_changes.py.

wiki/src/news/version_4.9.ar.po: adding as wiki/src/news/version_4.9.de.po has added.
wiki/src/news/version_4.9.ca.po: adding as wiki/src/news/version_4.9.de.po has added.
wiki/src/news/version_4.9.id.po: adding as wiki/src/news/version_4.9.de.po has added.
wiki/src/news/version_4.9.pl.po: adding as wiki/src/news/version_4.9.de.po has added.
wiki/src/news/version_4.9.ru.po: adding as wiki/src/news/version_4.9.de.po has added.
wiki/src/news/version_4.9.sr_Latn.po: adding as wiki/src/news/version_4.9.de.po has added.
wiki/src/news/version_4.9.tr.po: adding as wiki/src/news/version_4.9.de.po has added.
wiki/src/news/version_4.9.zh.po: adding as wiki/src/news/version_4.9.de.po has added.
wiki/src/news/version_4.9.zh_TW.po: adding as wiki/src/news/version_4.9.de.po has added.
wiki/src/support/known_issues/graphics.ar.po: updating as wiki/src/support/known_issues/graphics.de.po has changed.
wiki/src/support/known_issues/graphics.ca.po: updating as wiki/src/support/known_issues/graphics.de.po has changed.
wiki/src/support/known_issues/graphics.id.po: updating as wiki/src/support/known_issues/graphics.de.po has changed.
wiki/src/support/known_issues/graphics.pl.po: updating as wiki/src/support/known_issues/graphics.de.po has changed.
wiki/src/support/known_issues/graphics.ru.po: updating as wiki/src/support/known_issues/graphics.de.po has changed.
wiki/src/support/known_issues/graphics.sr_Latn.po: updating as wiki/src/support/known_issues/graphics.de.po has changed.
wiki/src/support/known_issues/graphics.tr.po: updating as wiki/src/support/known_issues/graphics.de.po has changed.
wiki/src/support/known_issues/graphics.zh.po: updating as wiki/src/support/known_issues/graphics.de.po has changed.
wiki/src/support/known_issues/graphics.zh_TW.po: updating as wiki/src/support/known_issues/graphics.de.po has changed.
parents 1738cc3e 02beb054
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -28,7 +28,7 @@ fi
### helper functions
fatal () {
echo "Fatal: $@" >&2
echo "Fatal: $*" >&2
exit 2
}
......@@ -56,7 +56,7 @@ export DEBEMAIL="${AMNESIA_DEV_EMAIL}"
echo "Updating debian/changelog from Git history..."
gbp dch \
`if [ ${SNAPSHOT} = yes ]; then echo '--snapshot --auto' ; fi` \
`if [ ${SNAPSHOT} = no -a -n ${SINCE} ]; then echo "--since=${SINCE}" ; fi` \
`if [ ${SNAPSHOT} = no -a -n "${SINCE}" ]; then echo "--since=${SINCE}" ; fi` \
`if [ ${SNAPSHOT} = no -a -z ${SINCE} ]; then echo "--auto" ; fi` \
--new-version="${NEW_VERSION}" \
--ignore-branch \
......
......@@ -25,7 +25,6 @@ ovmf
pry
python-jabberbot
python-potr
qemu-kvm
qemu-system-x86
redir
ruby-guestfs
......@@ -264,11 +263,11 @@ while [ $# -gt 0 ]; do
;;
--iso)
shift
export TAILS_ISO="$(readlink -f "$1")"
export TAILS_ISO="$(realpath -s "$1")"
;;
--old-iso)
shift
export OLD_TAILS_ISO="$(readlink -f "$1")"
export OLD_TAILS_ISO="$(realpath -s "$1")"
;;
--help)
usage
......
Subproject commit 28bdbfb67243b3ed0ff16c3694d1ac1ee51f5642
Subproject commit e81b1006a802bca117faa9b295a4b90332c7c47f
......@@ -82,7 +82,7 @@ Follow our installation instructions:
- [[Install from macOS|install/mac]]
- [[Install from Linux|install/linux]]
<div class="caution"><p>All the data on this USB stick will be lost if
<div class="caution"><p>The Persistent Storage on the USB stick will be lost if
you install instead of upgrading.</p></div>
## To download only
......
......@@ -9,9 +9,7 @@ We need to follow the following instructions whenever the patch series
we have exported to tails.git does not apply anymore, therefore breaking
the Tails images build process.
1. Create, checkout and push a branch in `tails.git` with the
`+force-all-tests` suffix (most of `features/thunderbird.feature`
is tagged `@fragile`).
1. Create, checkout and push a branch in `tails.git`.
1. The first time you do this requires some additional steps (WARNING!
this will download almost 2 GiB of data):
......@@ -24,10 +22,10 @@ the Tails images build process.
1. Set environment variables:
Let's pretend the scenario is that Thunderbird 60.0-3 has just been
Let's pretend the scenario is that Thunderbird 68.10.0-1~deb10u1 has just been
released:
VERSION="60.0-3"
VERSION="68.10.0-1~deb10u1"
TAG="debian/1%$(echo ${VERSION:?} | tr '~' '_')"
1. `git fetch && git fetch debian-upstream`
......@@ -45,7 +43,7 @@ the Tails images build process.
1. Let's update our branch to the new version:
git checkout tails/stretch && git merge origin/tails/stretch && \
git checkout tails/buster && git merge origin/tails/buster && \
git merge --no-edit "${TAG:?}"
1. Let's ensure our patches still apply cleanly:
......@@ -73,10 +71,7 @@ the Tails images build process.
1. Git push:
git push --follow-tags origin \
tails/stretch \
upstream-60.x \
pristine-tar
git push --follow-tags origin tails/buster
Note: pushing some tags will fail due to [[!tails_ticket 11531]].
......@@ -87,11 +82,11 @@ the Tails images build process.
1. Update the patches in tails.git:
THUNDERBIRD_GIT_COMMIT=$(git --git-dir="$THUNDERBIRD_GIT_CHECKOUT" rev-parse --verify HEAD)
THUNDERBIRD_GIT_COMMIT=$(git --git-dir="${THUNDERBIRD_GIT_CHECKOUT}/.git" rev-parse --verify HEAD)
TAILS_GIT_PATCHES_DIR="config/chroot_local-includes/usr/share/tails/build/thunderbird-patches"
cd "$TAILS_GIT_CHECKOUT" && \
git rm -r "$TAILS_GIT_PATCHES_DIR" && \
cp -r "${THUNDERBIRD_GIT_CHECKOUT}/debian/patches/secure-account-creation \
cp -r "${THUNDERBIRD_GIT_CHECKOUT}/debian/patches/secure-account-creation" \
"$TAILS_GIT_PATCHES_DIR" && \
grep -E '^secure-account-creation/' "${THUNDERBIRD_GIT_CHECKOUT}/debian/patches/series" \
| perl -pE 's{^secure-account-creation/}{}' \
......
2020-06-28
\ No newline at end of file
2020-07-28
\ No newline at end of file
Supports Markdown
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