summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTails developers <amnesia@boum.org>2012-11-15 00:40:32 +0100
committerTails developers <amnesia@boum.org>2012-11-15 00:40:32 +0100
commit0eb38d9e3bc3cb9acaa89032f2ac295f11cf4c65 (patch)
treed9a64d86b072f16765f59c2055a8428d6aad3284
parent8c19bafa34ff2198c8301b815fc159970b102a27 (diff)
parent7b6fc8d8a5eddd9f7365a15df2cb40019035c499 (diff)
Merge remote branch 'origin/master' into devel0.15-rc1
-rw-r--r--wiki/src/contribute/release_process.mdwn2
-rw-r--r--wiki/src/contribute/release_process/tails-iuk.mdwn11
-rw-r--r--wiki/src/todo/incremental_upgrades.mdwn2
3 files changed, 11 insertions, 4 deletions
diff --git a/wiki/src/contribute/release_process.mdwn b/wiki/src/contribute/release_process.mdwn
index fa3f549..36d7e35 100644
--- a/wiki/src/contribute/release_process.mdwn
+++ b/wiki/src/contribute/release_process.mdwn
@@ -58,7 +58,7 @@ Then see the relevant release processes:
* whisperback:
* see release process on <http://git.immerda.ch/?p=whisperback.git;a=blob;f=HACKING>
* build a debian package
- * copy it to tails git
+ * upload it to [[APT repository]]
Changelog
---------
diff --git a/wiki/src/contribute/release_process/tails-iuk.mdwn b/wiki/src/contribute/release_process/tails-iuk.mdwn
index d6adc1a..d5a1234 100644
--- a/wiki/src/contribute/release_process/tails-iuk.mdwn
+++ b/wiki/src/contribute/release_process/tails-iuk.mdwn
@@ -41,6 +41,8 @@ did not do it:
dch
+(Do not forget to set the appropriate release.)
+
Commit `debian/changelog`:
git commit debian/changelog
@@ -59,5 +61,10 @@ changes:
Add the Debian package to Tails
===============================
-Replace older packages with the new ones in `config/chroot_local-packages`.
-Paste the last entry of `debian/changelog` in the commit message.
+Sign the package:
+
+ debsign $CHANGES_FILE
+
+Upload:
+
+ dupload --to tails $CHANGES_FILE
diff --git a/wiki/src/todo/incremental_upgrades.mdwn b/wiki/src/todo/incremental_upgrades.mdwn
index 0b4e473..6747892 100644
--- a/wiki/src/todo/incremental_upgrades.mdwn
+++ b/wiki/src/todo/incremental_upgrades.mdwn
@@ -42,7 +42,7 @@ should provide an automated way of doing the upgrade.
* Prepare IUK: **done**
* Update update-description files: **done**
- * Ask beta testers to try the incremental upgrade process
+ * Ask beta testers to try the incremental upgrade process: **done**
* Catch and fix most remaining bugs.
* Write user documentation and hand it to translators.