Signed-off-by: Daniel P. Berrange <berrange@xxxxxxxxxx> --- configure.ac | 1 + data/oses/Makefile.am | 2 +- data/oses/mandriva.xml.in | 176 ------------------------------- data/oses/mandriva/Makefile.am | 1 + data/oses/mandriva/mandriva2006.0.xml.in | 13 +++ data/oses/mandriva/mandriva2007.1.xml.in | 13 +++ data/oses/mandriva/mandriva2007.xml.in | 13 +++ data/oses/mandriva/mandriva2008.0.xml.in | 13 +++ data/oses/mandriva/mandriva2008.1.xml.in | 13 +++ data/oses/mandriva/mandriva2009.0.xml.in | 13 +++ data/oses/mandriva/mandriva2009.1.xml.in | 13 +++ data/oses/mandriva/mandriva2010.0.xml.in | 17 +++ data/oses/mandriva/mandriva2010.1.xml.in | 13 +++ data/oses/mandriva/mandriva2010.2.xml.in | 13 +++ data/oses/mandriva/mandriva2011.xml.in | 14 +++ data/oses/mandriva/mbs1.0.xml.in | 11 ++ data/oses/mandriva/mes5.1.xml.in | 17 +++ data/oses/mandriva/mes5.xml.in | 11 ++ po/POTFILES.in | 15 ++- 19 files changed, 204 insertions(+), 178 deletions(-) delete mode 100644 data/oses/mandriva.xml.in create mode 100644 data/oses/mandriva/Makefile.am create mode 100644 data/oses/mandriva/mandriva2006.0.xml.in create mode 100644 data/oses/mandriva/mandriva2007.1.xml.in create mode 100644 data/oses/mandriva/mandriva2007.xml.in create mode 100644 data/oses/mandriva/mandriva2008.0.xml.in create mode 100644 data/oses/mandriva/mandriva2008.1.xml.in create mode 100644 data/oses/mandriva/mandriva2009.0.xml.in create mode 100644 data/oses/mandriva/mandriva2009.1.xml.in create mode 100644 data/oses/mandriva/mandriva2010.0.xml.in create mode 100644 data/oses/mandriva/mandriva2010.1.xml.in create mode 100644 data/oses/mandriva/mandriva2010.2.xml.in create mode 100644 data/oses/mandriva/mandriva2011.xml.in create mode 100644 data/oses/mandriva/mbs1.0.xml.in create mode 100644 data/oses/mandriva/mes5.1.xml.in create mode 100644 data/oses/mandriva/mes5.xml.in diff --git a/configure.ac b/configure.ac index 30bb9f0..0efae31 100644 --- a/configure.ac +++ b/configure.ac @@ -181,6 +181,7 @@ AC_CONFIG_FILES([ data/oses/macos/Makefile data/oses/mageia/Makefile data/oses/mandrake/Makefile + data/oses/mandriva/Makefile data/oses/msdos/Makefile data/schemas/Makefile tools/Makefile diff --git a/data/oses/Makefile.am b/data/oses/Makefile.am index d4a4fc1..0520cbd 100644 --- a/data/oses/Makefile.am +++ b/data/oses/Makefile.am @@ -9,12 +9,12 @@ SUBDIRS = \ macos \ mageia \ mandrake \ + mandriva \ msdos \ $(NULL) databasedir = $(pkgdatadir)/db/oses/ database_in_files = \ - mandriva.xml.in \ netbsd.xml.in \ netware.xml.in \ openbsd.xml.in \ diff --git a/data/oses/mandriva.xml.in b/data/oses/mandriva.xml.in deleted file mode 100644 index 2816367..0000000 --- a/data/oses/mandriva.xml.in +++ /dev/null @@ -1,176 +0,0 @@ -<libosinfo version="0.0.1"> - - <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> - <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/mandriva/2007";> - <short-id>mandriva2007</short-id> - <_name>Mandriva Linux 2007</_name> - <_vendor>Mandriva</_vendor> - <family>linux</family> - <distro>mandriva</distro> - <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/mandriva/2007.1";> - <short-id>mandriva2007.1</short-id> - <_name>Mandriva Linux 2007 Spring</_name> - <_vendor>Mandriva</_vendor> - <family>linux</family> - <distro>mandriva</distro> - <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/mandriva/2008.0";> - <short-id>mandriva2008.0</short-id> - <_name>Mandriva Linux 2008</_name> - <_vendor>Mandriva</_vendor> - <family>linux</family> - <distro>mandriva</distro> - <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/mandriva/2008.1";> - <short-id>mandriva2008.1</short-id> - <_name>Mandriva Linux 2008 Spring</_name> - <_vendor>Mandriva</_vendor> - <family>linux</family> - <distro>mandriva</distro> - <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/mandriva/2009.0";> - <short-id>mandriva2009.0</short-id> - <_name>Mandriva Linux 2009</_name> - <_vendor>Mandriva</_vendor> - <family>linux</family> - <distro>mandriva</distro> - <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/mandriva/2009.1";> - <short-id>mandriva2009.1</short-id> - <_name>Mandriva Linux 2009 Spring</_name> - <_vendor>Mandriva</_vendor> - <family>linux</family> - <distro>mandriva</distro> - <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/mandriva/2010.0";> - <short-id>mandriva2010.0</short-id> - <_name>Mandriva Linux 2010</_name> - <_vendor>Mandriva</_vendor> - <family>linux</family> - <distro>mandriva</distro> - <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"/> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/> - </devices> - </os> - - <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> - <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/mandriva/2010.2";> - <short-id>mandriva2010.2</short-id> - <_name>Mandriva Linux 2010.2</_name> - <_vendor>Mandriva</_vendor> - <family>linux</family> - <distro>mandriva</distro> - <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/mandriva/2011";> - <short-id>mandriva2011</short-id> - <_name>Mandriva Linux 2011</_name> - <_vendor>Mandriva</_vendor> - <family>linux</family> - <distro>mandriva</distro> - <codename>Hydrogen</codename> - <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/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> - - </os> - - <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/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"/> - <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/> - </devices> - </os> - - <os id="http://mandriva.com/mbs/1.0";> - <short-id>mbs1.0</short-id> - <_name>Mandriva Business Server 1.0</_name> - <version>1.0</version> - <_vendor>Mandriva</_vendor> - <family>linux</family> - <distro>mbs</distro> - - </os> - -</libosinfo> diff --git a/data/oses/mandriva/Makefile.am b/data/oses/mandriva/Makefile.am new file mode 100644 index 0000000..ee4552b --- /dev/null +++ b/data/oses/mandriva/Makefile.am @@ -0,0 +1 @@ +include ../../Makefile.inc diff --git a/data/oses/mandriva/mandriva2006.0.xml.in b/data/oses/mandriva/mandriva2006.0.xml.in new file mode 100644 index 0000000..abb726b --- /dev/null +++ b/data/oses/mandriva/mandriva2006.0.xml.in @@ -0,0 +1,13 @@ +<libosinfo version="0.0.1"> + <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> + <version>2006.0</version> + <upgrades id="http://mandriva.com/mandrake/10.2"/> + <derives-from id="http://mandriva.com/mandrake/10.2"/> + + </os> +</libosinfo> diff --git a/data/oses/mandriva/mandriva2007.1.xml.in b/data/oses/mandriva/mandriva2007.1.xml.in new file mode 100644 index 0000000..70a09c8 --- /dev/null +++ b/data/oses/mandriva/mandriva2007.1.xml.in @@ -0,0 +1,13 @@ +<libosinfo version="0.0.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> + <version>2007.1</version> + <upgrades id="http://mandriva.com/mandriva/2007"/> + <derives-from id="http://mandriva.com/mandriva/2007"/> + + </os> +</libosinfo> diff --git a/data/oses/mandriva/mandriva2007.xml.in b/data/oses/mandriva/mandriva2007.xml.in new file mode 100644 index 0000000..032780d --- /dev/null +++ b/data/oses/mandriva/mandriva2007.xml.in @@ -0,0 +1,13 @@ +<libosinfo version="0.0.1"> + <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> + <version>2007</version> + <upgrades id="http://mandriva.com/mandriva/2006.0"/> + <derives-from id="http://mandriva.com/mandriva/2006.0"/> + + </os> +</libosinfo> diff --git a/data/oses/mandriva/mandriva2008.0.xml.in b/data/oses/mandriva/mandriva2008.0.xml.in new file mode 100644 index 0000000..da9743c --- /dev/null +++ b/data/oses/mandriva/mandriva2008.0.xml.in @@ -0,0 +1,13 @@ +<libosinfo version="0.0.1"> + <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> + <version>2008.0</version> + <upgrades id="http://mandriva.com/mandriva/2007.1"/> + <derives-from id="http://mandriva.com/mandriva/2007.1"/> + + </os> +</libosinfo> diff --git a/data/oses/mandriva/mandriva2008.1.xml.in b/data/oses/mandriva/mandriva2008.1.xml.in new file mode 100644 index 0000000..64593d8 --- /dev/null +++ b/data/oses/mandriva/mandriva2008.1.xml.in @@ -0,0 +1,13 @@ +<libosinfo version="0.0.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> + <version>2008.1</version> + <upgrades id="http://mandriva.com/mandriva/2008.0"/> + <derives-from id="http://mandriva.com/mandriva/2008.0"/> + + </os> +</libosinfo> diff --git a/data/oses/mandriva/mandriva2009.0.xml.in b/data/oses/mandriva/mandriva2009.0.xml.in new file mode 100644 index 0000000..1f2d9b3 --- /dev/null +++ b/data/oses/mandriva/mandriva2009.0.xml.in @@ -0,0 +1,13 @@ +<libosinfo version="0.0.1"> + <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> + <version>2009.0</version> + <upgrades id="http://mandriva.com/mandriva/2008.1"/> + <derives-from id="http://mandriva.com/mandriva/2008.1"/> + + </os> +</libosinfo> diff --git a/data/oses/mandriva/mandriva2009.1.xml.in b/data/oses/mandriva/mandriva2009.1.xml.in new file mode 100644 index 0000000..c8bfb97 --- /dev/null +++ b/data/oses/mandriva/mandriva2009.1.xml.in @@ -0,0 +1,13 @@ +<libosinfo version="0.0.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> + <version>2009.1</version> + <upgrades id="http://mandriva.com/mandriva/2009.0"/> + <derives-from id="http://mandriva.com/mandriva/2009.0"/> + + </os> +</libosinfo> diff --git a/data/oses/mandriva/mandriva2010.0.xml.in b/data/oses/mandriva/mandriva2010.0.xml.in new file mode 100644 index 0000000..4023625 --- /dev/null +++ b/data/oses/mandriva/mandriva2010.0.xml.in @@ -0,0 +1,17 @@ +<libosinfo version="0.0.1"> + <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> + <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"/> + <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/> + </devices> + </os> +</libosinfo> diff --git a/data/oses/mandriva/mandriva2010.1.xml.in b/data/oses/mandriva/mandriva2010.1.xml.in new file mode 100644 index 0000000..f17651c --- /dev/null +++ b/data/oses/mandriva/mandriva2010.1.xml.in @@ -0,0 +1,13 @@ +<libosinfo version="0.0.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> + <version>2010.1</version> + <upgrades id="http://mandriva.com/mandriva/2010.0"/> + <derives-from id="http://mandriva.com/mandriva/2010.0"/> + + </os> +</libosinfo> diff --git a/data/oses/mandriva/mandriva2010.2.xml.in b/data/oses/mandriva/mandriva2010.2.xml.in new file mode 100644 index 0000000..c4e9ec1 --- /dev/null +++ b/data/oses/mandriva/mandriva2010.2.xml.in @@ -0,0 +1,13 @@ +<libosinfo version="0.0.1"> + <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> + <version>2010.2</version> + <upgrades id="http://mandriva.com/mandriva/2010.1"/> + <derives-from id="http://mandriva.com/mandriva/2010.1"/> + + </os> +</libosinfo> diff --git a/data/oses/mandriva/mandriva2011.xml.in b/data/oses/mandriva/mandriva2011.xml.in new file mode 100644 index 0000000..3bec234 --- /dev/null +++ b/data/oses/mandriva/mandriva2011.xml.in @@ -0,0 +1,14 @@ +<libosinfo version="0.0.1"> + <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> + <version>2011</version> + <upgrades id="http://mandriva.com/mandriva/2010.2"/> + <derives-from id="http://mandriva.com/mandriva/2010.2"/> + + </os> +</libosinfo> diff --git a/data/oses/mandriva/mbs1.0.xml.in b/data/oses/mandriva/mbs1.0.xml.in new file mode 100644 index 0000000..0c8f19a --- /dev/null +++ b/data/oses/mandriva/mbs1.0.xml.in @@ -0,0 +1,11 @@ +<libosinfo version="0.0.1"> + <os id="http://mandriva.com/mbs/1.0";> + <short-id>mbs1.0</short-id> + <_name>Mandriva Business Server 1.0</_name> + <version>1.0</version> + <_vendor>Mandriva</_vendor> + <family>linux</family> + <distro>mbs</distro> + + </os> +</libosinfo> diff --git a/data/oses/mandriva/mes5.1.xml.in b/data/oses/mandriva/mes5.1.xml.in new file mode 100644 index 0000000..280e902 --- /dev/null +++ b/data/oses/mandriva/mes5.1.xml.in @@ -0,0 +1,17 @@ +<libosinfo version="0.0.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/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"/> + <device id="http://pciids.sourceforge.net/v2.2/pci.ids/1af4/1001"/> + </devices> + </os> +</libosinfo> diff --git a/data/oses/mandriva/mes5.xml.in b/data/oses/mandriva/mes5.xml.in new file mode 100644 index 0000000..547ffdc --- /dev/null +++ b/data/oses/mandriva/mes5.xml.in @@ -0,0 +1,11 @@ +<libosinfo version="0.0.1"> + <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> + + </os> +</libosinfo> diff --git a/po/POTFILES.in b/po/POTFILES.in index 42309f4..8c37819 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -131,10 +131,23 @@ data/oses/mandrake/mandrake9.2.xml.in data/oses/mandrake/mandrake10.0.xml.in data/oses/mandrake/mandrake10.1.xml.in data/oses/mandrake/mandrake10.2.xml.in +data/oses/mandriva/mandriva2006.0.xml.in +data/oses/mandriva/mandriva2007.1.xml.in +data/oses/mandriva/mandriva2007.xml.in +data/oses/mandriva/mandriva2008.0.xml.in +data/oses/mandriva/mandriva2008.1.xml.in +data/oses/mandriva/mandriva2009.0.xml.in +data/oses/mandriva/mandriva2009.1.xml.in +data/oses/mandriva/mandriva2010.0.xml.in +data/oses/mandriva/mandriva2010.1.xml.in +data/oses/mandriva/mandriva2010.2.xml.in +data/oses/mandriva/mandriva2011.xml.in +data/oses/mandriva/mbs1.0.xml.in +data/oses/mandriva/mes5.xml.in +data/oses/mandriva/mes5.1.xml.in data/oses/msdos/msdos6.22.xml.in data/oses/netware.xml.in data/oses/solaris.xml.in -data/oses/mandriva.xml.in data/oses/suse.xml.in data/oses/rhel.xml.in data/oses/windows.xml.in -- 2.4.3 _______________________________________________ Libosinfo mailing list Libosinfo@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libosinfo
