Merge remote-tracking branch 'origin/stable' into stable

6 files changed, 70 insertions, 13 deletions

diff --git a/wiki/src/upgrade/v1/Tails/1.5.2/i386/alpha/upgrades.yml b/wiki/src/upgrade/v1/Tails/1.5.2/i386/alpha/upgrades.yml
new file mode 100644
index 0000000..2648871
--- /dev/null
+++ b/wiki/src/upgrade/v1/Tails/1.5.2/i386/alpha/upgrades.yml
@@ -0,0 +1,5 @@
+---
+build-target: i386
+channel: alpha
+product-name: Tails
+product-version: 1.5.2
diff --git a/wiki/src/upgrade/v1/Tails/1.5.2/i386/alpha/upgrades.yml.pgp b/wiki/src/upgrade/v1/Tails/1.5.2/i386/alpha/upgrades.yml.pgp
new file mode 100644
index 0000000..0c5db9d
--- /dev/null
+++ b/wiki/src/upgrade/v1/Tails/1.5.2/i386/alpha/upgrades.yml.pgp
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIcBAABCgAGBQJV38gYAAoJEJj+xrx1Kj22Gg0P/il3MAzzceyzwCek5uicq1eE
+3j0DMp46dmS39ym++P7wTUeO6PvO0TI1b/9MMLMWiRZ6kQboxVekU6hnp79SwLJ4
+bPLLeoGvDvteFnNMq6LKSqq7dg563BqUWfyUL3Pw285oS+tZpR2lLrY+afnD4LHJ
+c/XQejSr/kUcQOWZyUueorgq/kyxYRXc0/Qd0nAFfKsnP8JHDZ60kedBrQ9dAaTr
+k0EG4cF1Tc1LOUsM/NfW4/048u5LbBIi3qpmvSjw59/zNkf7cNhbfWWZbTdgVENQ
+LYHxQtZiAjkVP+XYehOHHDU0mGsiv6FciFw/W2qBVceb//zyyCt7wpQdSlTmSl4R
+uxCLujzWz6afhMpaOAL/jWSSzg6F2o8fngxsX66pfwXL8VACxZM9vOQsLI4eCItN
+UAZj+s+6d7dNAnNjPo60yTs4wwypQSjO6ad6dlLEA74hTKtD+uMOcBZ/ZRtOW1Tt
+NOibwiO7pdOhB/KDn3wfQrzqMXx6p4WHsL6DudbXJ8cRM6vvfx+DX+eRV3u7BcTE
+59hQBifkOTmqUzHcY5KB5MLgu07jMprJCoxJZiyBqvEoWQ2sS4uecasCtzWO9sYP
+0UjivJS9LOM8XNQ/D66zmhAIJ48LSxJ59jr/AXUn/bmf2cvq08hQ0ZQXz7SWgzXI
+fi9Y6Mj3RffXiFZUh8Rj
+=yrgD
+-----END PGP SIGNATURE-----
diff --git a/wiki/src/upgrade/v1/Tails/1.5.2/i386/stable/upgrades.yml b/wiki/src/upgrade/v1/Tails/1.5.2/i386/stable/upgrades.yml
new file mode 100644
index 0000000..f42b16e
--- /dev/null
+++ b/wiki/src/upgrade/v1/Tails/1.5.2/i386/stable/upgrades.yml
@@ -0,0 +1,5 @@
+---
+build-target: i386
+channel: stable
+product-name: Tails
+product-version: 1.5.2
diff --git a/wiki/src/upgrade/v1/Tails/1.5.2/i386/stable/upgrades.yml.pgp b/wiki/src/upgrade/v1/Tails/1.5.2/i386/stable/upgrades.yml.pgp
new file mode 100644
index 0000000..1be6484
--- /dev/null
+++ b/wiki/src/upgrade/v1/Tails/1.5.2/i386/stable/upgrades.yml.pgp
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIcBAABCgAGBQJV38gRAAoJEJj+xrx1Kj22YwEP/A4/sJiUDIFpG4oMt83HQwtm
+BIDrkwqNWR3B1ZBFGiRjlQHzCaVuDTOd/+S1+fniOhWMdNaHyMUvtRGsJROtMBsv
+0Q6GlTaguR/3+VmIXLotuBd7TI8ug0mYi39n8thL6XRneNXqLeMyzOS1E5Xw+caC
+Og05jMvkR20Ybchi18mpFzkm9dG+hcDqaka5GjFZPZVnIvj4y7/edlU2Hms7Hs9P
+uJHK9nuYI0b11/kXa581anomCtwqmZ4z4we0I9YCqoSXtr8ck/7dHW80crX1ZP7K
+AhGPJGtE5dauUaMOBiFMrQ9KYeH8gRtVoboy2ZgcC/zwaqrkOslUaU3wsmQ019rF
+kTMsiepNcynaWY1mQp4WSfwspzHyAgKVF0s5qObR2NtNdau0xmmgR6FyyBWWRpPQ
+aFXt/i/8LsP648Hy1xxxT7sNtZELyjZm+DnolJyQWXdVheyiap7xZvY8548uTHgR
+i23U2hPo2vZ6SNgUn3GxdIuhgO9Jh46FSJIIpimTcNATc8D9ckWVdrfYCDILjhvo
+Xu3KSYEuwe7FFFXYzHZLywccOt2jOiXX62tvCWMcwbwXrBPhSyVo9qM3TvZCMvds
+sytx/Hok+y1ycA27LQ8SL35aAWgWZDrQmlCI+CDODmsDF4ijWUKivC5+v1SWtb+q
+Gde5yK9JQ6VQIGeTk6HY
+=nrGy
+-----END PGP SIGNATURE-----
diff --git a/wiki/src/upgrade/v1/Tails/1.5/i386/stable/upgrades.yml b/wiki/src/upgrade/v1/Tails/1.5/i386/stable/upgrades.yml
index 284bdb7..1c685ca 100644
--- a/wiki/src/upgrade/v1/Tails/1.5/i386/stable/upgrades.yml
+++ b/wiki/src/upgrade/v1/Tails/1.5/i386/stable/upgrades.yml
@@ -3,3 +3,18 @@ build-target: i386
 channel: stable
 product-name: Tails
 product-version: '1.5'
