From afaf64f3f01b8e2ee1c5a41f8726b14c4396fa63 Mon Sep 17 00:00:00 2001
From: Mario Fetka <mario.fetka@gmail.com>
Date: Mon, 15 Oct 2012 06:33:46 +0200
Subject: [PATCH] Bump to new combined sereby aio 2.0 32 & 64

---
 AiO-Runtimes-x64-v1.3.6.7z.sha1sum |  1 -
 AiO-Runtimes-x86-v1.7.4.7z.sha1sum |  1 -
 aio-runtimes_v2.0.0.7z.sha1sum     |  1 +
 builder-product.cfg                | 18 +++++-------------
 4 files changed, 6 insertions(+), 15 deletions(-)
 delete mode 100644 AiO-Runtimes-x64-v1.3.6.7z.sha1sum
 delete mode 100644 AiO-Runtimes-x86-v1.7.4.7z.sha1sum
 create mode 100644 aio-runtimes_v2.0.0.7z.sha1sum

diff --git a/AiO-Runtimes-x64-v1.3.6.7z.sha1sum b/AiO-Runtimes-x64-v1.3.6.7z.sha1sum
deleted file mode 100644
index a246c84..0000000
--- a/AiO-Runtimes-x64-v1.3.6.7z.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-6b02d299bee3959ede17d8dffb1aa9a40306647b  /home/mario/.opsi-dist-cache/sereby.aio-1.7.4.1.3.6/X86_64/AiO-Runtimes-x64-v1.3.6.7z
diff --git a/AiO-Runtimes-x86-v1.7.4.7z.sha1sum b/AiO-Runtimes-x86-v1.7.4.7z.sha1sum
deleted file mode 100644
index c46e7e9..0000000
--- a/AiO-Runtimes-x86-v1.7.4.7z.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-e0bca1947bdf899064a4669d9263551d19473bdc  /home/mario/.opsi-dist-cache/sereby.aio-1.7.4.1.3.6/X86/AiO-Runtimes-x86-v1.7.4.7z
diff --git a/aio-runtimes_v2.0.0.7z.sha1sum b/aio-runtimes_v2.0.0.7z.sha1sum
new file mode 100644
index 0000000..0f242da
--- /dev/null
+++ b/aio-runtimes_v2.0.0.7z.sha1sum
@@ -0,0 +1 @@
+8fd55cd1515a4bdc240ffe9264bb63fcadb9bf75  /home/mario/.opsi-dist-cache/sereby.aio-2.0.0/X86/aio-runtimes_v2.0.0.7z
diff --git a/builder-product.cfg b/builder-product.cfg
index 1d33aab..7a69a77 100644
--- a/builder-product.cfg
+++ b/builder-product.cfg
@@ -3,9 +3,7 @@
 ############################
 VENDOR="sereby.org"
 PN="sereby.aio"
-VERSION_X86="1.7.4"
-VERSION_X64="1.3.6"
-VERSION="${VERSION_X86}.${VERSION_X64}"
+VERSION="2.0.0"
 RELEASE="1"
 PRIORITY="0"
 ADVICE=""
@@ -25,18 +23,12 @@ ICON_DL_INDEX=0
 DL_FILE[0]="102791693_ff1cd10758.jpg"
 DL_SOURCE[0]="http://www.chip.de/ii/102791693_ff1cd10758.jpg"
 
-## 1: 32 Bit Runtimes
-DL_FILE[1]="AiO-Runtimes-x86-v${VERSION_X86}.7z"
-DL_SOURCE[1]="http://www.computerbase.de/downloads/system/all-in-one-runtimes/56007/?download"
+## 1: 32 & 64 Bit Runtimes
+DL_FILE[1]="aio-runtimes_v${VERSION}.7z"
+DL_SOURCE[1]="http://www.computerbase.de/downloads/system/all-in-one-runtimes/56930/?download"
 DL_ARCH[1]="X86"
 DL_EXTRACT_FORMAT[1]="7zip"
 
-## 2: 64 Bit
-DL_FILE[2]="AiO-Runtimes-x64-v${VERSION_X64}.7z"
-DL_SOURCE[2]="http://www.computerbase.de/downloads/system/all-in-one-runtimes/56006/?download"
-DL_ARCH[2]="X86_64"
-DL_EXTRACT_FORMAT[2]="7zip"
-
 ##################
 ### Variables
 ##################
@@ -45,7 +37,7 @@ WINST_NAME[0]=Install32Exe
 WINST_VALUE[0]="@DL_EXTRACT_WINST_PATH[1]@\\svcpack\\aio-runtimes.exe"
 
 WINST_NAME[1]=Install64Exe
-WINST_VALUE[1]="@DL_EXTRACT_WINST_PATH[2]@\\aio-runtimes.exe"
+WINST_VALUE[1]="@DL_EXTRACT_WINST_PATH[1]@\\svcpack\\aio-runtimes.exe"