The versions for altlinux 5/6/7 are inconsistent, sometimes
using 1 digit, sometimes 2 digits and sometimes 3 digits.
Change them all to use 2 digits as was practice for earlier
versions. Also remove codenames from the product name.
Debian buzz was 1.1, not 1.0 - there was never an
official 1.0 release.
The version of RHL 6.2 was wrong
Signed-off-by: Daniel P. Berrange <berrange@xxxxxxxxxx>
---
data/oses/altlinux.xml.in | 26 +++++++++++-----------
data/oses/debian.xml.in | 8 +++----
data/oses/rhl.xml.in | 2 +-
...-5.0.0-ark-desktop-i586-ru-install-dvd5.iso.txt | 0
....0.0-ark-desktop-x86_64-ru-install-dvd5.iso.txt | 0
...nux-5.0.0-ark-server-i586-ru-install-cd.iso.txt | 0
...x-5.0.0-ark-server-x86_64-ru-install-cd.iso.txt | 0
...nux-5.0.0-kdesktop-i586-ru-install-dvd5.iso.txt | 0
...x-5.0.0-kdesktop-x86_64-ru-install-dvd5.iso.txt | 0
....0.2-school-junior-i586-ru-install-dvd5.iso.txt | 0
...ux-5.0.2-school-lite-i586-ru-install-cd.iso.txt | 0
....0.2-school-master-i586-ru-install-dvd5.iso.txt | 0
....0.2-school-server-i586-ru-install-dvd5.iso.txt | 0
....2-school-server-x86_64-ru-install-dvd5.iso.txt | 0
....2-school-terminal-i586-ru-install-dvd5.iso.txt | 0
...ux-6.0.0-centaurus-i586-ru-install-dvd5.iso.txt | 0
...-6.0.0-centaurus-x86_64-ru-install-dvd5.iso.txt | 0
...nux-6.0.0-kdesktop-i586-ru-install-dvd5.iso.txt | 0
...x-6.0.0-kdesktop-x86_64-ru-install-dvd5.iso.txt | 0
...linux-6.0.1-simply-i586-ru-install-dvd5.iso.txt | 0
...nux-6.0.1-simply-x86_64-ru-install-dvd5.iso.txt | 0
21 files changed, 18 insertions(+), 18 deletions(-)
rename test/isodata/altlinux/{altlinux5 => altlinux5.0}/altlinux-5.0.0-ark-desktop-i586-ru-install-dvd5.iso.txt (100%)
rename test/isodata/altlinux/{altlinux5 => altlinux5.0}/altlinux-5.0.0-ark-desktop-x86_64-ru-install-dvd5.iso.txt (100%)
rename test/isodata/altlinux/{altlinux5 => altlinux5.0}/altlinux-5.0.0-ark-server-i586-ru-install-cd.iso.txt (100%)
rename test/isodata/altlinux/{altlinux5 => altlinux5.0}/altlinux-5.0.0-ark-server-x86_64-ru-install-cd.iso.txt (100%)
rename test/isodata/altlinux/{altlinux5 => altlinux5.0}/altlinux-5.0.0-kdesktop-i586-ru-install-dvd5.iso.txt (100%)
rename test/isodata/altlinux/{altlinux5 => altlinux5.0}/altlinux-5.0.0-kdesktop-x86_64-ru-install-dvd5.iso.txt (100%)
rename test/isodata/altlinux/{altlinux5 => altlinux5.0}/altlinux-5.0.2-school-junior-i586-ru-install-dvd5.iso.txt (100%)
rename test/isodata/altlinux/{altlinux5 => altlinux5.0}/altlinux-5.0.2-school-lite-i586-ru-install-cd.iso.txt (100%)
rename test/isodata/altlinux/{altlinux5 => altlinux5.0}/altlinux-5.0.2-school-master-i586-ru-install-dvd5.iso.txt (100%)
rename test/isodata/altlinux/{altlinux5 => altlinux5.0}/altlinux-5.0.2-school-server-i586-ru-install-dvd5.iso.txt (100%)
rename test/isodata/altlinux/{altlinux5 => altlinux5.0}/altlinux-5.0.2-school-server-x86_64-ru-install-dvd5.iso.txt (100%)
rename test/isodata/altlinux/{altlinux5 => altlinux5.0}/altlinux-5.0.2-school-terminal-i586-ru-install-dvd5.iso.txt (100%)
rename test/isodata/altlinux/{altlinux6 => altlinux6.0}/altlinux-6.0.0-centaurus-i586-ru-install-dvd5.iso.txt (100%)
rename test/isodata/altlinux/{altlinux6 => altlinux6.0}/altlinux-6.0.0-centaurus-x86_64-ru-install-dvd5.iso.txt (100%)
rename test/isodata/altlinux/{altlinux6 => altlinux6.0}/altlinux-6.0.0-kdesktop-i586-ru-install-dvd5.iso.txt (100%)
rename test/isodata/altlinux/{altlinux6 => altlinux6.0}/altlinux-6.0.0-kdesktop-x86_64-ru-install-dvd5.iso.txt (100%)
rename test/isodata/altlinux/{altlinux6 => altlinux6.0}/altlinux-6.0.1-simply-i586-ru-install-dvd5.iso.txt (100%)
rename test/isodata/altlinux/{altlinux6 => altlinux6.0}/altlinux-6.0.1-simply-x86_64-ru-install-dvd5.iso.txt (100%)
diff --git a/data/oses/altlinux.xml.in b/data/oses/altlinux.xml.in
index 704b338..24d8f62 100644
--- a/data/oses/altlinux.xml.in
+++ b/data/oses/altlinux.xml.in
@@ -147,9 +147,9 @@
</media>
</os>
- <os id="http://altlinux.org/altlinux/5";>
- <short-id>altlinux5</short-id>
- <_name>ALT Linux 5.0.0 Ark</_name>
+ <os id="http://altlinux.org/altlinux/5.0";>
+ <short-id>altlinux5.0</short-id>
+ <_name>ALT Linux 5.0</_name>
<version>5.0</version>
<_vendor>ALTLinux</_vendor>
<family>linux</family>
@@ -195,16 +195,16 @@
</resources>
</os>
- <os id="http://altlinux.org/altlinux/6";>
- <short-id>altlinux6</short-id>
- <_name>ALT Linux 6.0.0 Centaurus</_name>
+ <os id="http://altlinux.org/altlinux/6.0";>
+ <short-id>altlinux6.0</short-id>
+ <_name>ALT Linux 6.0</_name>
<version>6.0</version>
<_vendor>ALTLinux</_vendor>
<family>linux</family>
<distro>altlinux</distro>
<codename>Centaurus</codename>
- <upgrades id="http://altlinux.org/altlinux/5"/>
- <derives-from id="http://altlinux.org/altlinux/5"/>
+ <upgrades id="http://altlinux.org/altlinux/5.0"/>
+ <derives-from id="http://altlinux.org/altlinux/5.0"/>
<release-date>2011-10-26</release-date>
<devices>
@@ -231,16 +231,16 @@
</media>
</os>
- <os id="http://altlinux.org/altlinux/7";>
- <short-id>altlinux7</short-id>
- <_name>ALT Linux 7.0.0 Centaurus</_name>
+ <os id="http://altlinux.org/altlinux/7.0";>
+ <short-id>altlinux7.0</short-id>
+ <_name>ALT Linux 7.0</_name>
<version>7.0</version>
<_vendor>ALTLinux</_vendor>
<family>linux</family>
<distro>altlinux</distro>
<codename>Centaurus</codename>
- <upgrades id="http://altlinux.org/altlinux/5"/>
- <derives-from id="http://altlinux.org/altlinux/5"/>
+ <upgrades id="http://altlinux.org/altlinux/6.0"/>
+ <derives-from id="http://altlinux.org/altlinux/6.0"/>
<release-date>2012-10-01</release-date>
<media arch="i686">
diff --git a/data/oses/debian.xml.in b/data/oses/debian.xml.in
index 57b3bd9..1db371d 100644
--- a/data/oses/debian.xml.in
+++ b/data/oses/debian.xml.in
@@ -1,7 +1,7 @@
<libosinfo version="0.0.1">
- <os id="http://debian.org/debian/1.0";>
- <short-id>debian1.0</short-id>
+ <os id="http://debian.org/debian/1.1";>
+ <short-id>debian1.1</short-id>
<short-id>debianbuzz</short-id>
<_name>Debian Buzz</_name>
<version>1.1</version>
@@ -18,8 +18,8 @@
<_vendor>Debian Project</_vendor>
<family>linux</family>
<distro>debian</distro>
- <upgrades id="http://debian.org/debian/1.0"/>
- <derives-from id="http://debian.org/debian/1.0"/>
+ <upgrades id="http://debian.org/debian/1.1"/>
+ <derives-from id="http://debian.org/debian/1.1"/>
</os>
<os id="http://debian.org/debian/1.3";>
diff --git a/data/oses/rhl.xml.in b/data/oses/rhl.xml.in
index 2c134de..074c2a7 100644
--- a/data/oses/rhl.xml.in
+++ b/data/oses/rhl.xml.in
@@ -181,7 +181,7 @@
<os id="http://redhat.com/rhl/6.2";>
<short-id>rhl6.2</short-id>
<_name>Red Hat Linux 6.2</_name>
- <version>6.0</version>
+ <version>6.2</version>
<_vendor>Red Hat, Inc</_vendor>
<family>linux</family>
<distro>rhl</distro>
diff --git a/test/isodata/altlinux/altlinux5/altlinux-5.0.0-ark-desktop-i586-ru-install-dvd5.iso.txt b/test/isodata/altlinux/altlinux5.0/altlinux-5.0.0-ark-desktop-i586-ru-install-dvd5.iso.txt
similarity index 100%
rename from test/isodata/altlinux/altlinux5/altlinux-5.0.0-ark-desktop-i586-ru-install-dvd5.iso.txt
rename to test/isodata/altlinux/altlinux5.0/altlinux-5.0.0-ark-desktop-i586-ru-install-dvd5.iso.txt
diff --git a/test/isodata/altlinux/altlinux5/altlinux-5.0.0-ark-desktop-x86_64-ru-install-dvd5.iso.txt b/test/isodata/altlinux/altlinux5.0/altlinux-5.0.0-ark-desktop-x86_64-ru-install-dvd5.iso.txt
similarity index 100%
rename from test/isodata/altlinux/altlinux5/altlinux-5.0.0-ark-desktop-x86_64-ru-install-dvd5.iso.txt
rename to test/isodata/altlinux/altlinux5.0/altlinux-5.0.0-ark-desktop-x86_64-ru-install-dvd5.iso.txt
diff --git a/test/isodata/altlinux/altlinux5/altlinux-5.0.0-ark-server-i586-ru-install-cd.iso.txt b/test/isodata/altlinux/altlinux5.0/altlinux-5.0.0-ark-server-i586-ru-install-cd.iso.txt
similarity index 100%
rename from test/isodata/altlinux/altlinux5/altlinux-5.0.0-ark-server-i586-ru-install-cd.iso.txt
rename to test/isodata/altlinux/altlinux5.0/altlinux-5.0.0-ark-server-i586-ru-install-cd.iso.txt
diff --git a/test/isodata/altlinux/altlinux5/altlinux-5.0.0-ark-server-x86_64-ru-install-cd.iso.txt b/test/isodata/altlinux/altlinux5.0/altlinux-5.0.0-ark-server-x86_64-ru-install-cd.iso.txt
similarity index 100%
rename from test/isodata/altlinux/altlinux5/altlinux-5.0.0-ark-server-x86_64-ru-install-cd.iso.txt
rename to test/isodata/altlinux/altlinux5.0/altlinux-5.0.0-ark-server-x86_64-ru-install-cd.iso.txt
diff --git a/test/isodata/altlinux/altlinux5/altlinux-5.0.0-kdesktop-i586-ru-install-dvd5.iso.txt b/test/isodata/altlinux/altlinux5.0/altlinux-5.0.0-kdesktop-i586-ru-install-dvd5.iso.txt
similarity index 100%
rename from test/isodata/altlinux/altlinux5/altlinux-5.0.0-kdesktop-i586-ru-install-dvd5.iso.txt
rename to test/isodata/altlinux/altlinux5.0/altlinux-5.0.0-kdesktop-i586-ru-install-dvd5.iso.txt
diff --git a/test/isodata/altlinux/altlinux5/altlinux-5.0.0-kdesktop-x86_64-ru-install-dvd5.iso.txt b/test/isodata/altlinux/altlinux5.0/altlinux-5.0.0-kdesktop-x86_64-ru-install-dvd5.iso.txt
similarity index 100%
rename from test/isodata/altlinux/altlinux5/altlinux-5.0.0-kdesktop-x86_64-ru-install-dvd5.iso.txt
rename to test/isodata/altlinux/altlinux5.0/altlinux-5.0.0-kdesktop-x86_64-ru-install-dvd5.iso.txt
diff --git a/test/isodata/altlinux/altlinux5/altlinux-5.0.2-school-junior-i586-ru-install-dvd5.iso.txt b/test/isodata/altlinux/altlinux5.0/altlinux-5.0.2-school-junior-i586-ru-install-dvd5.iso.txt
similarity index 100%
rename from test/isodata/altlinux/altlinux5/altlinux-5.0.2-school-junior-i586-ru-install-dvd5.iso.txt
rename to test/isodata/altlinux/altlinux5.0/altlinux-5.0.2-school-junior-i586-ru-install-dvd5.iso.txt
diff --git a/test/isodata/altlinux/altlinux5/altlinux-5.0.2-school-lite-i586-ru-install-cd.iso.txt b/test/isodata/altlinux/altlinux5.0/altlinux-5.0.2-school-lite-i586-ru-install-cd.iso.txt
similarity index 100%
rename from test/isodata/altlinux/altlinux5/altlinux-5.0.2-school-lite-i586-ru-install-cd.iso.txt
rename to test/isodata/altlinux/altlinux5.0/altlinux-5.0.2-school-lite-i586-ru-install-cd.iso.txt
diff --git a/test/isodata/altlinux/altlinux5/altlinux-5.0.2-school-master-i586-ru-install-dvd5.iso.txt b/test/isodata/altlinux/altlinux5.0/altlinux-5.0.2-school-master-i586-ru-install-dvd5.iso.txt
similarity index 100%
rename from test/isodata/altlinux/altlinux5/altlinux-5.0.2-school-master-i586-ru-install-dvd5.iso.txt
rename to test/isodata/altlinux/altlinux5.0/altlinux-5.0.2-school-master-i586-ru-install-dvd5.iso.txt
diff --git a/test/isodata/altlinux/altlinux5/altlinux-5.0.2-school-server-i586-ru-install-dvd5.iso.txt b/test/isodata/altlinux/altlinux5.0/altlinux-5.0.2-school-server-i586-ru-install-dvd5.iso.txt
similarity index 100%
rename from test/isodata/altlinux/altlinux5/altlinux-5.0.2-school-server-i586-ru-install-dvd5.iso.txt
rename to test/isodata/altlinux/altlinux5.0/altlinux-5.0.2-school-server-i586-ru-install-dvd5.iso.txt
diff --git a/test/isodata/altlinux/altlinux5/altlinux-5.0.2-school-server-x86_64-ru-install-dvd5.iso.txt b/test/isodata/altlinux/altlinux5.0/altlinux-5.0.2-school-server-x86_64-ru-install-dvd5.iso.txt
similarity index 100%
rename from test/isodata/altlinux/altlinux5/altlinux-5.0.2-school-server-x86_64-ru-install-dvd5.iso.txt
rename to test/isodata/altlinux/altlinux5.0/altlinux-5.0.2-school-server-x86_64-ru-install-dvd5.iso.txt
diff --git a/test/isodata/altlinux/altlinux5/altlinux-5.0.2-school-terminal-i586-ru-install-dvd5.iso.txt b/test/isodata/altlinux/altlinux5.0/altlinux-5.0.2-school-terminal-i586-ru-install-dvd5.iso.txt
similarity index 100%
rename from test/isodata/altlinux/altlinux5/altlinux-5.0.2-school-terminal-i586-ru-install-dvd5.iso.txt
rename to test/isodata/altlinux/altlinux5.0/altlinux-5.0.2-school-terminal-i586-ru-install-dvd5.iso.txt
diff --git a/test/isodata/altlinux/altlinux6/altlinux-6.0.0-centaurus-i586-ru-install-dvd5.iso.txt b/test/isodata/altlinux/altlinux6.0/altlinux-6.0.0-centaurus-i586-ru-install-dvd5.iso.txt
similarity index 100%
rename from test/isodata/altlinux/altlinux6/altlinux-6.0.0-centaurus-i586-ru-install-dvd5.iso.txt
rename to test/isodata/altlinux/altlinux6.0/altlinux-6.0.0-centaurus-i586-ru-install-dvd5.iso.txt
diff --git a/test/isodata/altlinux/altlinux6/altlinux-6.0.0-centaurus-x86_64-ru-install-dvd5.iso.txt b/test/isodata/altlinux/altlinux6.0/altlinux-6.0.0-centaurus-x86_64-ru-install-dvd5.iso.txt
similarity index 100%
rename from test/isodata/altlinux/altlinux6/altlinux-6.0.0-centaurus-x86_64-ru-install-dvd5.iso.txt
rename to test/isodata/altlinux/altlinux6.0/altlinux-6.0.0-centaurus-x86_64-ru-install-dvd5.iso.txt
diff --git a/test/isodata/altlinux/altlinux6/altlinux-6.0.0-kdesktop-i586-ru-install-dvd5.iso.txt b/test/isodata/altlinux/altlinux6.0/altlinux-6.0.0-kdesktop-i586-ru-install-dvd5.iso.txt
similarity index 100%
rename from test/isodata/altlinux/altlinux6/altlinux-6.0.0-kdesktop-i586-ru-install-dvd5.iso.txt
rename to test/isodata/altlinux/altlinux6.0/altlinux-6.0.0-kdesktop-i586-ru-install-dvd5.iso.txt
diff --git a/test/isodata/altlinux/altlinux6/altlinux-6.0.0-kdesktop-x86_64-ru-install-dvd5.iso.txt b/test/isodata/altlinux/altlinux6.0/altlinux-6.0.0-kdesktop-x86_64-ru-install-dvd5.iso.txt
similarity index 100%
rename from test/isodata/altlinux/altlinux6/altlinux-6.0.0-kdesktop-x86_64-ru-install-dvd5.iso.txt
rename to test/isodata/altlinux/altlinux6.0/altlinux-6.0.0-kdesktop-x86_64-ru-install-dvd5.iso.txt
diff --git a/test/isodata/altlinux/altlinux6/altlinux-6.0.1-simply-i586-ru-install-dvd5.iso.txt b/test/isodata/altlinux/altlinux6.0/altlinux-6.0.1-simply-i586-ru-install-dvd5.iso.txt
similarity index 100%
rename from test/isodata/altlinux/altlinux6/altlinux-6.0.1-simply-i586-ru-install-dvd5.iso.txt
rename to test/isodata/altlinux/altlinux6.0/altlinux-6.0.1-simply-i586-ru-install-dvd5.iso.txt
diff --git a/test/isodata/altlinux/altlinux6/altlinux-6.0.1-simply-x86_64-ru-install-dvd5.iso.txt b/test/isodata/altlinux/altlinux6.0/altlinux-6.0.1-simply-x86_64-ru-install-dvd5.iso.txt
similarity index 100%
rename from test/isodata/altlinux/altlinux6/altlinux-6.0.1-simply-x86_64-ru-install-dvd5.iso.txt
rename to test/isodata/altlinux/altlinux6.0/altlinux-6.0.1-simply-x86_64-ru-install-dvd5.iso.txt
--
2.4.3
_______________________________________________
Libosinfo mailing list
Libosinfo@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libosinfo
