debian: Update URL for 6 and 7

5 files changed, 122 insertions, 6 deletions

diff --git a/data/oses/debian.xml.in b/data/oses/debian.xml.in
index 7009e99..f0aa9e8 100644
--- a/data/oses/debian.xml.in
+++ b/data/oses/debian.xml.in
@@ -168,7 +168,7 @@
     </resources>
 
     <media arch="i686">
-      <url>http://cdimage.debian.org/debian-cd/6.0.6/i386/iso-dvd/debian-6.0.6-i386-DVD-1.iso</url>
+      <url>http://cdimage.debian.org/mirror/cdimage/archive/6.0.8/i386/iso-dvd/debian-6.0.8-i386-DVD-1.iso</url>
       <iso>
         <volume-id>Debian 6.0.\d i386 1</volume-id>
       </iso>
@@ -176,7 +176,7 @@
       <initrd>install.386/initrd.gz</initrd>
     </media>
     <media arch="x86_64">
-      <url>http://cdimage.debian.org/debian-cd/6.0.6/amd64/iso-dvd/debian-6.0.6-amd64-DVD-1.iso</url>
+      <url>http://cdimage.debian.org/mirror/cdimage/archive/6.0.8/amd64/iso-dvd/debian-6.0.8-amd64-DVD-1.iso</url>
       <iso>
         <volume-id>Debian 6.0.\d amd64 1</volume-id>
       </iso>
@@ -185,7 +185,7 @@
     </media>
 
     <media arch="i686" live="true">
-      <url>http://live.debian.net/cdimage/release/current/i386/iso-hybrid/debian-live-6.0.6-i386-gnome-desktop.iso</url>
+      <url>http://live.debian.net/cdimage/release/6.0.8/i386/iso-hybrid/debian-live-6.0.8-i386-gnome-desktop.iso</url>
       <iso>
         <volume-id>Debian squeeze.*</volume-id>
         <system-id>LINUX</system-id>
@@ -194,7 +194,7 @@
       <initrd>install/initrd.gz</initrd>
     </media>
     <media arch="x86_64" live="true">
-      <url>http://live.debian.net/cdimage/release/current/amd64/iso-hybrid/debian-live-6.0.6-amd64-gnome-desktop.iso</url>
+      <url>http://live.debian.net/cdimage/release/6.0.8/amd64/iso-hybrid/debian-live-6.0.8-amd64-gnome-desktop.iso</url>
       <iso>
         <volume-id>Debian squeeze.*</volume-id>
         <system-id>LINUX</system-id>
@@ -233,7 +233,7 @@
     </resources>
 
     <media arch="i686">
-      <url>http://cdimage.debian.org/debian-cd/7.0.0/i386/iso-dvd/debian-7.0.0-i386-DVD-1.iso</url>
+      <url>http://cdimage.debian.org/debian-cd/7.3.0/i386/iso-dvd/debian-7.3.0-i386-DVD-1.iso</url>
       <iso>
         <volume-id>Debian 7.\d.\d i386 1</volume-id>
       </iso>
@@ -241,7 +241,7 @@
       <initrd>install.386/initrd.gz</initrd>
     </media>
     <media arch="x86_64">
-      <url>http://cdimage.debian.org/debian-cd/7.0.0/amd64/iso-dvd/debian-7.0.0-amd64-DVD-1.iso</url>
+      <url>http://cdimage.debian.org/debian-cd/7.3.0/amd64/iso-dvd/debian-7.3.0-amd64-DVD-1.iso</url>
       <iso>
         <volume-id>Debian 7.\d.\d amd64 1</volume-id>
       </iso>
