summaryrefslogtreecommitdiffstats
path: root/wiki/src/contribute/release_process/icedove.mdwn
diff options
context:
space:
mode:
Diffstat (limited to 'wiki/src/contribute/release_process/icedove.mdwn')
-rw-r--r--wiki/src/contribute/release_process/icedove.mdwn28
1 files changed, 18 insertions, 10 deletions
diff --git a/wiki/src/contribute/release_process/icedove.mdwn b/wiki/src/contribute/release_process/icedove.mdwn
index f06b38e..4de875b 100644
--- a/wiki/src/contribute/release_process/icedove.mdwn
+++ b/wiki/src/contribute/release_process/icedove.mdwn
@@ -30,27 +30,27 @@ released:
1. Let's update our branch to the new version:
- git checkout tails/jessie && git merge origin/tails/jessie
+ git checkout tails/jessie && git merge origin/tails/jessie && \
git merge --no-edit "${TAG}"
Now you most likely will have to deal with a merge conflict in
debian/changelog -- just reorder the entries chronologically. Then
let's release a new version:
- TAILS_VERSION="1:${VERSION}~deb8u1+tails1"
- DISTRIBUTION="feature-icedove-${VERSION}"
+ TAILS_VERSION="1:${VERSION}~deb8u1+tails1" && \
+ DISTRIBUTION="feature-icedove-${VERSION}" && \
dch --newversion "${TAILS_VERSION}" --force-bad-version \
--distribution "${DISTRIBUTION}" --force-distribution \
- "Rebuild Icedove with Tails' secure autoconfiguration patches."
+ "Rebuild Icedove with Tails' secure autoconfiguration patches." && \
git commit debian/changelog \
- -m "document changes and release ${TAILS_VERSION}"
+ -m "document changes and release ${TAILS_VERSION}" && \
gbp buildpackage --git-debian-branch=tails/jessie \
--git-sign-tags --git-tag-only
1. Fetch the Debian sources to be used for the build:
- ICEDOVE_SOURCES="$(mktemp -d)"
- GIT_DIR="$(pwd)"
+ ICEDOVE_SOURCES="$(mktemp -d)" && \
+ GIT_DIR="$(pwd)" && \
cd "${ICEDOVE_SOURCES}" && \
apt source icedove="1:${VERSION}" && \
cp icedove_*.orig*.tar.xz "${GIT_DIR}/.." && \
@@ -68,13 +68,21 @@ released:
1. Include all sources in the `.changes` file:
- CHANGES_FILE="../icedove_${VERSION}~deb8u1+tails1_i386.changes"
+ CHANGES_FILE="../icedove_${VERSION}~deb8u1+tails1_i386.changes" && \
changestool "${CHANGES_FILE}" includeallsources
+1. Due to [[!tails_ticket 11531]] we won't be able to push the tag
+ generated by `gbp` so we have to replace it with a differently
+ named tag:
+
+ NEW_TAG="$(echo ${TAG} | sed 's/1%//')" && \
+ git tag -s "${NEW_TAG}" -m "icedove Debian release 1:${VERSION}" "${TAG}" && \
+ TAG="${NEW_TAG}"
+
1. Git push and upload packages:
- git push origin "${TAG}" tails/jessie
- debsign "${CHANGES_FILE}"
+ git push origin "${TAG}" tails/jessie && \
+ debsign "${CHANGES_FILE}" && \
dupload --to tails "${CHANGES_FILE}"
At the moment pushing `TAG` may fail due to