Merge remote-tracking branch 'origin/testing'

8 files changed, 98 insertions, 26 deletions

diff --git a/wiki/src/upgrade/v1/Tails/2.5/i386/stable/upgrades.yml b/wiki/src/upgrade/v1/Tails/2.5/i386/stable/upgrades.yml
index b54a91c..1ed9ac7 100644
--- a/wiki/src/upgrade/v1/Tails/2.5/i386/stable/upgrades.yml
+++ b/wiki/src/upgrade/v1/Tails/2.5/i386/stable/upgrades.yml
@@ -3,3 +3,18 @@ build-target: i386
 channel: stable
 product-name: Tails
 product-version: '2.5'
+upgrades:
+- details-url: https://tails.boum.org/news/version_2.6/
+  type: major
+  upgrade-paths:
+  - target-files:
+    - sha256: b15a243d196c1a351e6f07db0774353f12d54cad243a09bb92234138596d22a6
+      size: 1167990784
+      url: http://dl.amnesia.boum.org/tails/stable/tails-i386-2.6/tails-i386-2.6.iso
+    type: full
+  - target-files:
+    - sha256: e1531ede05ad81a16baaec7e20c46bd721eb6b0680277a6a5310186b04e461d0
+      size: 380538880
+      url: http://dl.amnesia.boum.org/tails/stable/iuk/Tails_i386_2.5_to_2.6.iuk
+    type: incremental
+  version: '2.6'
diff --git a/wiki/src/upgrade/v1/Tails/2.5/i386/stable/upgrades.yml.pgp b/wiki/src/upgrade/v1/Tails/2.5/i386/stable/upgrades.yml.pgp
index 7e15694..36cc975 100644
--- a/wiki/src/upgrade/v1/Tails/2.5/i386/stable/upgrades.yml.pgp
+++ b/wiki/src/upgrade/v1/Tails/2.5/i386/stable/upgrades.yml.pgp
@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNATURE-----
 
-iQIcBAABCgAGBQJXV/+uAAoJEJj+xrx1Kj22ZvEP+wV1lm871MKTIVhCGZh5MLW5
-hBExykIy6zwujkYJGdjvM4R8fMIZqB4pyhNvoesElHSzmDmfKgr0PQvJfplEtMtw
-0cgWclUD67GOYdxIjq8i1QLRip4HbpQteJHNjL6ZzqwaqgxseHVJYisxI3LDIwq7
-BvOoGPgxnvxcoYM6Osmed+TB6drgalnebQvUx2KBV2x8v/edhXCfm+QcB3n4jE6I
-3/mjGIVMVO3wsWfvV0fqSOn+Ur7kYDUpZ5FTUQ6UVC3HBTKuEVEtJMijBHi8dvrv
-ibxPhio47PKEgFIsD8k/l7N+/90V7/dprhxEcv92/CWAjtpcwIut8NpVYa5eDLqo
-7/S+8h8iE+uKCgISblm3kFb8DnOCj/6F6eaIWifME2W/izkQ6JRx+XpOZmzZOBNv
-QAjhvJOrwe5dlLUQLj0Nyb5g3Zm2CN4Gri5YVYVcXW1nlGnXw5V0/Qas/ayF8j4S
-hnn3Ve/uc8HLMnv367UC2PIZFKjZgnNgV9/ZCVxBi5XAQO2EMVqZO44WOmd9n7ny
-OrxydTPhsaKcnE1eqxk8LbaP94ynvZd8J5rGVmYhPdB2KaiTyvfetxkZ/r7+t39V
-jGf94ByLRtPuznuk2r/ctOcpijtVQNtvIdMoCouvZ40SM9sI4m0pzaaIwbMyLuiy
-gqXe/TfJnY7nBK4Awsiw
-=TwKW
+iQIcBAABCgAGBQJX4V7HAAoJEJj+xrx1Kj22NPoP/387qqsRAsIP0BeMSQOrdUZk
+fJEaie7G208cZctriqz/NCLzZmyB5SR5zFQU/6Tey1MoLsbcztRvDjJN1WxgxFFd
+TV7EYQEnBjS58xCDoNxmu14p1hneh9HI12m9+H0EqlraT8ZnLwKmFsF7LZkfB0TH
+P9JJnIJkZYnSft5JrXk8SKCYgjWMHy+XM6IVp6EYxjwZLmF839G2mH3le/aE6gRC
+FGWAEETaY26cTYgZbpoWoY6tZXk81T0zKXuvbx6T6hplr0aCvWk/pN6T1dMzcvfV
+XoBhg9VUpD3Tfl+bggFRTLwaqMTLosQtyntCVBAlc24Ht5n1jwwA/8z7WY/kUUv/
+CMXcUqzWik3pC5yDVyrjrJlWsmS54qINGZe4gdSkxVJxNByLZYzaM/pElQt17Tji
+jMIeu7svulZOUrCRd5hadAilL4MUd8Eku25U7FQtoCHKyngnBM2iGwkvCRBLkm10
+sRcY+uiZxcAnuk2qfnXdb8BafJRop5M/U20PFC0kkPbR9zWP1nkY/zNXQEJWFktx
+Ag308g2bNTdeT8eXd68lzLOei0JjBOZIWfp52YMAxN5owVZiuOLsPj6r4KZTbM7a
+haf2Hd7Nj3LOGZ66lGrskt3516sNGhtpEV7LZkgyIpTiK+67gY2UKzSIFryEVtBd
+Tv/GHImtvmviqrAYjxmE
+=bYKh
 -----END PGP SIGNATURE-----
