From 55de43ebf1baa310835086ab17854ebe5ffd8f0f Mon Sep 17 00:00:00 2001
From: Tails developers <amnesia@boum.org>
Date: Wed, 10 Dec 2014 17:39:05 +0100
Subject: [PATCH] Add alpha channel incremental upgrade path from 1.2.1 to
 1.2.2.

This will ease testing of the 1.2.1_to_1.2.2 IUK, for the 1.2.2
emergency release.
---
 .../upgrade/v1/Tails/1.2.1/i386/alpha/upgrades.yml | 15 ++++++++++
 .../v1/Tails/1.2.1/i386/alpha/upgrades.yml.pgp     | 33 +++++++++++-----------
 2 files changed, 32 insertions(+), 16 deletions(-)
 rewrite wiki/src/upgrade/v1/Tails/1.2.1/i386/alpha/upgrades.yml.pgp (91%)

diff --git a/wiki/src/upgrade/v1/Tails/1.2.1/i386/alpha/upgrades.yml b/wiki/src/upgrade/v1/Tails/1.2.1/i386/alpha/upgrades.yml
index 568a2002675..0bd9385e3cb 100644
--- a/wiki/src/upgrade/v1/Tails/1.2.1/i386/alpha/upgrades.yml
+++ b/wiki/src/upgrade/v1/Tails/1.2.1/i386/alpha/upgrades.yml
@@ -3,3 +3,18 @@ build-target: i386
 channel: alpha
 product-name: Tails
 product-version: 1.2.1
+upgrades:
+- details-url: https://tails.boum.org/news/test_1.2.2/
+  type: major
+  upgrade-paths:
+  - target-files:
+    - sha256: 52394be6a1577f061c0844512dd134ccdb92e2822f0877f259d6b0d28583ee6b
+      size: 951822336
+      url: http://dl.amnesia.boum.org/tails/alpha/tails-i386-1.2.1/tails-i386-1.2.1.iso
+    type: full
+  - target-files:
+    - sha256: 60d58ab80e3ff5c6dcc6acb21ccb675f5889c0e2a008cf420bebb52b8174e0c9
+      size: 20480
+      url: http://dl.amnesia.boum.org/tails/alpha/iuk/Tails_i386_1.2.1_to_1.2.2.iuk
+    type: incremental
+  version: 1.2.2
diff --git a/wiki/src/upgrade/v1/Tails/1.2.1/i386/alpha/upgrades.yml.pgp b/wiki/src/upgrade/v1/Tails/1.2.1/i386/alpha/upgrades.yml.pgp
dissimilarity index 91%
index b88415cf087..b41c0af8b56 100644
--- a/wiki/src/upgrade/v1/Tails/1.2.1/i386/alpha/upgrades.yml.pgp
+++ b/wiki/src/upgrade/v1/Tails/1.2.1/i386/alpha/upgrades.yml.pgp
@@ -1,16 +1,17 @@
------BEGIN PGP SIGNATURE-----
-
-iQIcBAABCgAGBQJUPvdhAAoJEBICghy+LNnBipQP/2NfbXszgDSOlcyT+sUGkiNh
-wtwuNvi8II8k6YLe+b/qGkc3hLfTO1HQfOdwRmAzm3owxQNMDIRDs8wCqs3CmxNu
-vqt2lltge6YyFfiUKVu8v14msWfSvKzy9wMlsyLAJRrnjXAeO5YS1O2MuRBIJv+f
-OGeGPy7UOdlSZSXqRKDDkXhphzEymsgfCz750rzosiIe8QTDkjsAVhHJz87d62eC
-5tDSfpHSmfYS1qEh1vi/1aO0bhpakJ7bzJLneBh6QHJWHKxhTw5QAym+WH3TTkID
-nXV7AlSvxvySN5w4d7mQVOVdi8W7OxCfaTotsBBYFT6i+MoT7qyElROTyRlka2MJ
-V5y6almCo43bZObpQU7TUxnvd/n0s9czmzAyO6W0tKcrdsvWWB9n4B/mmxWK1Tax
-ZeZBsKhKwSbn/sk/L9+6+mzx+D0RMVhypTFPHYBQ2aihwu7+rCLxe502attrw/gI
-szXVB6yHqXevaC9dojuqrIRfvQiucJsM52TdB/okNETbt+ODEFevlGb1AP1xRgww
-LehqV3OZs2aKNYhs59iyx6yKn+wxf5ppVYYJZpzgmDPpgrEelua8mq+VScJKFOQv
-UMbOw4OGSw+AvlqDVL/Cd1r3UyK+CDNUm+x7jeGA60i2VYl78tGS53eAsHLr7cXD
-TtFM+oWTkViffza2CbsA
-=9fpI
------END PGP SIGNATURE-----
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.12 (GNU/Linux)
+
+iQIcBAABAgAGBQJUiHbuAAoJEBICghy+LNnBdKUQAK0aMVgPdPvpPTNbabB9Ywfz
+7n4B1/F4FysUPqi33VDoGGgmCgr/CkVJMdm9xW/IrNhY5/6M0yEAxfFGDbIIUFRq
+z0hW5U/B/Qaego3ZDBymnSLIlKILuUQzQbE8t3HwXKTMPtweHoUFhUwns0CjnNFQ
+NRbVPOIARSkOSoMZ0y4yJPFsZ/VwWObtteI+VbvMIClbb4y4/tDFs40hVj6+oa8B
+PkqG+AkELud7Ok1fqjnu9YOfJemzJA4Ukx0b9PBZD5mqElHTzorscfN9PfsnjR6g
+3kKksX7s3FBsAV78GCreCN/iY3ecVF/g1PBLdmJcnx3xZCBP5FIaWnnheSXd6ivB
+GFj/JkFLQ/+0A9a4LRc5neSDjnDg72pcNM11RWzEIsm2RHjNGsRyW1grITJ0BPXF
+3yi3MUDRe0A+XdsETNzuhdvnBWcHdJYVEAezl2R6j3BOa65wrzLlAs1Ttps3eLhn
+mXBgZrKxor0E8kWMSkyBM3CsNX2OitP0qqeuKQnRj9rvY6NLAMm5JXwr32yApET6
+dqf8G3DqHzEdZXeYiXyESglCvnQpmAQrR92Khrlq4pHi17x91VpHk319wZGN667z
+NtDaTJG0xfgqexGkL3eMRikHTOIaFceZ2VRMhu/fUbF72e4lKbNivyunP6QPQThe
+MgO7SWV5Fark5BTtq00z
+=YnCz
+-----END PGP SIGNATURE-----
-- 
2.11.4.GIT