+upgrades:
+- details-url: https://tails.boum.org/news/version_1.5.1/
+  type: major
+  upgrade-paths:
+  - target-files:
+    - sha256: a4c9ac9eca08562a94914230100e6353d07a0f57c017411c95789351b0366198
+      size: 987033600
+      url: http://dl.amnesia.boum.org/tails/stable/tails-i386-1.5.1/tails-i386-1.5.1.iso
+    type: full
+  - target-files:
+    - sha256: f3d44703a705e19346c645f4724db271e70750d49874834c1b6c5ffcad1c8f18
+      size: 97177600
+      url: http://dl.amnesia.boum.org/tails/stable/iuk/Tails_i386_1.5_to_1.5.1.iuk
+    type: incremental
+  version: 1.5.1
diff --git a/wiki/src/upgrade/v1/Tails/1.5/i386/stable/upgrades.yml.pgp b/wiki/src/upgrade/v1/Tails/1.5/i386/stable/upgrades.yml.pgp
index 75296e7..6b1a373 100644
--- a/wiki/src/upgrade/v1/Tails/1.5/i386/stable/upgrades.yml.pgp
+++ b/wiki/src/upgrade/v1/Tails/1.5/i386/stable/upgrades.yml.pgp
@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNATURE-----
 
-iQIcBAABCgAGBQJVUPM1AAoJEJj+xrx1Kj22jw0P/RksHTbxBN7S2oq2+IfkjK7I
-Yi1HGU1hRJmvlKrguXghSL91iNGH4YYp73eqh055LHjZez2j9v3aC8pz54EtHcNR
-Qm5VN7Wk3o2A/LmxubMmsY0CLEd9EGerDvcR/DoLzyF931MGpAVmEP9vi+9r6YXj
-TnPbiAD4hv80yJO6TnCiQkicPqUJF22MxdhWbujv1Rxpa2QKOXgjzZUv2yIB38Xg
-CD9zdWk6GyY1p0Ol7yqEj7BDqK6pj8UKQOH5qN02Fe9nu7/uzMqcCPCgXiFuXpoK
-fdGeo8xDGlds38AdqATYyMRSh/R4mKJNzQF0CBp/dlIUqIyeyD4FOPAD0pvYYmIg
-btBS+ehmdkANpq9hfOBOXvS0hT9RjL4w3c7zfJ/4q1uYnCms5fpIhxnpuC2BXEOm
-398ayct27DVoJ1SUIlMZkpsjXzST71euWaE9ON0O739E+lNabiherq1zXWyaE3OQ
-J71K8lfXQrDVR6U4MZ2bUowo1xcJr1W6ziFGNlBog529sVb2dJI6jmU3QnhIbfuT
-86T1zKXmQDuLYYauyRorbKIOxVHVgRAoH7YokLZTW8TazKOapulZBNyvrFUedp1Q
-W5ebr0enz6DNvhaRe5FR8qfcOvg66QxHiyZjp16Ku97dXsVZlpWDgx6ZUwf3dIha
-0T/ff/VO7z9BrboKfRap
-=LWDz
+iQIcBAABCgAGBQJV38f9AAoJEJj+xrx1Kj22BNAQAKOEk2cjWw/6pPYkbwE4Br9H
+8l1Tsa2tTWKTeg5YUBN5EqB45aJVHp43fvbEnez7wpnjBtArukBoJnxE4jz5P9Ru
+qcYLsjtghPIqooyHbsF3dRzaPzioKV2Febbgwp5X1iEraX54KwQ2mNVu+J+tQ6Gw
+1AHB7tyPR4HjNVzB3TVXF+6lxL2yPMCWcDoHh3f2RcSXljbKCV8YzIbNshRPwcEL
+aSlZes5FULHIqMWQjD2DRgYT20l/YdlxsLz/cNGjzYRTNH0STYsYqMmadKJmh5u5
+QmE0lsJfalJygUEvG3RDt7D7/STyBE2u5RhJQXOemXbDpVW/jXPbvqpYA/8vRCyV
+MgveDGkp0gGjH1ZtoPqlkEaGXEK7N+MQCRVVLFZvwCZcgK+Y31l+Iov9oHZjAw/P
+I6bYRcV63ygNMqsM26oUAj6XqlQnqyWdfrY8cdBwHBk4km4fO3wqUGmhm8xOAVKA
++LpYxWe71RZa7K1B7XcmkAcaEx/nO8SUN+wjOjrBH5weCN619A6IbwykKvo2EYo7
+dKOX5KrCtWyDDdfIqy69KJoAWyv/cEtP42R8DYbcUQ/NZ+nxpcsCH3V5FHeHEfuy
+ejUzFL1yk3Xnv9IVTpzTXE5Y5U/+Yox8fnPeyeLP1VsOUvFN3ZuxOlIxE9+u8f2K
+Dj2EvB3bnHtTCDU1X7iL
+=INb2
 -----END PGP SIGNATURE-----