diff --git a/wiki/src/upgrade/v1/Tails/2.6.1/i386/alpha/upgrades.yml b/wiki/src/upgrade/v1/Tails/2.6.1/i386/alpha/upgrades.yml
new file mode 100644
index 0000000..ba4d526
--- /dev/null
+++ b/wiki/src/upgrade/v1/Tails/2.6.1/i386/alpha/upgrades.yml
@@ -0,0 +1,5 @@
+---
+build-target: i386
+channel: alpha
+product-name: Tails
+product-version: 2.6.1
diff --git a/wiki/src/upgrade/v1/Tails/2.6.1/i386/alpha/upgrades.yml.pgp b/wiki/src/upgrade/v1/Tails/2.6.1/i386/alpha/upgrades.yml.pgp
new file mode 100644
index 0000000..603384f
--- /dev/null
+++ b/wiki/src/upgrade/v1/Tails/2.6.1/i386/alpha/upgrades.yml.pgp
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIcBAABCgAGBQJX4V7ZAAoJEJj+xrx1Kj22oq8QAIAdF+EP4Ebje+QVu8bRtxS4
+UJJGLNUYA7DPMdTkp6vO4rYFs0hJ7Pw/qQaBLYFl3Ca1KfNyiRTsHTWGVOtp/oeK
+O5P9s6Lof9HsjgPFpq+iyf/PQRq2k4yJQooHhIXe8n1EgWrif049oC2G2peAD2Eu
+YnUnX7lNImJ+ldJWjg3qLRoMTV9+VJG+4ZkRnyXFIKNl87L6dKmB2k+wP1lrRqNB
+MzS1YAajoOp8c+cpC5vKqnj5/oC+2Mi6hLS3MB7yJy8yvgbYyfqq7vmi9JDq55kw
+gKqsQbMPEzn63ueN7ZIVWvDdGO9GMp4yObqNgeZPvoDHs/kKi1YIsSOJx3X7ENgR
+EKpHdj8YvYSmFEbfEDtpfeXkaMDFx7xhBqb7GlLATQyPC0MD1giuibin2EsTIiC6
+JXSNmYog9DAF4A826Ry/nVhHqXqm7ioixOlQx27IvNdIn6HSS5mKm0oIt4Xavm2M
+OZC47Wda/wjG4uhyjnySI2fMRcwCfkZNSWGnvxnk1zH2ztQ8QmUxwJeeC5ptvYwH
+4/Qen7Cn/Q4TEX7ZpkxtA1CLyVdVncVqREmLWlfeKj7psUscHJr+MJv1gadl/Yiy
+2u8TNGQVtclCNrW+bVAEUcSZf3BSrGR7tPCS8npMiHT+251j2hc7EBqnBpo3SnsN
+PnUSfyRUwO9C/8i5IhXF
+=asfx
+-----END PGP SIGNATURE-----
diff --git a/wiki/src/upgrade/v1/Tails/2.6.1/i386/stable/upgrades.yml b/wiki/src/upgrade/v1/Tails/2.6.1/i386/stable/upgrades.yml
new file mode 100644
index 0000000..3c4eff0
--- /dev/null
+++ b/wiki/src/upgrade/v1/Tails/2.6.1/i386/stable/upgrades.yml
@@ -0,0 +1,5 @@
+---
+build-target: i386
+channel: stable
+product-name: Tails
+product-version: 2.6.1
diff --git a/wiki/src/upgrade/v1/Tails/2.6.1/i386/stable/upgrades.yml.pgp b/wiki/src/upgrade/v1/Tails/2.6.1/i386/stable/upgrades.yml.pgp
new file mode 100644
index 0000000..9105dca
--- /dev/null
+++ b/wiki/src/upgrade/v1/Tails/2.6.1/i386/stable/upgrades.yml.pgp
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIcBAABCgAGBQJX4V7QAAoJEJj+xrx1Kj22cUMP/3GDAMy1mrXip7DT+ndL0PI0
+PyCnNOX1hq9zaZlgG8jA7+k3jgpQnMtlDlw8HZ5NDNZ16Q9AjS9OUCIsNTw7DKHw
+XQzMpWLmZYKxsRfb1UvCgncfmES0t3LOlkv5t9jpdrlmmr47eDwfM5ekqQnSy7sV
+MAQsN7xmlG4ZUgoG7E0muIqyGNYy7xzBB09OSvbTGNRD+unque2L8VdZShKKrNWD
+a+NMrmNn+6DbyaAktioZjT10d4l0NX1b3iRVjamAf6tgSW247iav1Li0pJ44AmrJ
+32jsiOGfhdZ0j4BVfrRWySdjnEyIGeJm26pIk5HiEpMoRb8ZQR4SXrdkdy9oGuWR
+tDwg8vV7MfvCcN6l65vhk3o7M6DnZPLZHzLzc6zI3wBU6wrbo5M5PCfbPJSBLs8S
+3WOy9IGrS0wN6R9SNPvNYjFgA3mfoPxYdz8lcA6D7M7ib3901DzSxWqVlEfdvYLy
+uZZ3UDVt4cgn0Phj2PFkFl3x3pzQUacWOb37sT0RKKhowvsHlLrNEjLiI+e4EuF5
+SnvQGrt2KWvkhuSH4AS9NPCee0AA4DpuoLFNqdjZ9Y0ob+gnV+u6GyuPT4iKlzKE
+fhdgU+dlME9mQOOZDReQS48TW+Pe1NaZ/L3F4Y6JHFZXnZfpaO9IkPe/a8EzdY44
+wJCJvujoLOmB+wtfdGLb
+=xpz3
+-----END PGP SIGNATURE-----
diff --git a/wiki/src/upgrade/v1/Tails/2.6~rc1/i386/stable/upgrades.yml b/wiki/src/upgrade/v1/Tails/2.6~rc1/i386/stable/upgrades.yml
index 64fbfa4..a22d43e 100644
--- a/wiki/src/upgrade/v1/Tails/2.6~rc1/i386/stable/upgrades.yml
+++ b/wiki/src/upgrade/v1/Tails/2.6~rc1/i386/stable/upgrades.yml
@@ -3,3 +3,18 @@ build-target: i386
 channel: stable
 product-name: Tails
 product-version: 2.6~rc1
