summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel P. Berrange <berrange@redhat.com>2012-03-22 11:16:27 (GMT)
committerDaniel P. Berrange <berrange@redhat.com>2012-03-22 16:04:10 (GMT)
commit57bd0bf18ef03c52d77490b0828727f551da6fb1 (patch)
tree706a03e3b3d2c19a04f89a6e8003f9bca18930d3
parent9f6f94492d69e263bcf3efdb28b03f5b1e0d5676 (diff)
downloadlibosinfo-57bd0bf18ef03c52d77490b0828727f551da6fb1.zip
libosinfo-57bd0bf18ef03c52d77490b0828727f551da6fb1.tar.gz
libosinfo-57bd0bf18ef03c52d77490b0828727f551da6fb1.tar.xz
Standardize format for OS id, short-id, distro, version
Standardize the format used for creating 'id' and 'short-id' fields, based on distro, version & vendor website URL - id: http://{VENDORSITE}/{DISTRONAME}/{VERSION} - short-id {DISTRONAME}{VERSION} eg, distro=rhel version=6.0 vendor=Red Hat Then short-id=rhel6.0 id=http://redhat.com/rhel/6.0 Also allow for a second short-id, which can be based on the codename {DISTRONAME}{CODENAME}, eg short-id=ubuntuedgy The exception is windows where the {VERSION} number isn't really a distro version, but rather a kernel version. Use the common distro suffix in short-id / id instead ie, 2k, 2k3, vista, me, 95
-rw-r--r--data/oses/centos.xml4
-rw-r--r--data/oses/debian.xml73
-rw-r--r--data/oses/dos.xml7
-rw-r--r--data/oses/macos.xml16
-rw-r--r--data/oses/mandrake.xml116
-rw-r--r--data/oses/mandriva.xml93
-rw-r--r--data/oses/netbsd.xml28
-rw-r--r--data/oses/netware.xml3
-rw-r--r--data/oses/opensuse.xml60
-rw-r--r--data/oses/rhel.xml168
-rw-r--r--data/oses/rhl.xml40
-rw-r--r--data/oses/solaris.xml12
-rw-r--r--data/oses/suse.xml20
-rw-r--r--data/oses/ubuntu.xml109
-rw-r--r--data/oses/windows.xml161
15 files changed, 488 insertions, 422 deletions
diff --git a/data/oses/centos.xml b/data/oses/centos.xml
index 21ea5ad..1dfb1c7 100644
--- a/data/oses/centos.xml
+++ b/data/oses/centos.xml
@@ -1,7 +1,7 @@
<libosinfo version="0.0.1">
<os id="http://centos.org/centos/6.0">
- <short-id>centos-6.0</short-id>
+ <short-id>centos6.0</short-id>
<name>CentOS 6.0</name>
<version>6.0</version>
<vendor>CentOS</vendor>
@@ -26,7 +26,7 @@
</os>
<os id="http://centos.org/centos/6.1">
- <short-id>centos-6.1</short-id>
+ <short-id>centos6.1</short-id>
<name>CentOS 6.1</name>
<version>6.1</version>
<vendor>CentOS</vendor>
diff --git a/data/oses/debian.xml b/data/oses/debian.xml
index fde58bc..675acd2 100644
--- a/data/oses/debian.xml
+++ b/data/oses/debian.xml
@@ -1,6 +1,7 @@
<libosinfo version="0.0.1">
- <os id="http://debian.org/buzz">
+ <os id="http://debian.org/debian/1.0">
+ <short-id>debian1.0</short-id>
<short-id>debianbuzz</short-id>
<name>Debian Buzz</name>
<version>1.1</version>
@@ -9,104 +10,113 @@
<distro>debian</distro>
</os>
- <os id="http://debian.org/rex">
+ <os id="http://debian.org/debian/1.2">
+ <short-id>debian1.2</short-id>
<short-id>debianrex</short-id>
<name>Debian Rex</name>
<version>1.2</version>
<vendor>Debian Project</vendor>
<family>linux</family>
<distro>debian</distro>
- <upgrades id="http://debian.org/buzz"/>
- <derives-from id="http://debian.org/buzz"/>
+ <upgrades id="http://debian.org/debian/1.0"/>
+ <derives-from id="http://debian.org/debian/1.0"/>
</os>
- <os id="http://debian.org/bo">
+ <os id="http://debian.org/debian/1.3">
+ <short-id>debian1.3</short-id>
<short-id>debianbo</short-id>
<name>Debian Bo</name>
<version>1.3</version>
<vendor>Debian Project</vendor>
<family>linux</family>
<distro>debian</distro>
- <upgrades id="http://debian.org/rex"/>
- <derives-from id="http://debian.org/rex"/>
+ <upgrades id="http://debian.org/debian/1.2"/>
+ <derives-from id="http://debian.org/debian/1.2"/>
</os>
- <os id="http://debian.org/hamm">
+ <os id="http://debian.org/debian/2.0">
+ <short-id>debian2.0</short-id>
<short-id>debianhamm</short-id>
<name>Debian Hamm</name>
<version>2.0</version>
<vendor>Debian Project</vendor>
<family>linux</family>
<distro>debian</distro>
- <upgrades id="http://debian.org/bo"/>
- <derives-from id="http://debian.org/bo"/>
+ <upgrades id="http://debian.org/debian/1.3"/>
+ <derives-from id="http://debian.org/debian/1.3"/>
</os>
- <os id="http://debian.org/silnk">
+ <os id="http://debian.org/debian/2.1">
+ <short-id>debian2.1</short-id>
<short-id>debiansilnk</short-id>
<name>Debian Silnk</name>
<version>2.1</version>
<vendor>Debian Project</vendor>
<family>linux</family>
<distro>debian</distro>
- <upgrades id="http://debian.org/hamm"/>
- <derives-from id="http://debian.org/hamm"/>
+ <upgrades id="http://debian.org/debian/2.0"/>
+ <derives-from id="http://debian.org/debian/2.0"/>
</os>
- <os id="http://debian.org/potato">
+ <os id="http://debian.org/debian/2.2">
+ <short-id>debian2.2</short-id>
<short-id>debianpotato</short-id>
<name>Debian Potato</name>
<version>2.2</version>
<vendor>Debian Project</vendor>
<family>linux</family>
<distro>debian</distro>
- <upgrades id="http://debian.org/silnk"/>
- <derives-from id="http://debian.org/silnk"/>
+ <upgrades id="http://debian.org/debian/2.1"/>
+ <derives-from id="http://debian.org/debian/2.1"/>
</os>
- <os id="http://debian.org/woody">
+ <os id="http://debian.org/debian/3">
+ <short-id>debian3</short-id>
<short-id>debianwoody</short-id>
<name>Debian Woody</name>
<version>3</version>
<vendor>Debian Project</vendor>
<family>linux</family>
<distro>debian</distro>
- <upgrades id="http://debian.org/potato"/>
- <derives-from id="http://debian.org/potato"/>
+ <upgrades id="http://debian.org/debian/2.2"/>
+ <derives-from id="http://debian.org/debian/2.2"/>
</os>
- <os id="http://debian.org/sarge">
+ <os id="http://debian.org/debian/3.1">
+ <short-id>debian3.1</short-id>
<short-id>debiansarge</short-id>
<name>Debian Sarge</name>
<version>3.1</version>
<vendor>Debian Project</vendor>
<family>linux</family>
<distro>debian</distro>
- <upgrades id="http://debian.org/woody"/>
- <derives-from id="http://debian.org/woody"/>
+ <upgrades id="http://debian.org/debian/3"/>
+ <derives-from id="http://debian.org/debian/3"/>
</os>
- <os id="http://debian.org/etch">
+ <os id="http://debian.org/debian/4">
+ <short-id>debian4</short-id>
<short-id>debianetch</short-id>
<name>Debian Etch</name>
<version>4</version>
<vendor>Debian Project</vendor>
<family>linux</family>
<distro>debian</distro>
- <upgrades id="http://debian.org/sarge"/>
- <derives-from id="http://debian.org/sarge"/>
+ <upgrades id="http://debian.org/debian/3.1"/>
+ <derives-from id="http://debian.org/debian/3.1"/>
</os>
- <os id="http://debian.org/lenny">
+ <os id="http://debian.org/debian/5">
+ <short-id>debian5</short-id>
<short-id>debianlenny</short-id>
<name>Debian Lenny</name>
<version>5</version>
<vendor>Debian Project</vendor>
<family>linux</family>
<distro>debian</distro>
- <upgrades id="http://debian.org/etch"/>
- <derives-from id="http://debian.org/etch"/>
+ <upgrades id="http://debian.org/debian/4"/>
+ <derives-from id="http://debian.org/debian/4"/>
<devices>
<device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000"/>
@@ -128,15 +138,16 @@
</resources>
</os>
- <os id="http://debian.org/squeeze">
+ <os id="http://debian.org/debian/6">
+ <short-id>debian6</short-id>
<short-id>debiansqueeze</short-id>
<name>Debian Squeeze</name>
<version>6</version>
<vendor>Debian Project</vendor>
<family>linux</family>
<distro>debian</distro>
- <upgrades id="http://debian.org/lenny"/>
- <derives-from id="http://debian.org/lenny"/>
+ <upgrades id="http://debian.org/debian/5"/>
+ <derives-from id="http://debian.org/debian/5"/>
<devices>
<device id="http://www.linux-usb.org/usb.ids/80ee/0021"/>
diff --git a/data/oses/dos.xml b/data/oses/dos.xml
index 788325b..4f26e3f 100644
--- a/data/oses/dos.xml
+++ b/data/oses/dos.xml
@@ -1,8 +1,9 @@
<libosinfo version="0.0.1">
- <os id="http://microsoft.com/msdos">
- <short-id>msdos</short-id>
- <name>Microsoft MS-DOS</name>
+ <os id="http://microsoft.com/msdos/6.22">
+ <short-id>msdos6.22</short-id>
+ <name>Microsoft MS-DOS 6.22</name>
<vendor>Microsoft</vendor>
+ <version>6.22</version>
<family>msdos</family>
<distro>msdos</distro>
</os>
diff --git a/data/oses/macos.xml b/data/oses/macos.xml
index b2a5799..b66b2d5 100644
--- a/data/oses/macos.xml
+++ b/data/oses/macos.xml
@@ -1,7 +1,7 @@
<libosinfo version="0.0.1">
<os id="http://apple.com/macosx/10.0">
- <short-id>macosx100</short-id>
+ <short-id>macosx10.0</short-id>
<name>MacOS X Cheetah</name>
<version>10.0</version>
<vendor>Apple Inc.</vendor>
@@ -10,7 +10,7 @@
</os>
<os id="http://apple.com/macosx/10.1">
- <short-id>macosx101</short-id>
+ <short-id>macosx10.1</short-id>
<name>MacOS X Puma</name>
<version>10.1</version>
<vendor>Apple Inc.</vendor>
@@ -20,7 +20,7 @@
</os>
<os id="http://apple.com/macosx/10.2">
- <short-id>macosx102</short-id>
+ <short-id>macosx10.2</short-id>
<name>MacOS X Jaghuar</name>
<version>10.2</version>
<vendor>Apple Inc.</vendor>
@@ -30,7 +30,7 @@
</os>
<os id="http://apple.com/macosx/10.3">
- <short-id>macosx103</short-id>
+ <short-id>macosx10.3</short-id>
<name>MacOS X Panther</name>
<version>10.3</version>
<vendor>Apple Inc.</vendor>
@@ -40,7 +40,7 @@
</os>
<os id="http://apple.com/macosx/10.4">
- <short-id>macosx104</short-id>
+ <short-id>macosx10.4</short-id>
<name>MacOS X Tiger</name>
<version>10.4</version>
<vendor>Apple Inc.</vendor>
@@ -50,7 +50,7 @@
</os>
<os id="http://apple.com/macosx/10.5">
- <short-id>macosx105</short-id>
+ <short-id>macosx10.5</short-id>
<name>MacOS X Leopard</name>
<version>10.5</version>
<vendor>Apple Inc.</vendor>
@@ -60,7 +60,7 @@
</os>
<os id="http://apple.com/macosx/10.6">
- <short-id>macosx106</short-id>
+ <short-id>macosx10.6</short-id>
<name>MacOS X Snow Leopard</name>
<version>10.6</version>
<vendor>Apple Inc.</vendor>
@@ -80,7 +80,7 @@
</os>
<os id="http://apple.com/macosx/10.7">
- <short-id>macosx107</short-id>
+ <short-id>macosx10.7</short-id>
<name>MacOS X Lion</name>
<version>10.7</version>
<vendor>Apple Inc.</vendor>
diff --git a/data/oses/mandrake.xml b/data/oses/mandrake.xml
index e0bb48c..294e265 100644
--- a/data/oses/mandrake.xml
+++ b/data/oses/mandrake.xml
@@ -1,202 +1,218 @@
<libosinfo version="0.0.1">
- <os id="http://mandriva.com/linux/mandrake/5.1">
+ <os id="http://mandriva.com/mandrake/5.1">
<short-id>mandrake5.1</short-id>
<name>Mandrake Linux 5.1</name>
<vendor>Mandriva</vendor>
<family>linux</family>
<distro>mandrake</distro>
<codename>Venice</codename>
-
+ <version>5.1</version>
</os>
- <os id="http://mandriva.com/linux/mandrake/5.2">
+ <os id="http://mandriva.com/mandrake/5.2">
<short-id>mandrake5.2</short-id>
<name>Mandrake Linux 5.2</name>
<vendor>Mandriva</vendor>
<family>linux</family>
<distro>mandrake</distro>
<codename>Leeloo</codename>
- <upgrades id="http://mandriva.com/linux/mandrake/5.1"/>
- <derives-from id="http://mandriva.com/linux/mandrake/5.1"/>
+ <version>5.2</version>
+ <upgrades id="http://mandriva.com/mandrake/5.1"/>
+ <derives-from id="http://mandriva.com/mandrake/5.1"/>
</os>
- <os id="http://mandriva.com/linux/mandrake/5.3">
+ <os id="http://mandriva.com/mandrake/5.3">
<short-id>mandrake5.3</short-id>
<name>Mandrake Linux 5.3</name>
<vendor>Mandriva</vendor>
<family>linux</family>
<distro>mandrake</distro>
<codename>Festen</codename>
- <upgrades id="http://mandriva.com/linux/mandrake/5.2"/>
- <derives-from id="http://mandriva.com/linux/mandrake/5.2"/>
+ <version>5.3</version>
+ <upgrades id="http://mandriva.com/mandrake/5.2"/>
+ <derives-from id="http://mandriva.com/mandrake/5.2"/>
</os>
- <os id="http://mandriva.com/linux/mandrake/6.0">
+ <os id="http://mandriva.com/mandrake/6.0">
<short-id>mandrake6.0</short-id>
<name>Mandrake Linux 6.0</name>
<vendor>Mandriva</vendor>
<family>linux</family>
<distro>mandrake</distro>
<codename>Venus</codename>
- <upgrades id="http://mandriva.com/linux/mandrake/5.2"/>
- <derives-from id="http://mandriva.com/linux/mandrake/5.2"/>
+ <version>6.0</version>
+ <upgrades id="http://mandriva.com/mandrake/5.2"/>
+ <derives-from id="http://mandriva.com/mandrake/5.2"/>
</os>
- <os id="http://mandriva.com/linux/mandrake/6.1">
+ <os id="http://mandriva.com/mandrake/6.1">
<short-id>mandrake6.1</short-id>
<name>Mandrake Linux 6.1</name>
<vendor>Mandriva</vendor>
<family>linux</family>
<distro>mandrake</distro>
<codename>Helios</codename>
- <upgrades id="http://mandriva.com/linux/mandrake/6.0"/>
- <derives-from id="http://mandriva.com/linux/mandrake/6.0"/>
+ <version>6.1</version>
+ <upgrades id="http://mandriva.com/mandrake/6.0"/>
+ <derives-from id="http://mandriva.com/mandrake/6.0"/>
</os>
- <os id="http://mandriva.com/linux/mandrake/7.0">
+ <os id="http://mandriva.com/mandrake/7.0">
<short-id>mandrake7.0</short-id>
<name>Mandrake Linux 7.0</name>
<vendor>Mandriva</vendor>
<family>linux</family>
<distro>mandrake</distro>
<codename>Air</codename>
- <upgrades id="http://mandriva.com/linux/mandrake/6.1"/>
- <derives-from id="http://mandriva.com/linux/mandrake/6.1"/>
+ <version>7.0</version>
+ <upgrades id="http://mandriva.com/mandrake/6.1"/>
+ <derives-from id="http://mandriva.com/mandrake/6.1"/>
</os>
- <os id="http://mandriva.com/linux/mandrake/7.1">
+ <os id="http://mandriva.com/mandrake/7.1">
<short-id>mandrake7.1</short-id>
<name>Mandrake Linux 7.1</name>
<vendor>Mandriva</vendor>
<family>linux</family>
<distro>mandrake</distro>
<codename>Helium</codename>
- <upgrades id="http://mandriva.com/linux/mandrake/7.0"/>
- <derives-from id="http://mandriva.com/linux/mandrake/7.0"/>
+ <version>7.1</version>
+ <upgrades id="http://mandriva.com/mandrake/7.0"/>
+ <derives-from id="http://mandriva.com/mandrake/7.0"/>
</os>
- <os id="http://mandriva.com/linux/mandrake/7.2">
+ <os id="http://mandriva.com/mandrake/7.2">
<short-id>mandrake7.2</short-id>
<name>Mandrake Linux 7.2</name>
<vendor>Mandriva</vendor>
<family>linux</family>
<distro>mandrake</distro>
<codename>Odyssey</codename>
- <upgrades id="http://mandriva.com/linux/mandrake/7.1"/>
- <derives-from id="http://mandriva.com/linux/mandrake/7.1"/>
+ <version>7.2</version>
+ <upgrades id="http://mandriva.com/mandrake/7.1"/>
+ <derives-from id="http://mandriva.com/mandrake/7.1"/>
</os>
- <os id="http://mandriva.com/linux/mandrake/8.0">
+ <os id="http://mandriva.com/mandrake/8.0">
<short-id>mandrake8.0</short-id>
<name>Mandrake Linux 8.0</name>
<vendor>Mandriva</vendor>
<family>linux</family>
<distro>mandrake</distro>
<codename>Traktopel</codename>
- <upgrades id="http://mandriva.com/linux/mandrake/7.2"/>
- <derives-from id="http://mandriva.com/linux/mandrake/7.2"/>
+ <version>8.0</version>
+ <upgrades id="http://mandriva.com/mandrake/7.2"/>
+ <derives-from id="http://mandriva.com/mandrake/7.2"/>
</os>
- <os id="http://mandriva.com/linux/mandrake/8.1">
+ <os id="http://mandriva.com/mandrake/8.1">
<short-id>mandrake8.1</short-id>
<name>Mandrake Linux 8.1</name>
<vendor>Mandriva</vendor>
<family>linux</family>
<distro>mandrake</distro>
<codename>Vitamin</codename>
- <upgrades id="http://mandriva.com/linux/mandrake/8.0"/>
- <derives-from id="http://mandriva.com/linux/mandrake/8.0"/>
+ <version>8.1</version>
+ <upgrades id="http://mandriva.com/mandrake/8.0"/>
+ <derives-from id="http://mandriva.com/mandrake/8.0"/>
</os>
- <os id="http://mandriva.com/linux/mandrake/8.2">
+ <os id="http://mandriva.com/mandrake/8.2">
<short-id>mandrake8.2</short-id>
<name>Mandrake Linux 8.2</name>
<vendor>Mandriva</vendor>
<family>linux</family>
<distro>mandrake</distro>
<codename>Bluebird</codename>
- <upgrades id="http://mandriva.com/linux/mandrake/8.1"/>
- <derives-from id="http://mandriva.com/linux/mandrake/8.1"/>
+ <version>8.2</version>
+ <upgrades id="http://mandriva.com/mandrake/8.1"/>
+ <derives-from id="http://mandriva.com/mandrake/8.1"/>
</os>
- <os id="http://mandriva.com/linux/mandrake/9.0">
+ <os id="http://mandriva.com/mandrake/9.0">
<short-id>mandrake9.0</short-id>
<name>Mandrake Linux 9.0</name>
<vendor>Mandriva</vendor>
<family>linux</family>
<distro>mandrake</distro>
<codename>Dolphin</codename>
- <upgrades id="http://mandriva.com/linux/mandrake/8.2"/>
- <derives-from id="http://mandriva.com/linux/mandrake/8.2"/>
+ <version>9.0</version>
+ <upgrades id="http://mandriva.com/mandrake/8.2"/>
+ <derives-from id="http://mandriva.com/mandrake/8.2"/>
</os>
- <os id="http://mandriva.com/linux/mandrake/9.1">
+ <os id="http://mandriva.com/mandrake/9.1">
<short-id>mandrake9.1</short-id>
<name>Mandrake Linux 9.1</name>
<vendor>Mandriva</vendor>
<family>linux</family>
<distro>mandrake</distro>
<codename>Bamboo</codename>
- <upgrades id="http://mandriva.com/linux/mandrake/9.0"/>
- <derives-from id="http://mandriva.com/linux/mandrake/9.0"/>
+ <version>9.1</version>
+ <upgrades id="http://mandriva.com/mandrake/9.0"/>
+ <derives-from id="http://mandriva.com/mandrake/9.0"/>
</os>
- <os id="http://mandriva.com/linux/mandrake/9.2">
+ <os id="http://mandriva.com/mandrake/9.2">
<short-id>mandrake9.2</short-id>
<name>Mandrake Linux 9.2</name>
<vendor>Mandriva</vendor>
<family>linux</family>
<distro>mandrake</distro>
<codename>FiveStar</codename>
- <upgrades id="http://mandriva.com/linux/mandrake/9.1"/>
- <derives-from id="http://mandriva.com/linux/mandrake/9.1"/>
+ <version>9.2</version>
+ <upgrades id="http://mandriva.com/mandrake/9.1"/>
+ <derives-from id="http://mandriva.com/mandrake/9.1"/>
</os>
- <os id="http://mandriva.com/linux/mandrake/10.0">
+ <os id="http://mandriva.com/mandrake/10.0">
<short-id>mandrake10.0</short-id>
<name>Mandrake Linux 10.0</name>
<vendor>Mandriva</vendor>
<family>linux</family>
<distro>mandrake</distro>
- <upgrades id="http://mandriva.com/linux/mandrake/9.2"/>
- <derives-from id="http://mandriva.com/linux/mandrake/9.2"/>
+ <version>10.0</version>
+ <upgrades id="http://mandriva.com/mandrake/9.2"/>
+ <derives-from id="http://mandriva.com/mandrake/9.2"/>
</os>
- <os id="http://mandriva.com/linux/mandrake/10.1">
+ <os id="http://mandriva.com/mandrake/10.1">
<short-id>mandrake10.1</short-id>
<name>Mandrake Linux 10.1</name>
<vendor>Mandriva</vendor>
<family>linux</family>
<distro>mandrake</distro>
- <upgrades id="http://mandriva.com/linux/mandrake/10.0"/>
- <derives-from id="http://mandriva.com/linux/mandrake/10.0"/>
+ <version>10.1</version>
+ <upgrades id="http://mandriva.com/mandrake/10.0"/>
+ <derives-from id="http://mandriva.com/mandrake/10.0"/>
</os>
- <os id="http://mandriva.com/linux/mandrake/10.2">
+ <os id="http://mandriva.com/mandrake/10.2">
<short-id>mandrake10.2</short-id>
<name>Mandrake Linux 10.2</name>
<vendor>Mandriva</vendor>
<family>linux</family>
<distro>mandrake</distro>
<codename>Leeloo</codename>
- <upgrades id="http://mandriva.com/linux/mandrake/10.1"/>
- <derives-from id="http://mandriva.com/linux/mandrake/10.1"/>
+ <version>10.2</version>
+ <upgrades id="http://mandriva.com/mandrake/10.1"/>
+ <derives-from id="http://mandriva.com/mandrake/10.1"/>
</os>
diff --git a/data/oses/mandriva.xml b/data/oses/mandriva.xml
index 73de583..1426cc8 100644
--- a/data/oses/mandriva.xml
+++ b/data/oses/mandriva.xml
@@ -1,90 +1,98 @@
<libosinfo version="0.0.1">
- <os id="http://mandriva.com/linux/2006.0">
- <short-id>mandriva2006</short-id>
- <name>Mandriva Linux 2006</name>
+ <os id="http://mandriva.com/mandriva/2006.0">
+ <short-id>mandriva2006.0</short-id>
+ <name>Mandriva Linux 2006.0</name>
<vendor>Mandriva</vendor>
<family>linux</family>
<distro>mandriva</distro>
- <upgrades id="http://mandriva.com/linux/mandrake/10.2"/>
- <derives-from id="http://mandriva.com/linux/mandrake/10.2"/>
+ <version>2006.0</version>
+ <upgrades id="http://mandriva.com/mandrake/10.2"/>
+ <derives-from id="http://mandriva.com/mandrake/10.2"/>
</os>
- <os id="http://mandriva.com/linux/2007">
+ <os id="http://mandriva.com/mandriva/2007">
<short-id>mandriva2007</short-id>
<name>Mandriva Linux 2007</name>
<vendor>Mandriva</vendor>
<family>linux</family>
<distro>mandriva</distro>
- <upgrades id="http://mandriva.com/linux/2006.0"/>
- <derives-from id="http://mandriva.com/linux/2006.0"/>
+ <version>2007</version>
+ <upgrades id="http://mandriva.com/mandriva/2006.0"/>
+ <derives-from id="http://mandriva.com/mandriva/2006.0"/>
</os>
- <os id="http://mandriva.com/linux/2007.1">
+ <os id="http://mandriva.com/mandriva/2007.1">
<short-id>mandriva2007.1</short-id>
<name>Mandriva Linux 2007 Spring</name>
<vendor>Mandriva</vendor>
<family>linux</family>
<distro>mandriva</distro>
- <upgrades id="http://mandriva.com/linux/2007"/>
- <derives-from id="http://mandriva.com/linux/2007"/>
+ <version>2007.1</version>
+ <upgrades id="http://mandriva.com/mandriva/2007"/>
+ <derives-from id="http://mandriva.com/mandriva/2007"/>
</os>
- <os id="http://mandriva.com/linux/2008.0">
- <short-id>mandriva2008</short-id>
+ <os id="http://mandriva.com/mandriva/2008.0">
+ <short-id>mandriva2008.0</short-id>
<name>Mandriva Linux 2008</name>
<vendor>Mandriva</vendor>
<family>linux</family>
<distro>mandriva</distro>
- <upgrades id="http://mandriva.com/linux/2007.1"/>
- <derives-from id="http://mandriva.com/linux/2007.1"/>
+ <version>2008.0</version>
+ <upgrades id="http://mandriva.com/mandriva/2007.1"/>
+ <derives-from id="http://mandriva.com/mandriva/2007.1"/>
</os>
- <os id="http://mandriva.com/linux/2008.1">
+ <os id="http://mandriva.com/mandriva/2008.1">
<short-id>mandriva2008.1</short-id>
<name>Mandriva Linux 2008 Spring</name>
<vendor>Mandriva</vendor>
<family>linux</family>
<distro>mandriva</distro>
- <upgrades id="http://mandriva.com/linux/2008.0"/>
- <derives-from id="http://mandriva.com/linux/2008.0"/>
+ <version>2008.1</version>
+ <upgrades id="http://mandriva.com/mandriva/2008.0"/>
+ <derives-from id="http://mandriva.com/mandriva/2008.0"/>
</os>
- <os id="http://mandriva.com/linux/2009.0">
+ <os id="http://mandriva.com/mandriva/2009.0">
<short-id>mandriva2009.0</short-id>
<name>Mandriva Linux 2009</name>
<vendor>Mandriva</vendor>
<family>linux</family>
<distro>mandriva</distro>
- <upgrades id="http://mandriva.com/linux/2008.1"/>
- <derives-from id="http://mandriva.com/linux/2008.1"/>
+ <version>2009.0</version>
+ <upgrades id="http://mandriva.com/mandriva/2008.1"/>
+ <derives-from id="http://mandriva.com/mandriva/2008.1"/>
</os>
- <os id="http://mandriva.com/linux/2009.1">
+ <os id="http://mandriva.com/mandriva/2009.1">
<short-id>mandriva2009.1</short-id>
<name>Mandriva Linux 2009 Spring</name>
<vendor>Mandriva</vendor>
<family>linux</family>
<distro>mandriva</distro>
- <upgrades id="http://mandriva.com/linux/2009.0"/>
- <derives-from id="http://mandriva.com/linux/2009.0"/>
+ <version>2009.1</version>
+ <upgrades id="http://mandriva.com/mandriva/2009.0"/>
+ <derives-from id="http://mandriva.com/mandriva/2009.0"/>
</os>
- <os id="http://mandriva.com/linux/2010.0">
+ <os id="http://mandriva.com/mandriva/2010.0">
<short-id>mandriva2010.0</short-id>
<name>Mandriva Linux 2010</name>
<vendor>Mandriva</vendor>
<family>linux</family>
<distro>mandriva</distro>
- <upgrades id="http://mandriva.com/linux/2009.1"/>
- <derives-from id="http://mandriva.com/linux/2009.1"/>
+ <version>2010.0</version>
+ <upgrades id="http://mandriva.com/mandriva/2009.1"/>
+ <derives-from id="http://mandriva.com/mandriva/2009.1"/>
<devices>
<device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000"/>
@@ -92,59 +100,64 @@
</devices>
</os>
- <os id="http://mandriva.com/linux/2010.1">
+ <os id="http://mandriva.com/mandriva/2010.1">
<short-id>mandriva2010.1</short-id>
<name>Mandriva Linux 2010 Spring</name>
<vendor>Mandriva</vendor>
<family>linux</family>
<distro>mandriva</distro>
- <upgrades id="http://mandriva.com/linux/2010.0"/>
- <derives-from id="http://mandriva.com/linux/2010.0"/>
+ <version>2010.1</version>
+ <upgrades id="http://mandriva.com/mandriva/2010.0"/>
+ <derives-from id="http://mandriva.com/mandriva/2010.0"/>
</os>
- <os id="http://mandriva.com/linux/2010.2">
+ <os id="http://mandriva.com/mandriva/2010.2">
<short-id>mandriva2010.2</short-id>
<name>Mandriva Linux 2010.2</name>
<vendor>Mandriva</vendor>
<family>linux</family>
<distro>mandriva</distro>
- <upgrades id="http://mandriva.com/linux/2010.1"/>
- <derives-from id="http://mandriva.com/linux/2010.1"/>
+ <version>2010.2</version>
+ <upgrades id="http://mandriva.com/mandriva/2010.1"/>
+ <derives-from id="http://mandriva.com/mandriva/2010.1"/>
</os>
- <os id="http://mandriva.com/linux/2011">
+ <os id="http://mandriva.com/mandriva/2011">
<short-id>mandriva2011</short-id>
<name>Mandriva Linux 2011</name>
<vendor>Mandriva</vendor>
<family>linux</family>
<distro>mandriva</distro>
<codename>Hydrogen</codename>
- <upgrades id="http://mandriva.com/linux/2010.2"/>
- <derives-from id="http://mandriva.com/linux/2010.2"/>
+ <version>2011</version>
+ <upgrades id="http://mandriva.com/mandriva/2010.2"/>
+ <derives-from id="http://mandriva.com/mandriva/2010.2"/>
</os>
- <os id="http://mandriva.com/linux/server/5.0">
+ <os id="http://mandriva.com/mes/5.0">
<short-id>mes5</short-id>
<name>Mandriva Enterprise Server 5.0</name>
<version>5.0</version>
<vendor>Mandriva</vendor>
<family>linux</family>
<distro>mes</distro>
+ <version>5.0</version>
</os>
- <os id="http://mandriva.com/linux/server/5.1">
+ <os id="http://mandriva.com/mes/5.1">
<short-id>mes5.1</short-id>
<name>Mandriva Enterprise Server 5.1</name>
<version>5.1</version>
<vendor>Mandriva</vendor>
<family>linux</family>
<distro>mes</distro>
- <upgrades id="http://mandriva.com/linux/server/5.0"/>
- <derives-from id="http://mandriva.com/linux/server/5.0"/>
+ <version>5.1</version>
+ <upgrades id="http://mandriva.com/mes/5.0"/>
+ <derives-from id="http://mandriva.com/mes/5.0"/>
<devices>
<device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000"/>
diff --git a/data/oses/netbsd.xml b/data/oses/netbsd.xml
index 0baa2ce..b755b72 100644
--- a/data/oses/netbsd.xml
+++ b/data/oses/netbsd.xml
@@ -1,7 +1,7 @@
<libosinfo version="0.0.1">
<os id="http://netbsd.org/netbsd/0.8">
- <short-id>netbsd-0.8</short-id>
+ <short-id>netbsd0.8</short-id>
<name>NetBSD 0.8</name>
<version>0.8</version>
<vendor>NetBSD Project</vendor>
@@ -12,7 +12,7 @@
</os>
<os id="http://netbsd.org/netbsd/0.9">
- <short-id>netbsd-0.9</short-id>
+ <short-id>netbsd0.9</short-id>
<name>NetBSD 0.9</name>
<version>0.9</version>
<vendor>NetBSD Project</vendor>
@@ -25,7 +25,7 @@
</os>
<os id="http://netbsd.org/netbsd/1.0">
- <short-id>netbsd-1.0</short-id>
+ <short-id>netbsd1.0</short-id>
<name>NetBSD 1.0</name>
<version>1.0</version>
<vendor>NetBSD Project</vendor>
@@ -38,7 +38,7 @@
</os>
<os id="http://netbsd.org/netbsd/1.1">
- <short-id>netbsd-1.1</short-id>
+ <short-id>netbsd1.1</short-id>
<name>NetBSD 1.1</name>
<version>1.1</version>
<vendor>NetBSD Project</vendor>
@@ -51,7 +51,7 @@
</os>
<os id="http://netbsd.org/netbsd/1.2">
- <short-id>netbsd-1.2</short-id>
+ <short-id>netbsd1.2</short-id>
<name>NetBSD 1.2</name>
<version>1.2</version>
<vendor>NetBSD Project</vendor>
@@ -64,7 +64,7 @@
</os>
<os id="http://netbsd.org/netbsd/1.3">
- <short-id>netbsd-1.3</short-id>
+ <short-id>netbsd1.3</short-id>
<name>NetBSD 1.3</name>
<version>1.3</version>
<vendor>NetBSD Project</vendor>
@@ -77,7 +77,7 @@
</os>
<os id="http://netbsd.org/netbsd/1.4">
- <short-id>netbsd-1.4</short-id>
+ <short-id>netbsd1.4</short-id>
<name>NetBSD 1.4</name>
<version>1.4</version>
<vendor>NetBSD Project</vendor>
@@ -90,7 +90,7 @@
</os>
<os id="http://netbsd.org/netbsd/1.5">
- <short-id>netbsd-1.5</short-id>
+ <short-id>netbsd1.5</short-id>
<name>NetBSD 1.5</name>
<version>1.5</version>
<vendor>NetBSD Project</vendor>
@@ -103,7 +103,7 @@
</os>
<os id="http://netbsd.org/netbsd/1.6">
- <short-id>netbsd-1.6</short-id>
+ <short-id>netbsd1.6</short-id>
<name>NetBSD 1.6</name>
<version>1.6</version>
<vendor>NetBSD Project</vendor>
@@ -116,7 +116,7 @@
</os>
<os id="http://netbsd.org/netbsd/2.0">
- <short-id>netbsd-2.0</short-id>
+ <short-id>netbsd2.0</short-id>
<name>NetBSD 2.0</name>
<version>2.0</version>
<vendor>NetBSD Project</vendor>
@@ -129,7 +129,7 @@
</os>
<os id="http://netbsd.org/netbsd/3.0">
- <short-id>netbsd-3.0</short-id>
+ <short-id>netbsd3.0</short-id>
<name>NetBSD 3.0</name>
<version>3.0</version>
<vendor>NetBSD Project</vendor>
@@ -142,7 +142,7 @@
</os>
<os id="http://netbsd.org/netbsd/4.0">
- <short-id>netbsd-4.0</short-id>
+ <short-id>netbsd4.0</short-id>
<name>NetBSD 4.0</name>
<version>4.0</version>
<vendor>NetBSD Project</vendor>
@@ -155,7 +155,7 @@
</os>
<os id="http://netbsd.org/netbsd/5.0">
- <short-id>netbsd-5.0</short-id>
+ <short-id>netbsd5.0</short-id>
<name>NetBSD 5.0</name>
<version>5.0</version>
<vendor>NetBSD Project</vendor>
@@ -168,7 +168,7 @@
</os>
<os id="http://netbsd.org/netbsd/5.1">
- <short-id>netbsd-5.1</short-id>
+ <short-id>netbsd5.1</short-id>
<name>NetBSD 5.1</name>
<version>5.1</version>
<vendor>NetBSD Project</vendor>
diff --git a/data/oses/netware.xml b/data/oses/netware.xml
index 50e20fe..a90409e 100644
--- a/data/oses/netware.xml
+++ b/data/oses/netware.xml
@@ -5,6 +5,7 @@
<vendor>Novell</vendor>
<family>netware</family>
<distro>netware</distro>
+ <version>4</version>
</os>
<os id="http://novell.com/netware5">
@@ -13,6 +14,7 @@
<vendor>Novell</vendor>
<family>netware</family>
<distro>netware</distro>
+ <version>5</version>
</os>
<os id="http://novell.com/netware6">
@@ -21,6 +23,7 @@
<vendor>Novell</vendor>
<family>netware</family>
<distro>netware</distro>
+ <version>6</version>
</os>
</libosinfo>
diff --git a/data/oses/opensuse.xml b/data/oses/opensuse.xml
index 52d8882..85c656f 100644
--- a/data/oses/opensuse.xml
+++ b/data/oses/opensuse.xml
@@ -1,7 +1,7 @@
<libosinfo version="0.0.1">
- <os id="http://opensuse.org/linux/10.2">
- <short-id>opensuse102</short-id>
+ <os id="http://opensuse.org/opensuse/10.2">
+ <short-id>opensuse10.2</short-id>
<name>openSUSE 10.2</name>
<version>10.2</version>
<vendor>openSUSE</vendor>
@@ -9,59 +9,59 @@
<distro>opensuse</distro>
</os>
- <os id="http://opensuse.org/linux/10.3">
- <short-id>opensuse103</short-id>
+ <os id="http://opensuse.org/opensuse/10.3">
+ <short-id>opensuse10.3</short-id>
<name>openSUSE 10.3</name>
<version>10.3</version>
<vendor>openSUSE</vendor>
<family>linux</family>
<distro>opensuse</distro>
- <upgrades id="http://opensuse.org/linux/10.2" />
- <derives-from id="http://opensuse.org/linux/10.2" />
+ <upgrades id="http://opensuse.org/opensuse/10.2" />
+ <derives-from id="http://opensuse.org/opensuse/10.2" />
</os>
- <os id="http://opensuse.org/linux/11.0">
- <short-id>opensuse110</short-id>
+ <os id="http://opensuse.org/opensuse/11.0">
+ <short-id>opensuse11.0</short-id>
<name>openSUSE 11.0</name>
<version>11.0</version>
<vendor>openSUSE</vendor>
<family>linux</family>
<distro>opensuse</distro>
- <upgrades id="http://opensuse.org/linux/10.3" />
- <derives-from id="http://opensuse.org/linux/10.3" />
+ <upgrades id="http://opensuse.org/opensuse/10.3" />
+ <derives-from id="http://opensuse.org/opensuse/10.3" />
</os>
- <os id="http://opensuse.org/linux/11.1">
- <short-id>opensuse111</short-id>
+ <os id="http://opensuse.org/opensuse/11.1">
+ <short-id>opensuse11.1</short-id>
<name>openSUSE 11.1</name>
<version>11.1</version>
<vendor>openSUSE</vendor>
<family>linux</family>
<distro>opensuse</distro>
- <upgrades id="http://opensuse.org/linux/11.0" />
- <derives-from id="http://opensuse.org/linux/11.0" />
+ <upgrades id="http://opensuse.org/opensuse/11.0" />
+ <derives-from id="http://opensuse.org/opensuse/11.0" />
</os>
- <os id="http://opensuse.org/linux/11.2">
- <short-id>opensuse112</short-id>
+ <os id="http://opensuse.org/opensuse/11.2">
+ <short-id>opensuse11.2</short-id>
<name>openSUSE 11.2</name>
<version>11.2</version>
<vendor>openSUSE</vendor>
<family>linux</family>
<distro>opensuse</distro>
- <upgrades id="http://opensuse.org/linux/11.1" />
- <derives-from id="http://opensuse.org/linux/11.1" />
+ <upgrades id="http://opensuse.org/opensuse/11.1" />
+ <derives-from id="http://opensuse.org/opensuse/11.1" />
</os>
- <os id="http://opensuse.org/linux/11.3">
- <short-id>opensuse113</short-id>
+ <os id="http://opensuse.org/opensuse/11.3">
+ <short-id>opensuse11.3</short-id>
<name>openSUSE 11.3</name>
<version>11.3</version>
<vendor>openSUSE</vendor>
<family>linux</family>
<distro>opensuse</distro>
- <upgrades id="http://opensuse.org/linux/11.2" />
- <derives-from id="http://opensuse.org/linux/11.2" />
+ <upgrades id="http://opensuse.org/opensuse/11.2" />
+ <derives-from id="http://opensuse.org/opensuse/11.2" />
<media arch="i586">
<url>http://download.opensuse.org/distribution/11.3/iso/openSUSE-11.3-DVD-i586.iso?mirrorlist</url>
@@ -119,15 +119,15 @@
</resources>
</os>
- <os id="http://opensuse.org/linux/11.4">
- <short-id>opensuse114</short-id>
+ <os id="http://opensuse.org/opensuse/11.4">
+ <short-id>opensuse11.4</short-id>
<name>openSUSE 11.4</name>
<version>11.4</version>
<vendor>openSUSE</vendor>
<family>linux</family>
<distro>opensuse</distro>
- <upgrades id="http://opensuse.org/linux/11.3" />
- <derives-from id="http://opensuse.org/linux/11.3" />
+ <upgrades id="http://opensuse.org/opensuse/11.3" />
+ <derives-from id="http://opensuse.org/opensuse/11.3" />
<media arch="i586">
<url>http://download.opensuse.org/distribution/11.4/iso/openSUSE-11.4-DVD-i586.iso?mirrorlist</url>
@@ -177,15 +177,15 @@
</resources>
</os>
- <os id="http://opensuse.org/linux/12.1">
- <short-id>opensuse121</short-id>
+ <os id="http://opensuse.org/opensuse/12.1">
+ <short-id>opensuse12.1</short-id>
<name>openSUSE 12.1</name>
<version>12.1</version>
<vendor>openSUSE</vendor>
<family>linux</family>
<distro>opensuse</distro>
- <upgrades id="http://opensuse.org/linux/11.4" />
- <derives-from id="http://opensuse.org/linux/11.4" />
+ <upgrades id="http://opensuse.org/opensuse/11.4" />
+ <derives-from id="http://opensuse.org/opensuse/11.4" />
<media arch="i586">
<url>http://download.opensuse.org/distribution/12.1/iso/openSUSE-12.1-DVD-i586.iso?mirrorlist</url>
diff --git a/data/oses/rhel.xml b/data/oses/rhel.xml
index f03c152..14414a8 100644
--- a/data/oses/rhel.xml
+++ b/data/oses/rhel.xml
@@ -3,7 +3,7 @@
<!-- RHEL-2.1 Pensacola -->
<os id="http://redhat.com/rhel/2.1">
- <short-id>rhel-2.1</short-id>
+ <short-id>rhel2.1</short-id>
<name>Red Hat Enterprise Linux 2.1</name>
<version>2.1</version>
<vendor>Red Hat, Inc</vendor>
@@ -15,8 +15,8 @@
<eol-date>2009-05-31</eol-date>
</os>
- <os id="http://redhat.com/rhel/2.1/u1">
- <short-id>rhel-2.1-u1</short-id>
+ <os id="http://redhat.com/rhel/2.1.1">
+ <short-id>rhel2.1.1</short-id>
<name>Red Hat Enterprise Linux 2.1 Update 1</name>
<version>2.1.1</version>
<vendor>Red Hat, Inc</vendor>
@@ -30,91 +30,91 @@
<eol-date>2009-05-31</eol-date>
</os>
- <os id="http://redhat.com/rhel/2.1/u2">
- <short-id>rhel-2.1-u2</short-id>
+ <os id="http://redhat.com/rhel/2.1.2">
+ <short-id>rhel2.1.2</short-id>
<name>Red Hat Enterprise Linux 2.1 Update 2</name>
<version>2.1.2</version>
<vendor>Red Hat, Inc</vendor>
<family>linux</family>
<distro>rhel</distro>
<codename>Pensacola</codename>
- <upgrades id="http://redhat.com/rhel/2.1/u1"/>
- <derives-from id="http://redhat.com/rhel/2.1/u1"/>
+ <upgrades id="http://redhat.com/rhel/2.1.1"/>
+ <derives-from id="http://redhat.com/rhel/2.1.1"/>
<release-date>2003-05-02</release-date>
<eol-date>2009-05-31</eol-date>
</os>
- <os id="http://redhat.com/rhel/2.1/u3">
- <short-id>rhel-2.1-u3</short-id>
+ <os id="http://redhat.com/rhel/2.1.3">
+ <short-id>rhel2.1.3</short-id>
<name>Red Hat Enterprise Linux 2.1 Update 3</name>
<version>2.1.3</version>
<vendor>Red Hat, Inc</vendor>
<family>linux</family>
<distro>rhel</distro>
<codename>Pensacola</codename>
- <upgrades id="http://redhat.com/rhel/2.1/u2"/>
- <derives-from id="http://redhat.com/rhel/2.1/u2"/>
+ <upgrades id="http://redhat.com/rhel/2.1.2"/>
+ <derives-from id="http://redhat.com/rhel/2.1.2"/>
<release-date>2003-12-19</release-date>
<eol-date>2009-05-31</eol-date>
</os>
- <os id="http://redhat.com/rhel/2.1/u4">
- <short-id>rhel-2.1-u4</short-id>
+ <os id="http://redhat.com/rhel/2.1.4">
+ <short-id>rhel2.1.4</short-id>
<name>Red Hat Enterprise Linux 2.1 Update 4</name>
<version>2.1.4</version>
<vendor>Red Hat, Inc</vendor>
<family>linux</family>
<distro>rhel</distro>
<codename>Pensacola</codename>
- <upgrades id="http://redhat.com/rhel/2.1/u3"/>
- <derives-from id="http://redhat.com/rhel/2.1/u3"/>
+ <upgrades id="http://redhat.com/rhel/2.1.3"/>
+ <derives-from id="http://redhat.com/rhel/2.1.3"/>
<release-date>2004-04-30</release-date>
<eol-date>2009-05-31</eol-date>
</os>
- <os id="http://redhat.com/rhel/2.1/u5">
- <short-id>rhel-2.1-u5</short-id>
+ <os id="http://redhat.com/rhel/2.1.5">
+ <short-id>rhel2.1.5</short-id>
<name>Red Hat Enterprise Linux 2.1 Update 5</name>
<version>2.1.5</version>
<vendor>Red Hat, Inc</vendor>
<family>linux</family>
<distro>rhel</distro>
<codename>Pensacola</codename>
- <upgrades id="http://redhat.com/rhel/2.1/u4"/>
- <derives-from id="http://redhat.com/rhel/2.1/u4"/>
+ <upgrades id="http://redhat.com/rhel/2.1.4"/>
+ <derives-from id="http://redhat.com/rhel/2.1.4"/>
<release-date>2004-08-18</release-date>
<eol-date>2009-05-31</eol-date>
</os>
- <os id="http://redhat.com/rhel/2.1/u6">
- <short-id>rhel-2.1-u6</short-id>
+ <os id="http://redhat.com/rhel/2.1.6">
+ <short-id>rhel2.1.6</short-id>
<name>Red Hat Enterprise Linux 2.1 Update 6</name>
<version>2.1.6</version>
<vendor>Red Hat, Inc</vendor>
<family>linux</family>
<distro>rhel</distro>
<codename>Pensacola</codename>
- <upgrades id="http://redhat.com/rhel/2.1/u5"/>
- <derives-from id="http://redhat.com/rhel/2.1/u5"/>
+ <upgrades id="http://redhat.com/rhel/2.1.5"/>
+ <derives-from id="http://redhat.com/rhel/2.1.5"/>
<release-date>2004-12-13</release-date>
<eol-date>2009-05-31</eol-date>
</os>
- <os id="http://redhat.com/rhel/2.1/u7">
- <short-id>rhel-2.1-u7</short-id>
+ <os id="http://redhat.com/rhel/2.1.7">
+ <short-id>rhel2.1.7</short-id>
<name>Red Hat Enterprise Linux 2.1 Update 7</name>
<version>2.1.7</version>
<vendor>Red Hat, Inc</vendor>
<family>linux</family>
<distro>rhel</distro>
<codename>Pensacola</codename>
- <upgrades id="http://redhat.com/rhel/2.1/u6"/>
- <derives-from id="http://redhat.com/rhel/2.1/u6"/>
+ <upgrades id="http://redhat.com/rhel/2.1.6"/>
+ <derives-from id="http://redhat.com/rhel/2.1.6"/>
<release-date>2005-04-28</release-date>
<eol-date>2009-05-31</eol-date>
@@ -125,7 +125,7 @@
<!-- RHEL-3 Taroon -->
<os id="http://redhat.com/rhel/3">
- <short-id>rhel-3</short-id>
+ <short-id>rhel3</short-id>
<name>Red Hat Enterprise Linux 3</name>
<version>3</version>
<vendor>Red Hat, Inc</vendor>
@@ -137,8 +137,8 @@
<eol-date>2014-01-30</eol-date>
</os>
- <os id="http://redhat.com/rhel/3/u1">
- <short-id>rhel-3-u1</short-id>
+ <os id="http://redhat.com/rhel/3.1">
+ <short-id>rhel3.1</short-id>
<name>Red Hat Enterprise Linux 3 Update 1</name>
<version>3.1</version>
<vendor>Red Hat, Inc</vendor>
@@ -152,8 +152,8 @@
<derives-from id="http://redhat.com/rhel/3"/>
</os>
- <os id="http://redhat.com/rhel/3/u2">
- <short-id>rhel-3-u2</short-id>
+ <os id="http://redhat.com/rhel/3.2">
+ <short-id>rhel3.2</short-id>
<name>Red Hat Enterprise Linux 3 Update 2</name>
<version>3.2</version>
<vendor>Red Hat, Inc</vendor>
@@ -163,12 +163,12 @@
<release-date>2004-05-18</release-date>
<eol-date>2014-01-30</eol-date>
- <upgrades id="http://redhat.com/rhel/3/u1"/>
- <derives-from id="http://redhat.com/rhel/3/u1"/>
+ <upgrades id="http://redhat.com/rhel/3.1"/>
+ <derives-from id="http://redhat.com/rhel/3.1"/>
</os>
- <os id="http://redhat.com/rhel/3/u3">
- <short-id>rhel-3-u3</short-id>
+ <os id="http://redhat.com/rhel/3.3">
+ <short-id>rhel3.3</short-id>
<name>Red Hat Enterprise Linux 3 Update 3</name>
<version>3.3</version>
<vendor>Red Hat, Inc</vendor>
@@ -178,12 +178,12 @@
<release-date>2004-09-03</release-date>
<eol-date>2014-01-30</eol-date>
- <upgrades id="http://redhat.com/rhel/3/u2"/>
- <derives-from id="http://redhat.com/rhel/3/u2"/>
+ <upgrades id="http://redhat.com/rhel/3.2"/>
+ <derives-from id="http://redhat.com/rhel/3.2"/>
</os>
- <os id="http://redhat.com/rhel/3/u4">
- <short-id>rhel-3-u4</short-id>
+ <os id="http://redhat.com/rhel/3.4">
+ <short-id>rhel3.4</short-id>
<name>Red Hat Enterprise Linux 3 Update 4</name>
<version>3.4</version>
<vendor>Red Hat, Inc</vendor>
@@ -193,12 +193,12 @@
<release-date>2004-12-21</release-date>
<eol-date>2014-01-30</eol-date>
- <upgrades id="http://redhat.com/rhel/3/u3"/>
- <derives-from id="http://redhat.com/rhel/3/u3"/>
+ <upgrades id="http://redhat.com/rhel/3.3"/>
+ <derives-from id="http://redhat.com/rhel/3.3"/>
</os>
- <os id="http://redhat.com/rhel/3/u5">
- <short-id>rhel-3-u5</short-id>
+ <os id="http://redhat.com/rhel/3.5">
+ <short-id>rhel3.5</short-id>
<name>Red Hat Enterprise Linux 3 Update 5</name>
<version>3.5</version>
<vendor>Red Hat, Inc</vendor>
@@ -208,12 +208,12 @@
<release-date>2005-05-20</release-date>
<eol-date>2014-01-30</eol-date>
- <upgrades id="http://redhat.com/rhel/3/u4"/>
- <derives-from id="http://redhat.com/rhel/3/u4"/>
+ <upgrades id="http://redhat.com/rhel/3.4"/>
+ <derives-from id="http://redhat.com/rhel/3.4"/>
</os>
- <os id="http://redhat.com/rhel/3/u6">
- <short-id>rhel-3-u6</short-id>
+ <os id="http://redhat.com/rhel/3.6">
+ <short-id>rhel3.6</short-id>
<name>Red Hat Enterprise Linux 3 Update 6</name>
<version>3.6</version>
<vendor>Red Hat, Inc</vendor>
@@ -223,12 +223,12 @@
<release-date>2005-09-28</release-date>
<eol-date>2014-01-30</eol-date>
- <upgrades id="http://redhat.com/rhel/3/u5"/>
- <derives-from id="http://redhat.com/rhel/3/u5"/>
+ <upgrades id="http://redhat.com/rhel/3.5"/>
+ <derives-from id="http://redhat.com/rhel/3.5"/>
</os>
- <os id="http://redhat.com/rhel/3/u7">
- <short-id>rhel-3-u7</short-id>
+ <os id="http://redhat.com/rhel/3.7">
+ <short-id>rhel3.7</short-id>
<name>Red Hat Enterprise Linux 3 Update 7</name>
<version>3.7</version>
<vendor>Red Hat, Inc</vendor>
@@ -238,12 +238,12 @@
<release-date>2006-03-15</release-date>
<eol-date>2014-01-30</eol-date>
- <upgrades id="http://redhat.com/rhel/3/u6"/>
- <derives-from id="http://redhat.com/rhel/3/u6"/>
+ <upgrades id="http://redhat.com/rhel/3.6"/>
+ <derives-from id="http://redhat.com/rhel/3.6"/>
</os>
- <os id="http://redhat.com/rhel/3/u8">
- <short-id>rhel-3-u8</short-id>
+ <os id="http://redhat.com/rhel/3.8">
+ <short-id>rhel3.8</short-id>
<name>Red Hat Enterprise Linux 3 Update 8</name>
<version>3.8</version>
<vendor>Red Hat, Inc</vendor>
@@ -253,12 +253,12 @@
<release-date>2006-07-20</release-date>
<eol-date>2014-01-30</eol-date>
- <upgrades id="http://redhat.com/rhel/3/u7"/>
- <derives-from id="http://redhat.com/rhel/3/u7"/>
+ <upgrades id="http://redhat.com/rhel/3.7"/>
+ <derives-from id="http://redhat.com/rhel/3.7"/>
</os>
- <os id="http://redhat.com/rhel/3/u9">
- <short-id>rhel-3-u9</short-id>
+ <os id="http://redhat.com/rhel/3.9">
+ <short-id>rhel3.9</short-id>
<name>Red Hat Enterprise Linux 3 Update 9</name>
<version>3.9</version>
<vendor>Red Hat, Inc</vendor>
@@ -268,8 +268,8 @@
<release-date>2007-06-15</release-date>
<eol-date>2014-01-30</eol-date>
- <upgrades id="http://redhat.com/rhel/3/u8"/>
- <derives-from id="http://redhat.com/rhel/3/u8"/>
+ <upgrades id="http://redhat.com/rhel/3.8"/>
+ <derives-from id="http://redhat.com/rhel/3.8"/>
</os>
@@ -277,7 +277,7 @@
<!-- RHEL-4 Nahant -->
<os id="http://redhat.com/rhel/4.0">
- <short-id>rhel-4.0</short-id>
+ <short-id>rhel4.0</short-id>
<name>Red Hat Enterprise Linux 4.0</name>
<version>4.0</version>
<vendor>Red Hat, Inc</vendor>
@@ -290,7 +290,7 @@
</os>
<os id="http://redhat.com/rhel/4.1">
- <short-id>rhel-4.1</short-id>
+ <short-id>rhel4.1</short-id>
<name>Red Hat Enterprise Linux 4.1</name>
<version>4.1</version>
<vendor>Red Hat, Inc</vendor>
@@ -305,7 +305,7 @@
</os>
<os id="http://redhat.com/rhel/4.2">
- <short-id>rhel-4.2</short-id>
+ <short-id>rhel4.2</short-id>
<name>Red Hat Enterprise Linux 4.2</name>
<version>4.2</version>
<vendor>Red Hat, Inc</vendor>
@@ -320,7 +320,7 @@
</os>
<os id="http://redhat.com/rhel/4.3">
- <short-id>rhel-4.3</short-id>
+ <short-id>rhel4.3</short-id>
<name>Red Hat Enterprise Linux 4.3</name>
<version>4.3</version>
<vendor>Red Hat, Inc</vendor>
@@ -335,7 +335,7 @@
</os>
<os id="http://redhat.com/rhel/4.4">
- <short-id>rhel-4.4</short-id>
+ <short-id>rhel4.4</short-id>
<name>Red Hat Enterprise Linux 4.4</name>
<version>4.4</version>
<vendor>Red Hat, Inc</vendor>
@@ -350,7 +350,7 @@
</os>
<os id="http://redhat.com/rhel/4.5">
- <short-id>rhel-4.5</short-id>
+ <short-id>rhel4.5</short-id>
<name>Red Hat Enterprise Linux 4.5</name>
<version>4.5</version>
<vendor>Red Hat, Inc</vendor>
@@ -365,7 +365,7 @@
</os>
<os id="http://redhat.com/rhel/4.6">
- <short-id>rhel-4.6</short-id>
+ <short-id>rhel4.6</short-id>
<name>Red Hat Enterprise Linux 4.6</name>
<version>4.6</version>
<vendor>Red Hat, Inc</vendor>
@@ -380,7 +380,7 @@
</os>
<os id="http://redhat.com/rhel/4.7">
- <short-id>rhel-4.7</short-id>
+ <short-id>rhel4.7</short-id>
<name>Red Hat Enterprise Linux 4.7</name>
<version>4.7</version>
<vendor>Red Hat, Inc</vendor>
@@ -395,7 +395,7 @@
</os>
<os id="http://redhat.com/rhel/4.8">
- <short-id>rhel-4.8</short-id>
+ <short-id>rhel4.8</short-id>
<name>Red Hat Enterprise Linux 4.8</name>
<version>4.8</version>
<vendor>Red Hat, Inc</vendor>
@@ -423,7 +423,7 @@
</os>
<os id="http://redhat.com/rhel/4.9">
- <short-id>rhel-4.9</short-id>
+ <short-id>rhel4.9</short-id>
<name>Red Hat Enterprise Linux 4.9</name>
<version>4.9</version>
<vendor>Red Hat, Inc</vendor>
@@ -455,7 +455,7 @@
<!-- RHEL-5 Tikanga -->
<os id="http://redhat.com/rhel/5.0">
- <short-id>rhel-5.0</short-id>
+ <short-id>rhel5.0</short-id>
<name>Red Hat Enterprise Linux 5.0</name>
<version>5.0</version>
<vendor>Red Hat, Inc</vendor>
@@ -469,7 +469,7 @@
<os id="http://redhat.com/rhel/5.1">
- <short-id>rhel-5.1</short-id>
+ <short-id>rhel5.1</short-id>
<name>Red Hat Enterprise Linux 5.1</name>
<version>5.1</version>
<vendor>Red Hat, Inc</vendor>
@@ -484,7 +484,7 @@
</os>
<os id="http://redhat.com/rhel/5.2">
- <short-id>rhel-5.2</short-id>
+ <short-id>rhel5.2</short-id>
<name>Red Hat Enterprise Linux 5.2</name>
<version>5.2</version>
<vendor>Red Hat, Inc</vendor>
@@ -499,7 +499,7 @@
</os>
<os id="http://redhat.com/rhel/5.3">
- <short-id>rhel-5.3</short-id>
+ <short-id>rhel5.3</short-id>
<name>Red Hat Enterprise Linux 5.3</name>
<version>5.3</version>
<vendor>Red Hat, Inc</vendor>
@@ -514,7 +514,7 @@
</os>
<os id="http://redhat.com/rhel/5.4">
- <short-id>rhel-5.4</short-id>
+ <short-id>rhel5.4</short-id>
<name>Red Hat Enterprise Linux 5.4</name>
<version>5.4</version>
<vendor>Red Hat, Inc</vendor>
@@ -542,7 +542,7 @@
</os>
<os id="http://redhat.com/rhel/5.5">
- <short-id>rhel-5.5</short-id>
+ <short-id>rhel5.5</short-id>
<name>Red Hat Enterprise Linux 5.5</name>
<version>5.5</version>
<vendor>Red Hat, Inc</vendor>
@@ -557,7 +557,7 @@
</os>
<os id="http://redhat.com/rhel/5.6">
- <short-id>rhel-5.6</short-id>
+ <short-id>rhel5.6</short-id>
<name>Red Hat Enterprise Linux 5.6</name>
<version>5.6</version>
<vendor>Red Hat, Inc</vendor>
@@ -590,7 +590,7 @@
</os>
<os id="http://redhat.com/rhel/5.7">
- <short-id>rhel-5.7</short-id>
+ <short-id>rhel5.7</short-id>
<name>Red Hat Enterprise Linux 5.7</name>
<version>5.7</version>
<vendor>Red Hat, Inc</vendor>
@@ -618,7 +618,7 @@
</os>
<os id="http://redhat.com/rhel/5.8">
- <short-id>rhel-5.8</short-id>
+ <short-id>rhel5.8</short-id>
<name>Red Hat Enterprise Linux 5.8</name>
<version>5.8</version>
<vendor>Red Hat, Inc</vendor>
@@ -637,7 +637,7 @@
<!-- RHEL-6 Santiago -->
<os id="http://redhat.com/rhel/6.0">
- <short-id>rhel-6.0</short-id>
+ <short-id>rhel6.0</short-id>
<name>Red Hat Enterprise Linux 6.0</name>
<version>6.0</version>
<vendor>Red Hat, Inc</vendor>
@@ -669,7 +669,7 @@
</os>
<os id="http://redhat.com/rhel/6.1">
- <short-id>rhel-6.1</short-id>
+ <short-id>rhel6.1</short-id>
<name>Red Hat Enterprise Linux 6.1</name>
<version>6.1</version>
<vendor>Red Hat, Inc</vendor>
@@ -697,7 +697,7 @@
</os>
<os id="http://redhat.com/rhel/6.2">
- <short-id>rhel-6.2</short-id>
+ <short-id>rhel6.2</short-id>
<name>Red Hat Enterprise Linux 6.2</name>
<version>6.2</version>
<vendor>Red Hat, Inc</vendor>
diff --git a/data/oses/rhl.xml b/data/oses/rhl.xml
index af531fd..c98e0a3 100644
--- a/data/oses/rhl.xml
+++ b/data/oses/rhl.xml
@@ -1,7 +1,7 @@
<libosinfo version="0.0.1">
<os id="http://redhat.com/rhl/1.0">
- <short-id>rhl-1.0</short-id>
+ <short-id>rhl1.0</short-id>
<name>Red Hat Linux 1.0</name>
<version>1.0</version>
<vendor>Red Hat, Inc</vendor>
@@ -13,7 +13,7 @@
</os>
<os id="http://redhat.com/rhl/1.1">
- <short-id>rhl-1.1</short-id>
+ <short-id>rhl1.1</short-id>
<name>Red Hat Linux 1.1</name>
<version>1.1</version>
<vendor>Red Hat, Inc</vendor>
@@ -27,7 +27,7 @@
</os>
<os id="http://redhat.com/rhl/2.0">
- <short-id>rhl-2.0</short-id>
+ <short-id>rhl2.0</short-id>
<name>Red Hat Linux 2.0</name>
<version>2.0</version>
<vendor>Red Hat, Inc</vendor>
@@ -40,7 +40,7 @@
</os>
<os id="http://redhat.com/rhl/2.1">
- <short-id>rhl-2.1</short-id>
+ <short-id>rhl2.1</short-id>
<name>Red Hat Linux 2.1</name>
<version>2.1</version>
<vendor>Red Hat, Inc</vendor>
@@ -53,7 +53,7 @@
</os>
<os id="http://redhat.com/rhl/3.0.3">
- <short-id>rhl-3.0.3</short-id>
+ <short-id>rhl3.0.3</short-id>
<name>Red Hat Linux 3.0.3</name>
<version>3.0.3</version>
<vendor>Red Hat, Inc</vendor>
@@ -67,7 +67,7 @@
</os>
<os id="http://redhat.com/rhl/4.0">
- <short-id>rhl-4.0</short-id>
+ <short-id>rhl4.0</short-id>
<name>Red Hat Linux 4.0</name>
<version>4.0</version>
<vendor>Red Hat, Inc</vendor>
@@ -81,7 +81,7 @@
</os>
<os id="http://redhat.com/rhl/4.1">
- <short-id>rhl-4.1</short-id>
+ <short-id>rhl4.1</short-id>
<name>Red Hat Linux 4.1</name>
<version>4.1</version>
<vendor>Red Hat, Inc</vendor>
@@ -95,7 +95,7 @@
</os>
<os id="http://redhat.com/rhl/4.2">
- <short-id>rhl-4.2</short-id>
+ <short-id>rhl4.2</short-id>
<name>Red Hat Linux 4.2</name>
<version>4.2</version>
<vendor>Red Hat, Inc</vendor>
@@ -109,7 +109,7 @@
</os>
<os id="http://redhat.com/rhl/5.0">
- <short-id>rhl-5.0</short-id>
+ <short-id>rhl5.0</short-id>
<name>Red Hat Linux 5.0</name>
<version>5.0</version>
<vendor>Red Hat, Inc</vendor>
@@ -123,7 +123,7 @@
</os>
<os id="http://redhat.com/rhl/5.1">
- <short-id>rhl-5.1</short-id>
+ <short-id>rhl5.1</short-id>
<name>Red Hat Linux 5.1</name>
<version>5.1</version>
<vendor>Red Hat, Inc</vendor>
@@ -137,7 +137,7 @@
</os>
<os id="http://redhat.com/rhl/5.2">
- <short-id>rhl-5.2</short-id>
+ <short-id>rhl5.2</short-id>
<name>Red Hat Linux 5.2</name>
<version>5.2</version>
<vendor>Red Hat, Inc</vendor>
@@ -151,7 +151,7 @@
</os>
<os id="http://redhat.com/rhl/6.0">
- <short-id>rhl-6.0</short-id>
+ <short-id>rhl6.0</short-id>
<name>Red Hat Linux 6.0</name>
<version>6.0</version>
<vendor>Red Hat, Inc</vendor>
@@ -165,7 +165,7 @@
</os>
<os id="http://redhat.com/rhl/6.1">
- <short-id>rhl-6.1</short-id>
+ <short-id>rhl6.1</short-id>
<name>Red Hat Linux 6.1</name>
<version>6.1</version>
<vendor>Red Hat, Inc</vendor>
@@ -179,7 +179,7 @@
</os>
<os id="http://redhat.com/rhl/6.2">
- <short-id>rhl-6.2</short-id>
+ <short-id>rhl6.2</short-id>
<name>Red Hat Linux 6.2</name>
<version>6.0</version>
<vendor>Red Hat, Inc</vendor>
@@ -193,7 +193,7 @@
</os>
<os id="http://redhat.com/rhl/7">
- <short-id>rhl-7</short-id>
+ <short-id>rhl7</short-id>
<name>Red Hat Linux 7</name>
<version>7</version>
<vendor>Red Hat, Inc</vendor>
@@ -207,7 +207,7 @@
</os>
<os id="http://redhat.com/rhl/7.1">
- <short-id>rhl-7.1</short-id>
+ <short-id>rhl7.1</short-id>
<name>Red Hat Linux 7.1</name>
<version>7.1</version>
<vendor>Red Hat, Inc</vendor>
@@ -222,7 +222,7 @@
</os>
<os id="http://redhat.com/rhl/7.2">
- <short-id>rhl-7.2</short-id>
+ <short-id>rhl7.2</short-id>
<name>Red Hat Linux 7.2</name>
<version>7.2</version>
<vendor>Red Hat, Inc</vendor>
@@ -237,7 +237,7 @@
</os>
<os id="http://redhat.com/rhl/7.3">
- <short-id>rhl-7.3</short-id>
+ <short-id>rhl7.3</short-id>
<name>Red Hat Linux 7.3</name>
<version>7.3</version>
<vendor>Red Hat, Inc</vendor>
@@ -252,7 +252,7 @@
</os>
<os id="http://redhat.com/rhl/8.0">
- <short-id>rhl-8.0</short-id>
+ <short-id>rhl8.0</short-id>
<name>Red Hat Linux 8.0</name>
<version>8.0</version>
<vendor>Red Hat, Inc</vendor>
@@ -267,7 +267,7 @@
</os>
<os id="http://redhat.com/rhl/9">
- <short-id>rhl-9</short-id>
+ <short-id>rhl9</short-id>
<name>Red Hat Linux 9</name>
<version>9</version>
<vendor>Red Hat, Inc</vendor>
diff --git a/data/oses/solaris.xml b/data/oses/solaris.xml
index 11e8a0e..fcbe952 100644
--- a/data/oses/solaris.xml
+++ b/data/oses/solaris.xml
@@ -1,6 +1,6 @@
<libosinfo version="0.0.1">
- <os id="http://sun.com/solaris9">
+ <os id="http://sun.com/solaris/9">
<short-id>solaris9</short-id>
<name>Sun Solaris 9</name>
<version>9</version>
@@ -9,23 +9,23 @@
<distro>solaris</distro>
</os>
- <os id="http://sun.com/solaris10">
+ <os id="http://sun.com/solaris/10">
<short-id>solaris10</short-id>
<name>Sun Solaris 10</name>
<version>10</version>
<vendor>Sun</vendor>
<family>solaris</family>
<distro>solaris</distro>
- <upgrades id="http://sun.com/solaris9"/>
+ <upgrades id="http://sun.com/solaris/9"/>
<devices>
<device id="http://www.linux-usb.org/usb.ids/80ee/0021"/>
</devices>
</os>
- <os id="http://oracle.com/opensolaris">
- <short-id>opensolaris</short-id>
- <name>Sun OpenSolaris</name>
+ <os id="http://oracle.com/opensolaris/2009.06">
+ <short-id>opensolaris2009.06</short-id>
+ <name>Sun OpenSolaris 2009.06</name>
<version>2009.06</version>
<vendor>Sun</vendor>
<family>solaris</family>
diff --git a/data/oses/suse.xml b/data/oses/suse.xml
index 4062581..135206f 100644
--- a/data/oses/suse.xml
+++ b/data/oses/suse.xml
@@ -1,6 +1,6 @@
<libosinfo version="0.0.1">
- <os id="http://suse.com/linux/sles9">
+ <os id="http://suse.com/sles/9">
<short-id>sles9</short-id>
<name>Suse Linux Enterprise Server 9</name>
<version>9</version>
@@ -9,24 +9,24 @@
<distro>sles</distro>
</os>
- <os id="http://suse.com/linux/sles10">
+ <os id="http://suse.com/sles/10">
<short-id>sles10</short-id>
<name>Suse Linux Enterprise Server 10</name>
<version>10</version>
<vendor>Novell</vendor>
<family>linux</family>
<distro>sles</distro>
- <upgrades id="http://suse.com/linux/sles9"/>
+ <upgrades id="http://suse.com/sles/9"/>
</os>
- <os id="http://suse.com/linux/sles11">
+ <os id="http://suse.com/sles/11">
<short-id>sles11</short-id>
<name>Suse Linux Enterprise Server 11</name>
<version>11</version>
<vendor>Novell</vendor>
<family>linux</family>
<distro>sles</distro>
- <upgrades id="http://suse.com/linux/sles10"/>
+ <upgrades id="http://suse.com/sles/10"/>
<devices>
<device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1000"/>
@@ -34,7 +34,7 @@
</devices>
</os>
- <os id="http://suse.com/linux/sled9">
+ <os id="http://suse.com/sled/9">
<short-id>sled9</short-id>
<name>Suse Linux Enterprise Desktop 9</name>
<version>9</version>
@@ -43,14 +43,14 @@
<distro>sled</distro>
</os>
- <os id="http://suse.com/linux/sled10">
+ <os id="http://suse.com/sled/10">
<short-id>sled10</short-id>
<name>Suse Linux Enterprise Desktop 10</name>
<version>10</version>
<vendor>Novell</vendor>
<family>linux</family>
<distro>sled</distro>
- <upgrades id="http://suse.com/linux/sled9"/>
+ <upgrades id="http://suse.com/sled/9"/>
<resources arch="all">
<minimum>
@@ -64,14 +64,14 @@
</resources>
</os>
- <os id="http://suse.com/linux/sled11">
+ <os id="http://suse.com/sled/11">
<short-id>sled11</short-id>
<name>Suse Linux Enterprise Desktop 11</name>
<version>11</version>
<vendor>Novell</vendor>
<family>linux</family>
<distro>sled</distro>
- <upgrades id="http://suse.com/linux/sled10"/>
+ <upgrades id="http://suse.com/sled/10"/>
<resources arch="all">
<minimum>
diff --git a/data/oses/ubuntu.xml b/data/oses/ubuntu.xml
index 1eb6540..8ea6fdd 100644
--- a/data/oses/ubuntu.xml
+++ b/data/oses/ubuntu.xml
@@ -1,6 +1,7 @@
<libosinfo version="0.0.1">
- <os id="http://ubuntu.com/warty">
+ <os id="http://ubuntu.com/ubuntu/4.10">
+ <short-id>ubuntu4.10</short-id>
<short-id>ubuntuwarty</short-id>
<name>Ubuntu Warty Warthog</name>
<version>4.10</version>
@@ -42,7 +43,8 @@
</media>
</os>
- <os id="http://ubuntu.com/hoary">
+ <os id="http://ubuntu.com/ubuntu/5.04">
+ <short-id>ubuntu5.04</short-id>
<short-id>ubuntuhoary</short-id>
<name>Ubuntu Hoary Hedgehog</name>
<version>5.04</version>
@@ -50,8 +52,8 @@
<family>linux</family>
<distro>ubuntu</distro>
<codename>Hoary Hedgehog</codename>
- <upgrades id="http://ubuntu.com/warty"/>
- <derives-from id="http://ubuntu.com/warty"/>
+ <upgrades id="http://ubuntu.com/ubuntu/4.10"/>
+ <derives-from id="http://ubuntu.com/ubuntu/4.10"/>
<release-date>2005-04-08</release-date>
<eol-date>2006-10-31</eol-date>
@@ -114,7 +116,8 @@
</os>
- <os id="http://ubuntu.com/breezy">
+ <os id="http://ubuntu.com/ubuntu/5.10">
+ <short-id>ubuntu5.10</short-id>
<short-id>ubuntubreezy</short-id>
<name>Ubuntu Breezy Badger</name>
<version>5.10</version>
@@ -122,8 +125,8 @@
<family>linux</family>
<distro>ubuntu</distro>
<codename>Breezy Badger</codename>
- <upgrades id="http://ubuntu.com/hoary"/>
- <derives-from id="http://ubuntu.com/hoary"/>
+ <upgrades id="http://ubuntu.com/ubuntu/5.04"/>
+ <derives-from id="http://ubuntu.com/ubuntu/5.04"/>
<release-date>2005-10-13</release-date>
<eol-date>2007-04-13</eol-date>
@@ -214,7 +217,8 @@
</os>
- <os id="http://ubuntu.com/dapper">
+ <os id="http://ubuntu.com/ubuntu/6.06">
+ <short-id>ubuntu6.06</short-id>
<short-id>ubuntudapper</short-id>
<name>Ubuntu Dapper Drake LTS</name>
<version>6.06</version>
@@ -222,8 +226,8 @@
<family>linux</family>
<distro>ubuntu</distro>
<codename>Dapper Drake</codename>
- <upgrades id="http://ubuntu.com/breezy"/>
- <derives-from id="http://ubuntu.com/breezy"/>
+ <upgrades id="http://ubuntu.com/ubuntu/5.10"/>
+ <derives-from id="http://ubuntu.com/ubuntu/5.10"/>
<release-date>2006-06-01</release-date>
<eol-date>2011-06-01</eol-date>
@@ -341,7 +345,8 @@
</os>
- <os id="http://ubuntu.com/edgy">
+ <os id="http://ubuntu.com/ubuntu/6.10">
+ <short-id>ubuntu6.10</short-id>
<short-id>ubuntuedgy</short-id>
<name>Ubuntu Edgy Eft</name>
<version>6.10</version>
@@ -349,8 +354,8 @@
<family>linux</family>
<distro>ubuntu</distro>
<codename>Edgy Eft</codename>
- <upgrades id="http://ubuntu.com/dapper"/>
- <derives-from id="http://ubuntu.com/dapper"/>
+ <upgrades id="http://ubuntu.com/ubuntu/6.06"/>
+ <derives-from id="http://ubuntu.com/ubuntu/6.06"/>
<release-date>2006-10-26</release-date>
<eol-date>2008-04-25</eol-date>
@@ -421,7 +426,8 @@
</media>
</os>
- <os id="http://ubuntu.com/feisty">
+ <os id="http://ubuntu.com/ubuntu/7.04">
+ <short-id>ubuntu7.04</short-id>
<short-id>ubuntufeisty</short-id>
<name>Ubuntu Feisty Fawn</name>
<version>7.04</version>
@@ -429,8 +435,8 @@
<family>linux</family>
<distro>ubuntu</distro>
<codename>Feisty Fawn</codename>
- <upgrades id="http://ubuntu.com/edgy"/>
- <derives-from id="http://ubuntu.com/edgy"/>
+ <upgrades id="http://ubuntu.com/ubuntu/6.10"/>
+ <derives-from id="http://ubuntu.com/ubuntu/6.10"/>
<release-date>2007-04-19</release-date>
<eol-date>2008-10-19</eol-date>
@@ -483,7 +489,8 @@
</media>
</os>
- <os id="http://ubuntu.com/gutsy">
+ <os id="http://ubuntu.com/ubuntu/7.10">
+ <short-id>ubuntu7.10</short-id>
<short-id>ubuntugutsy</short-id>
<name>Ubuntu Gutsy Gibbon</name>
<version>7.10</version>
@@ -491,8 +498,8 @@
<family>linux</family>
<distro>ubuntu</distro>
<codename>Gutsy Gibbon</codename>
- <upgrades id="http://ubuntu.com/feisty"/>
- <derives-from id="http://ubuntu.com/feisty"/>
+ <upgrades id="http://ubuntu.com/ubuntu/7.04"/>
+ <derives-from id="http://ubuntu.com/ubuntu/7.04"/>
<release-date>2007-10-18</release-date>
<eol-date>2009-04-18</eol-date>
@@ -545,7 +552,8 @@
</media>
</os>
- <os id="http://ubuntu.com/hardy">
+ <os id="http://ubuntu.com/ubuntu/8.04">
+ <short-id>ubuntu8.04</short-id>
<short-id>ubuntuhardy</short-id>
<name>Ubuntu Hardy Heron LTS</name>
<version>8.04</version>
@@ -553,8 +561,8 @@
<family>linux</family>
<distro>ubuntu</distro>
<codename>Hardy Heron</codename>
- <upgrades id="http://ubuntu.com/gutsy"/>
- <derives-from id="http://ubuntu.com/gutsy"/>
+ <upgrades id="http://ubuntu.com/ubuntu/7.10"/>
+ <derives-from id="http://ubuntu.com/ubuntu/7.10"/>
<release-date>2008-04-24</release-date>
@@ -620,7 +628,8 @@
</media>
</os>
- <os id="http://ubuntu.com/intrepid">
+ <os id="http://ubuntu.com/ubuntu/8.10">
+ <short-id>ubuntu8.10</short-id>
<short-id>ubuntuintrepid</short-id>
<name>Ubuntu Intrepid Ibex</name>
<version>8.10</version>
@@ -628,8 +637,8 @@
<family>linux</family>
<distro>ubuntu</distro>
<codename>Intrepid Ibex</codename>
- <upgrades id="http://ubuntu.com/hardy"/>
- <derives-from id="http://ubuntu.com/hardy"/>
+ <upgrades id="http://ubuntu.com/ubuntu/8.04"/>
+ <derives-from id="http://ubuntu.com/ubuntu/8.04"/>
<release-date>2008-10-30</release-date>
<eol-date>2010-04-30</eol-date>
@@ -673,7 +682,8 @@
</media>
</os>
- <os id="http://ubuntu.com/jaunty">
+ <os id="http://ubuntu.com/ubuntu/9.04">
+ <short-id>ubuntu9.04</short-id>
<short-id>ubuntujaunty</short-id>
<name>Ubuntu Jaunty Jackalope</name>
<version>9.04</version>
@@ -681,8 +691,8 @@
<family>linux</family>
<distro>ubuntu</distro>
<codename>Jaunty Jackalope</codename>
- <upgrades id="http://ubuntu.com/intrepid"/>
- <derives-from id="http://ubuntu.com/intrepid"/>
+ <upgrades id="http://ubuntu.com/ubuntu/8.10"/>
+ <derives-from id="http://ubuntu.com/ubuntu/8.10"/>
<release-date>2009-04-23</release-date>
<eol-date>2010-10-23</eol-date>
@@ -730,7 +740,8 @@
</media>
</os>
- <os id="http://ubuntu.com/karmic">
+ <os id="http://ubuntu.com/ubuntu/9.10">
+ <short-id>ubuntu9.10</short-id>
<short-id>ubuntukarmic</short-id>
<name>Ubuntu Karmic Koala</name>
<version>9.10</version>
@@ -738,8 +749,8 @@
<family>linux</family>
<distro>ubuntu</distro>
<codename>Karmic Koala</codename>
- <upgrades id="http://ubuntu.com/jaunty"/>
- <derives-from id="http://ubuntu.com/jaunty"/>
+ <upgrades id="http://ubuntu.com/ubuntu/9.04"/>
+ <derives-from id="http://ubuntu.com/ubuntu/9.04"/>
<release-date>2009-10-29</release-date>
<eol-date>2011-04-30</eol-date>
@@ -783,7 +794,8 @@
</media>
</os>
- <os id="http://ubuntu.com/lucid">
+ <os id="http://ubuntu.com/ubuntu/10.04">
+ <short-id>ubuntu10.04</short-id>
<short-id>ubuntulucid</short-id>
<name>Ubuntu Lucid Lynx LTS</name>
<version>10.04</version>
@@ -791,8 +803,8 @@
<family>linux</family>
<distro>ubuntu</distro>
<codename>Lucid Lynx</codename>
- <upgrades id="http://ubuntu.com/karmic"/>
- <derives-from id="http://ubuntu.com/karmic"/>
+ <upgrades id="http://ubuntu.com/ubuntu/9.10"/>
+ <derives-from id="http://ubuntu.com/ubuntu/9.10"/>
<release-date>2010-04-29</release-date>
@@ -829,7 +841,8 @@
</media>
</os>
- <os id="http://ubuntu.com/maverick">
+ <os id="http://ubuntu.com/ubuntu/10.10">
+ <short-id>ubuntu10.10</short-id>
<short-id>ubuntumaverick</short-id>
<name>Ubuntu Maverick Meerkat</name>
<version>10.10</version>
@@ -837,8 +850,8 @@
<family>linux</family>
<distro>ubuntu</distro>
<codename>Maverick Meerkat</codename>
- <upgrades id="http://ubuntu.com/lucid"/>
- <derives-from id="http://ubuntu.com/lucid"/>
+ <upgrades id="http://ubuntu.com/ubuntu/10.04"/>
+ <derives-from id="http://ubuntu.com/ubuntu/10.04"/>
<release-date>2010-10-10</release-date>
@@ -859,7 +872,7 @@
<media arch="i386">
<url>http://releases.ubuntu.com/releases/maverick/ubuntu-10.10-server-i386.iso</url>
<iso>
- <volume-id>Ubuntu(-Server)? 10.04 i386</volume-id>
+ <volume-id>Ubuntu(-Server)? 10.10 i386</volume-id>
<system-id>LINUX</system-id>
</iso>
<kernel>casper/vmlinuz</kernel>
@@ -868,7 +881,7 @@
<media arch="x86_64">
<url>http://releases.ubuntu.com/releases/maverick/ubuntu-10.10-server-amd64.iso</url>
<iso>
- <volume-id>Ubuntu(-Server)? 10.04 amd64</volume-id>
+ <volume-id>Ubuntu(-Server)? 10.10 amd64</volume-id>
<system-id>LINUX</system-id>
</iso>
<kernel>casper/vmlinuz</kernel>
@@ -878,7 +891,7 @@
<media arch="i386" live="true">
<url>http://releases.ubuntu.com/releases/maverick/ubuntu-10.10-desktop-i386.iso</url>
<iso>
- <volume-id>Ubuntu 10.04 i386</volume-id>
+ <volume-id>Ubuntu 10.10 i386</volume-id>
<system-id>LINUX</system-id>
</iso>
<kernel>casper/vmlinuz</kernel>
@@ -887,7 +900,7 @@
<media arch="x86_64" live="true">
<url>http://releases.ubuntu.com/releases/maverick/ubuntu-10.10-desktop-amd64.iso</url>
<iso>
- <volume-id>Ubuntu 10.04 amd64</volume-id>
+ <volume-id>Ubuntu 10.10 amd64</volume-id>
<system-id>LINUX</system-id>
</iso>
<kernel>casper/vmlinuz</kernel>
@@ -895,7 +908,8 @@
</media>
</os>
- <os id="http://ubuntu.com/natty">
+ <os id="http://ubuntu.com/ubuntu/11.04">
+ <short-id>ubuntu11.04</short-id>
<short-id>ubuntunatty</short-id>
<name>Ubuntu Natty Narwhal</name>
<version>11.04</version>
@@ -903,8 +917,8 @@
<family>linux</family>
<distro>ubuntu</distro>
<codename>Natty Narwhal</codename>
- <upgrades id="http://ubuntu.com/maverick"/>
- <derives-from id="http://ubuntu.com/maverick"/>
+ <upgrades id="http://ubuntu.com/ubuntu/10.10"/>
+ <derives-from id="http://ubuntu.com/ubuntu/10.10"/>
<release-date>2011-04-28</release-date>
@@ -961,7 +975,8 @@
</media>
</os>
- <os id="http://ubuntu.com/oneiric">
+ <os id="http://ubuntu.com/ubuntu/11.10">
+ <short-id>ubuntu11.10</short-id>
<short-id>ubuntuoneiric</short-id>
<name>Ubuntu Oneiric Ocelot</name>
<version>11.10</version>
@@ -969,8 +984,8 @@
<family>linux</family>
<distro>ubuntu</distro>
<codename>Oneiric Ocelot</codename>
- <upgrades id="http://ubuntu.com/natty"/>
- <derives-from id="http://ubuntu.com/natty"/>
+ <upgrades id="http://ubuntu.com/ubuntu/11.04"/>
+ <derives-from id="http://ubuntu.com/ubuntu/11.04"/>
<release-date>2011-10-13</release-date>
diff --git a/data/oses/windows.xml b/data/oses/windows.xml
index fb92e45..bcf0eb6 100644
--- a/data/oses/windows.xml
+++ b/data/oses/windows.xml
@@ -75,115 +75,122 @@
-->
- <os id="http://microsoft.com/win1.0">
+ <os id="http://microsoft.com/win/1.0">
<short-id>win1.0</short-id>
<name>Microsoft Windows 1.0</name>
<vendor>Microsoft Corporation</vendor>
<family>win16</family>
- <distro>windows</distro>
+ <distro>win</distro>
+ <version>1.0</version>
<release-date>1985-11-20</release-date>
<eol-date>2001-12-31</eol-date>
</os>
- <os id="http://microsoft.com/win2.0">
+ <os id="http://microsoft.com/win/2.0">
<short-id>win2.0</short-id>
<name>Microsoft Windows 2.0</name>
<vendor>Microsoft Corporation</vendor>
<family>win16</family>
- <distro>windows</distro>
- <upgrades id="http://microsoft.com/win1.0"/>
- <derives-from id="http://microsoft.com/win1.0"/>
+ <distro>win</distro>
+ <version>2.0</version>
+ <upgrades id="http://microsoft.com/win/1.0"/>
+ <derives-from id="http://microsoft.com/win/1.0"/>
<release-date>1987-12-09</release-date>
<eol-date>2001-12-31</eol-date>
</os>
- <os id="http://microsoft.com/win2.1">
+ <os id="http://microsoft.com/win/2.1">
<short-id>win2.1</short-id>
<name>Microsoft Windows 2.1</name>
<vendor>Microsoft Corporation</vendor>
<family>win16</family>
- <distro>windows</distro>
- <upgrades id="http://microsoft.com/win2.0"/>
- <derives-from id="http://microsoft.com/win2.0"/>
+ <distro>win</distro>
+ <version>2.1</version>
+ <upgrades id="http://microsoft.com/win/2.0"/>
+ <derives-from id="http://microsoft.com/win/2.0"/>
<release-date>1988-05-27</release-date>
<eol-date>2001-12-31</eol-date>
</os>
- <os id="http://microsoft.com/win31">
+ <os id="http://microsoft.com/win/3.1">
<short-id>win3.1</short-id>
<name>Microsoft Windows 3.1</name>
<vendor>Microsoft Corporation</vendor>
<family>win16</family>
- <distro>windows</distro>
- <upgrades id="http://microsoft.com/win2.1"/>
- <derives-from id="http://microsoft.com/win2.1"/>
+ <distro>win</distro>
+ <version>3.1</version>
+ <upgrades id="http://microsoft.com/win/2.1"/>
+ <derives-from id="http://microsoft.com/win/2.1"/>
<release-date>1992-04-06</release-date>
<eol-date>2001-12-31</eol-date>
</os>
- <os id="http://microsoft.com/winnt3.1">
+ <os id="http://microsoft.com/winnt/3.1">
<short-id>winnt3.1</short-id>
<name>Microsoft Windows NT Server 3.1</name>
<vendor>Microsoft Corporation</vendor>
<family>winnt</family>
- <distro>windows</distro>
-
+ <distro>winnt</distro>
+ <version>3.1</version>
<release-date>1993-07-27</release-date>
<eol-date>2000-12-31</eol-date>
</os>
- <os id="http://microsoft.com/winnt3.5">
+ <os id="http://microsoft.com/winnt/3.5">
<short-id>winnt3.5</short-id>
<name>Microsoft Windows NT Server 3.5</name>
<vendor>Microsoft Corporation</vendor>
<family>winnt</family>
- <distro>windows</distro>
- <upgrades id="http://microsoft.com/winnt3.1"/>
- <derives-from id="http://microsoft.com/winnt3.1"/>
+ <distro>winnt</distro>
+ <version>3.5</version>
+ <upgrades id="http://microsoft.com/winnt/3.1"/>
+ <derives-from id="http://microsoft.com/winnt/3.1"/>
<release-date>1994-09-21</release-date>
<eol-date>2001-12-31</eol-date>
</os>
- <os id="http://microsoft.com/winnt3.51">
+ <os id="http://microsoft.com/winnt/3.51">
<short-id>winnt3.51</short-id>
<name>Microsoft Windows NT Server 3.51</name>
<vendor>Microsoft Corporation</vendor>
<family>winnt</family>
- <distro>windows</distro>
- <upgrades id="http://microsoft.com/winnt3.5"/>
- <derives-from id="http://microsoft.com/winnt3.5"/>
+ <distro>winnt</distro>
+ <version>3.51</version>
+ <upgrades id="http://microsoft.com/winnt/3.5"/>
+ <derives-from id="http://microsoft.com/winnt/3.5"/>
<release-date>1995-05-30</release-date>
<eol-date>2001-12-31</eol-date>
</os>
- <os id="http://microsoft.com/winnt4.0">
+ <os id="http://microsoft.com/winnt/4.0">
<short-id>winnt4.0</short-id>
<name>Microsoft Windows NT Server 4.0</name>
<vendor>Microsoft Corporation</vendor>
<family>winnt</family>
- <distro>windows</distro>
- <upgrades id="http://microsoft.com/winnt3.51"/>
- <derives-from id="http://microsoft.com/winnt3.51"/>
+ <distro>winnt</distro>
+ <version>4.0</version>
+ <upgrades id="http://microsoft.com/winnt/3.51"/>
+ <derives-from id="http://microsoft.com/winnt/3.51"/>
<release-date>1996-08-24</release-date>
<eol-date>2004-12-31</eol-date>
</os>
- <os id="http://microsoft.com/win95">
+ <os id="http://microsoft.com/win/95">
<short-id>win95</short-id>
<name>Microsoft Windows 95</name>
<version>4.0</version>
<vendor>Microsoft Corporation</vendor>
<family>win9x</family>
- <distro>windows</distro>
- <upgrades id="http://microsoft.com/win3.1"/>
- <derives-from id="http://microsoft.com/win3.1"/>
+ <distro>win</distro>
+ <upgrades id="http://microsoft.com/win/3.1"/>
+ <derives-from id="http://microsoft.com/win/3.1"/>
<release-date>1995-08-24</release-date>
<eol-date>2001-12-13</eol-date>
@@ -204,15 +211,15 @@
</resources>
</os>
- <os id="http://microsoft.com/win98">
+ <os id="http://microsoft.com/win/98">
<short-id>win98</short-id>
<name>Microsoft Windows 98</name>
<version>4.1</version>
<vendor>Microsoft Corporation</vendor>
<family>win9x</family>
- <distro>windows</distro>
- <derives-from id="http://microsoft.com/win95"/>
- <upgrades id="http://microsoft.com/win95"/>
+ <distro>win</distro>
+ <derives-from id="http://microsoft.com/win/95"/>
+ <upgrades id="http://microsoft.com/win/95"/>
<release-date>1998-06-25</release-date>
<eol-date>2006-07-11</eol-date>
@@ -231,15 +238,15 @@
</resources>
</os>
- <os id="http://microsoft.com/winme">
+ <os id="http://microsoft.com/win/me">
<short-id>winme</short-id>
<name>Microsoft Windows Millennium Edition</name>
<version>4.9</version>
<vendor>Microsoft Corporation</vendor>
<family>win9x</family>
- <distro>windows</distro>
- <derives-from id="http://microsoft.com/win98"/>
- <upgrades id="http://microsoft.com/win98"/>
+ <distro>win</distro>
+ <derives-from id="http://microsoft.com/win/98"/>
+ <upgrades id="http://microsoft.com/win/98"/>
<release-date>2000-09-14</release-date>
<eol-date>2006-07-11</eol-date>
@@ -259,14 +266,14 @@
</os>
- <os id="http://microsoft.com/win2k">
+ <os id="http://microsoft.com/win/2k">
<short-id>win2k</short-id>
<name>Microsoft Windows 2000</name>
<version>5.0</version>
<vendor>Microsoft Corporation</vendor>
<family>winnt</family>
- <distro>windows</distro>
- <derives-from id="http://microsoft.com/winme"/>
+ <distro>win</distro>
+ <derives-from id="http://microsoft.com/win/me"/>
<release-date>2000-02-17</release-date>
<eol-date>2010-07-13</eol-date>
@@ -302,16 +309,16 @@
</os>
- <os id="http://microsoft.com/winxp">
+ <os id="http://microsoft.com/win/xp">
<short-id>winxp</short-id>
<name>Microsoft Windows XP</name>
<version>5.1</version>
<vendor>Microsoft Corporation</vendor>
<family>winnt</family>
- <distro>windows</distro>
- <derives-from id="http://microsoft.com/win2k"/>
- <derives-from id="http://microsoft.com/winme"/>
- <upgrades id="http://microsoft.com/winme"/>
+ <distro>win</distro>
+ <derives-from id="http://microsoft.com/win/2k"/>
+ <derives-from id="http://microsoft.com/win/me"/>
+ <upgrades id="http://microsoft.com/win/me"/>
<release-date>2001-10-25</release-date>
<eol-date>2009-04-19</eol-date>
@@ -354,15 +361,15 @@
</resources>
</os>
- <os id="http://microsoft.com/win2k3">
+ <os id="http://microsoft.com/win/2k3">
<short-id>win2k3</short-id>
<name>Microsoft Windows Server 2003</name>
<version>5.2</version>
<vendor>Microsoft Corporation</vendor>
<family>winnt</family>
- <distro>windows</distro>
- <derives-from id="http://microsoft.com/win2k"/>
- <upgrades id="http://microsoft.com/win2k"/>
+ <distro>win</distro>
+ <derives-from id="http://microsoft.com/win/2k"/>
+ <upgrades id="http://microsoft.com/win/2k"/>
<release-date>2003-04-24</release-date>
<eol-date>2015-07-14</eol-date>
@@ -415,15 +422,15 @@
</resources>
</os>
- <os id="http://microsoft.com/win2k3r2">
+ <os id="http://microsoft.com/win/2k3r2">
<short-id>win2k3r2</short-id>
<name>Microsoft Windows Server 2003 R2</name>
<version>5.2</version>
<vendor>Microsoft Corporation</vendor>
<family>winnt</family>
- <distro>windows</distro>
- <derives-from id="http://microsoft.com/win2k3"/>
- <upgrades id="http://microsoft.com/win2k3"/>
+ <distro>win</distro>
+ <derives-from id="http://microsoft.com/win/2k3"/>
+ <upgrades id="http://microsoft.com/win/2k3"/>
<release-date>2005-12-06</release-date>
<eol-date>2015-07-14</eol-date>
@@ -470,15 +477,15 @@
</resources>
</os>
- <os id="http://microsoft.com/win2k8">
+ <os id="http://microsoft.com/win/2k8">
<short-id>win2k8</short-id>
<name>Microsoft Windows Server 2008</name>
<version>6.0</version>
<vendor>Microsoft Corporation</vendor>
<family>winnt</family>
- <distro>windows</distro>
- <derives-from id="http://microsoft.com/win2k3r2"/>
- <upgrades id="http://microsoft.com/win2k3r2"/>
+ <distro>win</distro>
+ <derives-from id="http://microsoft.com/win/2k3r2"/>
+ <upgrades id="http://microsoft.com/win/2k3r2"/>
<release-date>2008-02-27</release-date>
<eol-date>2013-07-09</eol-date>
@@ -527,15 +534,15 @@
</resources>
</os>
- <os id="http://microsoft.com/win2k8r2">
+ <os id="http://microsoft.com/win/2k8r2">
<short-id>win2k8r2</short-id>
<name>Microsoft Windows Server 2008 R2</name>
<version>6.1</version>
<vendor>Microsoft Corporation</vendor>
<family>winnt</family>
- <distro>windows</distro>
- <derives-from id="http://microsoft.com/win2k8"/>
- <upgrades id="http://microsoft.com/win2k8"/>
+ <distro>win</distro>
+ <derives-from id="http://microsoft.com/win/2k8"/>
+ <upgrades id="http://microsoft.com/win/2k8"/>
<release-date>2009-10-22</release-date>
<eol-date>2013-07-09</eol-date>
@@ -569,15 +576,15 @@
</resources>
</os>
- <os id="http://microsoft.com/winvista">
+ <os id="http://microsoft.com/win/vista">
<short-id>winvista</short-id>
<name>Microsoft Windows Vista</name>
<version>6.0</version>
<vendor>Microsoft Corporation</vendor>
<family>winnt</family>
- <distro>windows</distro>
- <derives-from id="http://microsoft.com/winxp"/>
- <upgrades id="http://microsoft.com/winxp"/>
+ <distro>win</distro>
+ <derives-from id="http://microsoft.com/win/xp"/>
+ <upgrades id="http://microsoft.com/win/xp"/>
<release-date>2006-11-30</release-date>
<eol-date>2012-04-10</eol-date>
@@ -611,15 +618,15 @@
</resources>
</os>
- <os id="http://microsoft.com/win7">
+ <os id="http://microsoft.com/win/7">
<short-id>win7</short-id>
<name>Microsoft Windows 7</name>
<version>6.1</version>
<vendor>Microsoft Corporation</vendor>
<family>winnt</family>
- <distro>windows</distro>
- <derives-from id="http://microsoft.com/winvista"/>
- <upgrades id="http://microsoft.com/winvista"/>
+ <distro>win</distro>
+ <derives-from id="http://microsoft.com/win/vista"/>
+ <upgrades id="http://microsoft.com/win/vista"/>
<release-date>2009-10-22</release-date>
<eol-date>2015-01-13</eol-date>
@@ -660,15 +667,15 @@
</devices>
</os>
- <os id="http://microsoft.com/win8">
+ <os id="http://microsoft.com/win/8">
<short-id>win8</short-id>
<name>Microsoft Windows 8</name>
<version>6.2</version>
<vendor>Microsoft Corporation</vendor>
<family>winnt</family>
- <distro>windows</distro>
- <derives-from id="http://microsoft.com/win7"/>
- <upgrades id="http://microsoft.com/win7"/>
+ <distro>win</distro>
+ <derives-from id="http://microsoft.com/win/7"/>
+ <upgrades id="http://microsoft.com/win/7"/>
<!--
<release-date></release-date>