summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTails developers <amnesia@boum.org>2013-10-27 00:33:08 +0000
committerTails developers <amnesia@boum.org>2013-10-27 00:33:08 +0000
commitb5527581fd23762e30fa07a972bdd6dc724a3a08 (patch)
treece6d785745720e0ceed0db7b02e3d58ba5b6dbb8
parent1dfa219f6ab2703e03bd7eea16c1034c162c3661 (diff)
Misc. release process improvements.
-rw-r--r--wiki/src/contribute/release_process.mdwn5
-rw-r--r--wiki/src/contribute/release_process/iceweasel.mdwn20
-rw-r--r--wiki/src/contribute/release_process/tails-greeter.mdwn2
3 files changed, 18 insertions, 9 deletions
diff --git a/wiki/src/contribute/release_process.mdwn b/wiki/src/contribute/release_process.mdwn
index 23e717c..39479e1 100644
--- a/wiki/src/contribute/release_process.mdwn
+++ b/wiki/src/contribute/release_process.mdwn
@@ -104,7 +104,7 @@ Then see the relevant release processes:
* [[tails-greeter]]
* [[persistence-setup]]
* [[tails-iuk]]
-* whisperback:
+* whisperback:
* see release process on
<https://git-tails.immerda.ch/whisperback/plain/HACKING>
* build a debian package
@@ -180,6 +180,7 @@ matches the date of the future signature.
echo "$VERSION" > wiki/src/inc/stable_i386_version.html
echo "$RELEASE_DATE" > wiki/src/inc/stable_i386_date.html
+ $EDITOR wiki/src/inc/*.html
./build-wiki
git commit wiki/src/inc/ -m "Update version and date for $VERSION."
@@ -407,7 +408,7 @@ Write the announcement for the release in
news mailing-list.
- Document important config changes that persistence users have to do
themselves (e.g. the Pidgin proxy settings change in
- [[!tails_gitweb_commit 9925321]] break all existing persistent
+ [[!tails_gitweb_commit 9925321]] breaks all existing persistent
profiles).
Write an announcement listing the security bugs affecting the previous
diff --git a/wiki/src/contribute/release_process/iceweasel.mdwn b/wiki/src/contribute/release_process/iceweasel.mdwn
index 6dac20e..a82e4c7 100644
--- a/wiki/src/contribute/release_process/iceweasel.mdwn
+++ b/wiki/src/contribute/release_process/iceweasel.mdwn
@@ -41,19 +41,20 @@ a bit more work is needed.
Note that usually, we're doing these steps (usually on Sunday or
Monday) *before* the new ESR was officially released (which usually
happens on Tuesday). Mozilla make the source available on previous
-Friday or Saturday, so that downstreams (such as us!) can get their stuff ready
-in time for the security announce.
+Friday or Saturday, so that downstreams (such as us!) can get their
+stuff ready in time for the security announce.
* Download the Firefox tarball and detached signature from
<https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/VERSION/source/>
- (`VERSION` is the version we want to build, that is something like `17.0.7esr`).
+ (`VERSION` is the version we want to build, that is something like
+ `17.0.7esr`).
* Check the signature.
* Put the tarball in the parent directory of your Iceweasel Git repository.
* Extract the tarball.
* `cd` into the extracted directory.
* Copy the `debian/` directory from our previous package into the new
upstream source directory.
-* Use `dch` to add a `debian/changelog` entry matching the new
+* Add a `debian/changelog` entry matching the new
upstream version. Use 0 for the Debian packaging version, e.g.
`17.0.5esr-0`, to leave room for the official packaging that we will
want to merge when it's out:
@@ -309,7 +310,13 @@ Update debian/changelog
Tag the release
---------------
- git tag -s -m "$(head -n 1 debian/changelog | sed -e 's,).*,),')" "debian/${VERSION}-0+tails1"
+ DEB_VERSION=$(dpkg-parsechangelog -SVersion)
+ git tag -s -m "$(head -n 1 debian/changelog | sed -e 's,).*,),')" "debian/${DEB_VERSION}"
+
+Clean up the source tree
+------------------------
+
+ rm -f .mozconfig*
Build for unstable
------------------
@@ -339,7 +346,8 @@ Build for squeeze-backports
* Tag the backport:
- git tag -s -m "$(head -n 1 debian/changelog | sed -e 's,).*,),')" $TAG_NAME
+ git tag -s -m "$(head -n 1 debian/changelog | sed -e 's,).*,),')" \
+ "debian/$(dpkg-parsechangelog -SVersion | sed -e 's,~,_,')"
* Build for squeeze-backports and i386, e.g. using our
[[contribute/Debian_package_builder]].
diff --git a/wiki/src/contribute/release_process/tails-greeter.mdwn b/wiki/src/contribute/release_process/tails-greeter.mdwn
index 803eff1..3d9a4b5 100644
--- a/wiki/src/contribute/release_process/tails-greeter.mdwn
+++ b/wiki/src/contribute/release_process/tails-greeter.mdwn
@@ -7,7 +7,7 @@
Update POT and PO files
=======================
-FIXME!
+ ./setup.py build_i18n
Update the Debian package
=========================