+upgrades:
+- details-url: https://tails.boum.org/news/version_2.6/
+  type: major
+  upgrade-paths:
+  - target-files:
+    - sha256: b15a243d196c1a351e6f07db0774353f12d54cad243a09bb92234138596d22a6
+      size: 1167990784
+      url: http://dl.amnesia.boum.org/tails/stable/tails-i386-2.6/tails-i386-2.6.iso
+    type: full
+  - target-files:
+    - sha256: 5e988634ae60ee56d23a1eeac8c0144a6ec519f03c81d527660e3dcd97564047
+      size: 189378560
+      url: http://dl.amnesia.boum.org/tails/stable/iuk/Tails_i386_2.6~rc1_to_2.6.iuk
+    type: incremental
+  version: '2.6'
diff --git a/wiki/src/upgrade/v1/Tails/2.6~rc1/i386/stable/upgrades.yml.pgp b/wiki/src/upgrade/v1/Tails/2.6~rc1/i386/stable/upgrades.yml.pgp
index 00601e8..ecfcd6f 100644
--- a/wiki/src/upgrade/v1/Tails/2.6~rc1/i386/stable/upgrades.yml.pgp
+++ b/wiki/src/upgrade/v1/Tails/2.6~rc1/i386/stable/upgrades.yml.pgp
@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNATURE-----
 
