From a55ca3b643c55a9af18716fd7d40888d28f958b6 Mon Sep 17 00:00:00 2001
From: anonym <anonym@riseup.net>
Date: Mon, 6 Jun 2016 21:26:16 +0200
Subject: [PATCH] Only mark version as "released" when building the final ISO
image.
Otherwise we'll try to use the tagged APT snapshot before it exists
for the "almost-final image" which will fail.
---
release | 4 ++--
wiki/src/contribute/release_process.mdwn | 5 +++++
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/release b/release
index aaaa54fb78f..3236717d5ad 100755
--- a/release
+++ b/release
@@ -56,8 +56,8 @@ 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 "--release --since=${SINCE}" ; fi` \
- `if [ ${SNAPSHOT} = no -a -z ${SINCE} ]; then echo "--release --auto" ; 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 \
-- '*' ':!wiki' \
diff --git a/wiki/src/contribute/release_process.mdwn b/wiki/src/contribute/release_process.mdwn
index 92ebf24876e..c8464258c7d 100644
--- a/wiki/src/contribute/release_process.mdwn
+++ b/wiki/src/contribute/release_process.mdwn
@@ -492,6 +492,11 @@ Build the final image
Then all included files should be up-to-date and the versioned APT
suite should be ready, so it is time to:
+* Mark the version as "released" in the changelog:
+
+ dch --release --no-force-save-on-release --maintmaint
+ git commit -m "Mark Tails ${VERSION} as released." debian/changelog
+
* tag the release *again*, with all included files in:
git tag -f -u "$TAILS_SIGNATURE_KEY" \
--
GitLab