From 9d911b2e75453bd68ff0a5d8f387ffddaf2f6e88 Mon Sep 17 00:00:00 2001 From: anonym Date: Mon, 26 Feb 2018 18:00:13 +0100 Subject: [PATCH] Thunderbird release process: make assumption explicit. --- wiki/src/contribute/release_process/tails-installer.mdwn | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/wiki/src/contribute/release_process/tails-installer.mdwn b/wiki/src/contribute/release_process/tails-installer.mdwn index cd25982d56c..7ee685c719d 100644 --- a/wiki/src/contribute/release_process/tails-installer.mdwn +++ b/wiki/src/contribute/release_process/tails-installer.mdwn @@ -131,23 +131,30 @@ export: Update the Debian package for Tails ----------------------------------- -Checkout the packaging branch: +Checkout the packaging branch, e.g.: export PKG_NAME=tails-installer export PACKAGING_BRANCH=tails/master git checkout "$PACKAGING_BRANCH" +Here we assumed that `tails/master` still supports Debian Sid, +otherwise `PACKAGING_BRANCH` should be `tails/${codename}`. + Merge Debian packaging changes: git fetch debian && \ - git merge debian/sid + codename="${PACKAGING_BRANCH/*\//}" && \ + if [ "${codename}" = "master" ]; then + codename=sid + fi && \ + git merge "debian/${codename}" Verify that `debian/gbp.conf` references the correct upstream and Debian (packaging) branches, and that `pristine-tar` usage is enabled, e.g.: [DEFAULT] upstream-branch = upstream/5.x+dfsg - debian-branch = tails/master + debian-branch = tails/${codename} debian-tag = tails/%(version)s pristine-tar = True -- 2.11.4.GIT