-iQIcBAABCgAGBQJXVecIAAoJEJj+xrx1Kj22yLMP/0maGrdROh8WPvXXUpASGRCv
-SePNR3/ly8A6nHR0JS34qDy0jz6vaKLXWOzcxmpNHmqUSi84LIX1sTqpML/PfouX
-FjB40njvQblJz/yST7UX4YH3EUf9u0cA+45Bp5yXVrV3CRboIkAoc+J0tQZ9oKJO
-aXOsSCjjmQlks/OrDZlebt/8j0RwxmcphEQwBfflwpmjsRFK2VMNSPQegESXCzV+
-5dcoXK1CD746sOoyGa2IKz2n0/S6ujroc9/2ZiqqCxgICRtslmya8rnz3wRBRoq8
-O5Je8IdWfRssWIKIe664NHyCgGPBtdpK9wKifcRfkhL2Yhgpfy4OPPBACtLxjoap
-Yf9eb3a06LkX++GOsxeSla4M47j0FUd0FlStX9ZfIohzmI25p8qF2WHhcmFD9GKY
-d+FQ+JpdJtM/J50mDTkVg7v3HAodCNuBXMhBUs+3EkAuB1x6KfhDvy+l863LWVh6
-XH5QITo4gYdxo4lCuDXYJ2gFMXzj4hcyLhO/n4UxrBWM8onGE48lCOROV41TGk/B
-b6G0TazeOK3dMUkk6EVjAVhwIc3rnZs1tb7jar/+o6C7kFg6JpvbM8WT/zvv+vbE
-QGERF/k9eDKAtJj/oTcuSJFFQZ5YpJulJjcLtpNgxomOhxPgUoTOcWqgXIw29sEf
-3+76XAO4rQPzl275JaZy
-=Hb+T
+iQIcBAABCgAGBQJX4V7lAAoJEJj+xrx1Kj22Qf0P/1zaDxdcEXU2v7V/SVfiQU/G
+QOsWrs8oroLTspFg3qNAxJDjyv/ushXuwLrzpD6XId5PnPkoJJ6txMek+Zmdih20
+CtXoWR9/WoOmeQdmfGXvzUygEvdGh1EKsU+ebdvSCE/T+J0Rmquy4CwrydlpL4PR
+hGvl0XmRwgP7mkVhmhzqMnBITzKFLDKJMnGkycDGCi8HXYprMQKxrRfCQ5j8PwKR
+8tSxpboV6X6c4HT03x4zxZw/7RU40sl28h7gHreIbCkYFTw4hFTqzl9Qa7pz/8vU
+WYnbhlw3QEj4WQCVGy6mH2YVDHetM6muhLicW0oxwC7iZnHn4SdEKaBjZKpLQ6ux
+LzaZfBlqHNpLdbp04nmIaPdrsLPEe2+yvcBhxrBm0uKBQ8GGmJFX8nom9DBcZKq4
+wyQX3pYbVdePB8ZS95Yr3uZvYAZntUW1D07khc9J6XrUXrZw2bgRyNufw1gRnrBU
+kla3tavqXCuRDylrLhXWZYwT/UF9l+tsR9LmtdEVTwC0Gs3nZX9n6B2+YL8dD/k8
+8o7C1nJmB5fMK/WCZ1+/9MpdPSmkKwF+k4QajaMr3w2EyudjWeJICF6xt0lUQrBy
+cVipmJ9VfaOJwTuVLrX+yDAWH3kmS3rVtx7XvQYc+77hxis6Dy0Kl+QKKPzxJOnl
+JnjmgWhDmnsmKjhAqEL2
+=f2HC
 -----END PGP SIGNATURE-----