diff --git a/test/isodata/debian/debian6/debian-6.0.8-amd64-CD-1.iso.txt b/test/isodata/debian/debian6/debian-6.0.8-amd64-CD-1.iso.txt
new file mode 100644
index 0000000..8f5a8b2
--- /dev/null
+++ b/test/isodata/debian/debian6/debian-6.0.8-amd64-CD-1.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: Debian 6.0.8 amd64 1
+Volume set id: 
+Publisher id: 
+Data preparer id: XORRISO-1.2.6 2013.01.08.103001, LIBISOBURN-1.2.6, LIBISOFS-1.2.6, LIBBURN-1.2.6
+Application id: 
+Copyright File id: 
+Abstract File id: 
+Bibliographic File id: 
+Volume set size is: 1
+Volume set sequence number is: 1
+Logical block size is: 2048
+Volume size is: 2292948
+El Torito VD version 1 found, boot catalog is in sector 9460
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID ''
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 4
+        Bootoff 1C5AAF 1858223
diff --git a/test/isodata/debian/debian6/debian-6.0.8-i386-CD-1.iso.txt b/test/isodata/debian/debian6/debian-6.0.8-i386-CD-1.iso.txt
new file mode 100644
index 0000000..2f92d81
--- /dev/null
+++ b/test/isodata/debian/debian6/debian-6.0.8-i386-CD-1.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: 
+Volume id: Debian 6.0.8 i386 1
+Volume set id: 
+Publisher id: 
+Data preparer id: XORRISO-1.2.6 2013.01.08.103001, LIBISOBURN-1.2.6, LIBISOFS-1.2.6, LIBBURN-1.2.6
+Application id: 
+Copyright File id: 
+Abstract File id: 
+Bibliographic File id: 
+Volume set size is: 1
+Volume set sequence number is: 1
+Logical block size is: 2048
+Volume size is: 2290680
+El Torito VD version 1 found, boot catalog is in sector 9530
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID ''
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 4
+        Bootoff 97C92 621714
diff --git a/test/isodata/debian/debian6/debian-live-6.0.8-amd64-standard.iso.txt b/test/isodata/debian/debian6/debian-live-6.0.8-amd64-standard.iso.txt
new file mode 100644
index 0000000..aae5767
--- /dev/null
+++ b/test/isodata/debian/debian6/debian-live-6.0.8-amd64-standard.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: Debian squeeze 20131021-12:03
+Volume set id: 
+Publisher id: Debian Live project; http://live.debian.net/; debian-live@lists.debian.org
+Data preparer id: live-build 2.0.12-2; http://packages.qa.debian.org/live-build
+Application id: Debian Live
+Copyright File id: 
+Abstract File id: 
+Bibliographic File id: 
+Volume set size is: 1
+Volume set sequence number is: 1
+Logical block size is: 2048
+Volume size is: 579131
+El Torito VD version 1 found, boot catalog is in sector 364
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Debian Live project; ht'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 4
+        Bootoff 16D 365
diff --git a/test/isodata/debian/debian6/debian-live-6.0.8-i386-standard.iso.txt b/test/isodata/debian/debian6/debian-live-6.0.8-i386-standard.iso.txt
new file mode 100644
index 0000000..56a69eb
--- /dev/null
+++ b/test/isodata/debian/debian6/debian-live-6.0.8-i386-standard.iso.txt
@@ -0,0 +1,29 @@
+CD-ROM is in ISO 9660 format
+System id: LINUX
+Volume id: Debian squeeze 20131021-08:21
+Volume set id: 
+Publisher id: Debian Live project; http://live.debian.net/; debian-live@lists.debian.org
+Data preparer id: live-build 2.0.12-2; http://packages.qa.debian.org/live-build
+Application id: Debian Live
+Copyright File id: 
+Abstract File id: 
+Bibliographic File id: 
+Volume set size is: 1
+Volume set sequence number is: 1
+Logical block size is: 2048
+Volume size is: 573578
+El Torito VD version 1 found, boot catalog is in sector 383
+Joliet with UCS level 3 found
+Rock Ridge signatures version 1 found
+Eltorito validation header:
+    Hid 1
+    Arch 0 (x86)
+    ID 'Debian Live project; ht'
+    Key 55 AA
+    Eltorito defaultboot header:
+        Bootid 88 (bootable)
+        Boot media 0 (No Emulation Boot)
+        Load segment 0
+        Sys type 0
+        Nsect 4
+        Bootoff 180 384