Updates for the recommended download of: XP Service Pack 2 (Checked Build)

 - It was before: XP Service Pack 1 (Checked Build)

diff --git a/src/install/acquire/captive-install-acquire.pod.pl.in b/src/install/acquire/captive-install-acquire.pod.pl.in
index 2e2e38e..8fc6887 100644 (file)
--- a/src/install/acquire/captive-install-acquire.pod.pl.in
+++ b/src/install/acquire/captive-install-acquire.pod.pl.in
@@ -135,14 +135,14 @@ Possibly specified directory is always scanned recursively.
 =item B<--microsoft-com>
 
 You can download the best available version of needed drivers from
-I<Microsoft>.  They can be found in I<Microsoft Windows XP Service Pack 1
+I<Microsoft>.  They can be found in I<Microsoft Windows XP Service Pack 2
 Checked Build> (URL
-B<http://www.microsoft.com/WindowsXP/pro/downloads/servicepacks/sp1/checkedbuild.asp>)
+B<http://msdn.microsoft.com/security/productinfo/xpsp2>)
 
 Legal: In some countries you need to have valid I<Microsoft Windows XP> license
 to use it.
 
-Program will need to download approx 29MB of data (the cabinet file is 151MB;
+Program will need to download approx 61MB of data (the cabinet file is 307MB;
 1MB=1e6B here).
 
 

diff --git a/src/install/acquire/microsoftcom.c b/src/install/acquire/microsoftcom.c
index d754d8d..3b41a9d 100644 (file)
--- a/src/install/acquire/microsoftcom.c
+++ b/src/install/acquire/microsoftcom.c
@@ -37,9 +37,9 @@
  * implement custom Gnome-VFS http timeouts as 'ACQUIRE_CABINET_READ_RAW_READ_TIMEOUT'.
  */
 #if 0
-#define MICROSOFTCOM_URL "http://www.microsoft.com/WindowsXP/pro/downloads/servicepacks/sp1/checkedbuild.asp"
+#define MICROSOFTCOM_URL "http://www.microsoft.com/downloads/details.aspx?familyid=7a4d8d12-9f5d-42bb-b31c-7b31657c869c"
 #else
-#define MICROSOFTDOWNLOAD_URL "http://download.microsoft.com/download/9/7/6/9763833d-bd58-41e2-9911-50f64c7252a3/xpsp1a_en_x86_CHK.exe"
+#define MICROSOFTDOWNLOAD_URL "http://download.microsoft.com/download/e/c/6/ec6e00ab-ec05-4673-b8db-0658cf65f043/WindowsXP-KB835935-SP2-DEBUG-ENU.exe"
 #endif
 
 

diff --git a/src/install/acquire/ui-gnome.glade b/src/install/acquire/ui-gnome.glade
index a1ff27c..d8f55c2 100644 (file)
--- a/src/install/acquire/ui-gnome.glade
+++ b/src/install/acquire/ui-gnome.glade
@@ -332,10 +332,10 @@ If you have no idea simply go Forward.</property>
                            <widget class="GtkLabel" id="MicrosoftComInfo">
                              <property name="visible">True</property>
                              <property name="can_focus">True</property>
-                             <property name="label" translatable="yes">You can download the best available version of needed drivers from Microsoft. They can be found in Microsoft Windows XP Service Pack 1 Checked Build.
-URL: http://www.microsoft.com/WindowsXP/pro/downloads/servicepacks/sp1/checkedbuild.asp
+                             <property name="label" translatable="yes">You can download the best available version of needed drivers from Microsoft. They can be found in Microsoft Windows XP Service Pack 2 Checked Build.
+URL: http://msdn.microsoft.com/security/productinfo/xpsp2
 Legal: In some countries you need to have valid Microsoft Windows XP license to use it.
-It is needed to download approx 29MB of data right now out of the 144MB file size. You can also download the file separately and load it in the previous screen if some problems occur.</property>
+It is needed to download approx 61MB of data right now out of the 307MB file size. You can also download the file separately and load it in the previous screen if some problems occur.</property>
                              <property name="use_underline">False</property>
                              <property name="use_markup">False</property>
                              <property name="justify">GTK_JUSTIFY_LEFT</property>

diff --git a/src/install/acquire/ui-line.c b/src/install/acquire/ui-line.c
index fa7a988..fdd3f9a 100644 (file)
--- a/src/install/acquire/ui-line.c
+++ b/src/install/acquire/ui-line.c
@@ -278,10 +278,10 @@ GnomeVFSURI *uri;
                                } while (!all_modules_found && line);
 
                if (ui_line_interactive_ask(_(
-                               "You can download the best available version of needed drivers from Microsoft. They can be found in Microsoft Windows XP Service Pack 1 Checked Build.\n"
-                               "URL: http://www.microsoft.com/WindowsXP/pro/downloads/servicepacks/sp1/checkedbuild.asp\n"
+                               "You can download the best available version of needed drivers from Microsoft. They can be found in Microsoft Windows XP Service Pack 2 Checked Build.\n"
+                               "URL: http://msdn.microsoft.com/security/productinfo/xpsp2\n"
                                "Legal: In some countries you need to have valid Microsoft Windows XP license to use it.\n"
-                               "It is needed to download approx 29MB of data right now out of the 144MB file size. You can also download the file separately and load it in the previous screen if some problems occur.\n")))
+                               "It is needed to download approx 61MB of data right now out of the 307MB file size. You can also download the file separately and load it in the previous screen if some problems occur.\n")))
                        microsoft_com();
                if (!all_modules_found)
                        puts(_("\nWe tried all available drivers acquiration methods - the options will start again."));