diff --git a/Makefile.am b/Makefile.am index 32db4c3..b53f778 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ -SUBDIRS = osinfo data test tools docs po examples +SUBDIRS = osinfo data test tools po examples INTLTOOL_FILES = \ intltool-extract.in \ diff --git a/Makefile.in b/Makefile.in index 157d25f..4c8cd4c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -394,7 +394,7 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -SUBDIRS = osinfo data test tools docs po examples +SUBDIRS = osinfo data test tools po examples INTLTOOL_FILES = \ intltool-extract.in \ intltool-merge.in \ diff --git a/configure b/configure index d6781fd..ba7698a 100755 --- a/configure +++ b/configure @@ -15510,7 +15510,7 @@ fi GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` -ac_config_files="$ac_config_files Makefile libosinfo.spec mingw-libosinfo.spec osinfo/Makefile osinfo/libosinfo-1.0.pc osinfo/osinfo_version.h data/Makefile data/datamap/Makefile data/datamap/microsoft.com/Makefile data/datamap/x.org/Makefile data/device/Makefile data/device/ibasetechnologies.net/Makefile data/device/ibm.com/Makefile data/device/pcisig.com/Makefile data/device/pcisig.com/pci-1000-0012.d/Makefile data/device/pcisig.com/pci-1013-00b8.d/Makefile data/device/pcisig.com/pci-1022-2000.d/Makefile data/device/pcisig.com/pci-10ec-8029.d/Makefile data/device/pcisig.com/pci-10ec-8139.d/Makefile data/device/pcisig.com/pci-1234-1111.d/Makefile data/device/pcisig.com/pci-1274-5000.d/Makefile data/device/pcisig.com/pci-15ad-0710.d/Makefile data/device/pcisig.com/pci-1af4-1000.d/Makefile data/device/pcisig.com/pci-1af4-1001.d/Makefile data/device/pcisig.com/pci-1af4-1002.d/Makefile data/device/pcisig.com/pci-1af4-1003.d/Makefile data/device/pcisig.com/pci-1af4-1009.d/Makefile data/device/pcisig.com/pci-1b36-0100.d/Makefile data/device/pcisig.com/pci-8086-100e.d/Makefile data/device/pcisig.com/pci-8086-2415.d/Makefile data/device/pcisig.com/pci-8086-25ab.d/Makefile data/device/pcisig.com/pci-8086-2668.d/Makefile data/device/usb.org/Makefile data/device/usb.org/usb-80ee-0021.d/Makefile data/device/xen.org/Makefile data/platform/Makefile data/platform/linux-kvm.org/Makefile data/platform/qemu.org/Makefile data/platform/redhat.com/Makefile data/platform/xen.org/Makefile data/install-script/Makefile data/install-script/debian.org/Makefile data/install-script/fedoraproject.org/Makefile data/install-script/microsoft.com/Makefile data/install-script/opensuse.org/Makefile data/install-script/redhat.com/Makefile data/install-script/ubuntu.com/Makefile data/os/Makefile data/os/altlinux.org/Makefile data/os/apple.com/Makefile data/os/centos.org/Makefile data/os/debian.org/Makefile data/os/fedoraproject.org/Makefile data/os/freebsd.org/Makefile data/os/gnome.org/Makefile data/os/mageia.org/Makefile data/os/mandriva.com/Makefile data/os/microsoft.com/Makefile data/os/netbsd.org/Makefile data/os/novell.com/Makefile data/os/openbsd.org/Makefile data/os/opensuse.org/Makefile data/os/oracle.com/Makefile data/os/redhat.com/Makefile data/os/sun.com/Makefile data/os/suse.com/Makefile data/os/ubuntu.com/Makefile data/schemas/Makefile tools/Makefile test/Makefile docs/Makefile docs/reference/Makefile examples/Makefile po/Makefile.in" +ac_config_files="$ac_config_files Makefile libosinfo.spec mingw-libosinfo.spec osinfo/Makefile osinfo/libosinfo-1.0.pc osinfo/osinfo_version.h data/Makefile data/datamap/Makefile data/datamap/x.org/Makefile data/device/Makefile data/device/ibasetechnologies.net/Makefile data/device/ibm.com/Makefile data/device/pcisig.com/Makefile data/device/pcisig.com/pci-1000-0012.d/Makefile data/device/pcisig.com/pci-1013-00b8.d/Makefile data/device/pcisig.com/pci-1022-2000.d/Makefile data/device/pcisig.com/pci-10ec-8029.d/Makefile data/device/pcisig.com/pci-10ec-8139.d/Makefile data/device/pcisig.com/pci-1234-1111.d/Makefile data/device/pcisig.com/pci-1274-5000.d/Makefile data/device/pcisig.com/pci-15ad-0710.d/Makefile data/device/pcisig.com/pci-1af4-1000.d/Makefile data/device/pcisig.com/pci-1af4-1001.d/Makefile data/device/pcisig.com/pci-1af4-1002.d/Makefile data/device/pcisig.com/pci-1af4-1003.d/Makefile data/device/pcisig.com/pci-1af4-1009.d/Makefile data/device/pcisig.com/pci-1b36-0100.d/Makefile data/device/pcisig.com/pci-8086-100e.d/Makefile data/device/pcisig.com/pci-8086-2415.d/Makefile data/device/pcisig.com/pci-8086-25ab.d/Makefile data/device/pcisig.com/pci-8086-2668.d/Makefile data/device/usb.org/Makefile data/device/usb.org/usb-80ee-0021.d/Makefile data/device/xen.org/Makefile data/platform/Makefile data/platform/linux-kvm.org/Makefile data/platform/qemu.org/Makefile data/platform/xen.org/Makefile data/schemas/Makefile tools/Makefile test/Makefile examples/Makefile po/Makefile.in" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -16599,7 +16599,6 @@ do "osinfo/osinfo_version.h") CONFIG_FILES="$CONFIG_FILES osinfo/osinfo_version.h" ;; "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;; "data/datamap/Makefile") CONFIG_FILES="$CONFIG_FILES data/datamap/Makefile" ;; - "data/datamap/microsoft.com/Makefile") CONFIG_FILES="$CONFIG_FILES data/datamap/microsoft.com/Makefile" ;; "data/datamap/x.org/Makefile") CONFIG_FILES="$CONFIG_FILES data/datamap/x.org/Makefile" ;; "data/device/Makefile") CONFIG_FILES="$CONFIG_FILES data/device/Makefile" ;; "data/device/ibasetechnologies.net/Makefile") CONFIG_FILES="$CONFIG_FILES data/device/ibasetechnologies.net/Makefile" ;; @@ -16629,40 +16628,10 @@ do "data/platform/Makefile") CONFIG_FILES="$CONFIG_FILES data/platform/Makefile" ;; "data/platform/linux-kvm.org/Makefile") CONFIG_FILES="$CONFIG_FILES data/platform/linux-kvm.org/Makefile" ;; "data/platform/qemu.org/Makefile") CONFIG_FILES="$CONFIG_FILES data/platform/qemu.org/Makefile" ;; - "data/platform/redhat.com/Makefile") CONFIG_FILES="$CONFIG_FILES data/platform/redhat.com/Makefile" ;; "data/platform/xen.org/Makefile") CONFIG_FILES="$CONFIG_FILES data/platform/xen.org/Makefile" ;; - "data/install-script/Makefile") CONFIG_FILES="$CONFIG_FILES data/install-script/Makefile" ;; - "data/install-script/debian.org/Makefile") CONFIG_FILES="$CONFIG_FILES data/install-script/debian.org/Makefile" ;; - "data/install-script/fedoraproject.org/Makefile") CONFIG_FILES="$CONFIG_FILES data/install-script/fedoraproject.org/Makefile" ;; - "data/install-script/microsoft.com/Makefile") CONFIG_FILES="$CONFIG_FILES data/install-script/microsoft.com/Makefile" ;; - "data/install-script/opensuse.org/Makefile") CONFIG_FILES="$CONFIG_FILES data/install-script/opensuse.org/Makefile" ;; - "data/install-script/redhat.com/Makefile") CONFIG_FILES="$CONFIG_FILES data/install-script/redhat.com/Makefile" ;; - "data/install-script/ubuntu.com/Makefile") CONFIG_FILES="$CONFIG_FILES data/install-script/ubuntu.com/Makefile" ;; - "data/os/Makefile") CONFIG_FILES="$CONFIG_FILES data/os/Makefile" ;; - "data/os/altlinux.org/Makefile") CONFIG_FILES="$CONFIG_FILES data/os/altlinux.org/Makefile" ;; - "data/os/apple.com/Makefile") CONFIG_FILES="$CONFIG_FILES data/os/apple.com/Makefile" ;; - "data/os/centos.org/Makefile") CONFIG_FILES="$CONFIG_FILES data/os/centos.org/Makefile" ;; - "data/os/debian.org/Makefile") CONFIG_FILES="$CONFIG_FILES data/os/debian.org/Makefile" ;; - "data/os/fedoraproject.org/Makefile") CONFIG_FILES="$CONFIG_FILES data/os/fedoraproject.org/Makefile" ;; - "data/os/freebsd.org/Makefile") CONFIG_FILES="$CONFIG_FILES data/os/freebsd.org/Makefile" ;; - "data/os/gnome.org/Makefile") CONFIG_FILES="$CONFIG_FILES data/os/gnome.org/Makefile" ;; - "data/os/mageia.org/Makefile") CONFIG_FILES="$CONFIG_FILES data/os/mageia.org/Makefile" ;; - "data/os/mandriva.com/Makefile") CONFIG_FILES="$CONFIG_FILES data/os/mandriva.com/Makefile" ;; - "data/os/microsoft.com/Makefile") CONFIG_FILES="$CONFIG_FILES data/os/microsoft.com/Makefile" ;; - "data/os/netbsd.org/Makefile") CONFIG_FILES="$CONFIG_FILES data/os/netbsd.org/Makefile" ;; - "data/os/novell.com/Makefile") CONFIG_FILES="$CONFIG_FILES data/os/novell.com/Makefile" ;; - "data/os/openbsd.org/Makefile") CONFIG_FILES="$CONFIG_FILES data/os/openbsd.org/Makefile" ;; - "data/os/opensuse.org/Makefile") CONFIG_FILES="$CONFIG_FILES data/os/opensuse.org/Makefile" ;; - "data/os/oracle.com/Makefile") CONFIG_FILES="$CONFIG_FILES data/os/oracle.com/Makefile" ;; - "data/os/redhat.com/Makefile") CONFIG_FILES="$CONFIG_FILES data/os/redhat.com/Makefile" ;; - "data/os/sun.com/Makefile") CONFIG_FILES="$CONFIG_FILES data/os/sun.com/Makefile" ;; - "data/os/suse.com/Makefile") CONFIG_FILES="$CONFIG_FILES data/os/suse.com/Makefile" ;; - "data/os/ubuntu.com/Makefile") CONFIG_FILES="$CONFIG_FILES data/os/ubuntu.com/Makefile" ;; "data/schemas/Makefile") CONFIG_FILES="$CONFIG_FILES data/schemas/Makefile" ;; "tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;; "test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;; - "docs/Makefile") CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;; - "docs/reference/Makefile") CONFIG_FILES="$CONFIG_FILES docs/reference/Makefile" ;; "examples/Makefile") CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;; "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;; diff --git a/configure.ac b/configure.ac index 6fc76d0..bfad581 100644 --- a/configure.ac +++ b/configure.ac @@ -247,7 +247,6 @@ AC_CONFIG_FILES([ osinfo/osinfo_version.h data/Makefile data/datamap/Makefile - data/datamap/microsoft.com/Makefile data/datamap/x.org/Makefile data/device/Makefile data/device/ibasetechnologies.net/Makefile @@ -277,40 +276,10 @@ AC_CONFIG_FILES([ data/platform/Makefile data/platform/linux-kvm.org/Makefile data/platform/qemu.org/Makefile - data/platform/redhat.com/Makefile data/platform/xen.org/Makefile - data/install-script/Makefile - data/install-script/debian.org/Makefile - data/install-script/fedoraproject.org/Makefile - data/install-script/microsoft.com/Makefile - data/install-script/opensuse.org/Makefile - data/install-script/redhat.com/Makefile - data/install-script/ubuntu.com/Makefile - data/os/Makefile - data/os/altlinux.org/Makefile - data/os/apple.com/Makefile - data/os/centos.org/Makefile - data/os/debian.org/Makefile - data/os/fedoraproject.org/Makefile - data/os/freebsd.org/Makefile - data/os/gnome.org/Makefile - data/os/mageia.org/Makefile - data/os/mandriva.com/Makefile - data/os/microsoft.com/Makefile - data/os/netbsd.org/Makefile - data/os/novell.com/Makefile - data/os/openbsd.org/Makefile - data/os/opensuse.org/Makefile - data/os/oracle.com/Makefile - data/os/redhat.com/Makefile - data/os/sun.com/Makefile - data/os/suse.com/Makefile - data/os/ubuntu.com/Makefile data/schemas/Makefile tools/Makefile test/Makefile - docs/Makefile - docs/reference/Makefile examples/Makefile po/Makefile.in ]) diff --git a/data/Makefile.am b/data/Makefile.am index ff0e84f..657e655 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,5 +1,5 @@ -SUBDIRS = datamap device os platform install-script schemas +SUBDIRS = datamap device platform schemas CLEANFILES = diff --git a/data/Makefile.in b/data/Makefile.in index 57bf207..5f03c6c 100644 --- a/data/Makefile.in +++ b/data/Makefile.in @@ -396,7 +396,7 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -SUBDIRS = datamap device os platform install-script schemas +SUBDIRS = datamap device platform schemas CLEANFILES = $(am__append_1) $(am__append_2) @LOCAL_USB_IDS_TRUE@usb_database_DATA = usb.ids @LOCAL_USB_IDS_TRUE@usb_databasedir = $(pkgdatadir)/ diff --git a/data/datamap/Makefile.am b/data/datamap/Makefile.am index 0061fe0..5ee6b47 100644 --- a/data/datamap/Makefile.am +++ b/data/datamap/Makefile.am @@ -1,5 +1,4 @@ SUBDIRS = \ - microsoft.com \ x.org \ $(NULL) diff --git a/data/datamap/Makefile.in b/data/datamap/Makefile.in index d128c90..c5416b9 100644 --- a/data/datamap/Makefile.in +++ b/data/datamap/Makefile.in @@ -364,7 +364,6 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = \ - microsoft.com \ x.org \ $(NULL) diff --git a/data/platform/Makefile.am b/data/platform/Makefile.am index 717811d..55011ce 100644 --- a/data/platform/Makefile.am +++ b/data/platform/Makefile.am @@ -2,6 +2,5 @@ SUBDIRS = \ linux-kvm.org \ qemu.org \ - redhat.com \ xen.org \ $(NULL) diff --git a/data/platform/Makefile.in b/data/platform/Makefile.in index 54cd833..1c5dd31 100644 --- a/data/platform/Makefile.in +++ b/data/platform/Makefile.in @@ -366,7 +366,6 @@ top_srcdir = @top_srcdir@ SUBDIRS = \ linux-kvm.org \ qemu.org \ - redhat.com \ xen.org \ $(NULL) diff --git a/examples/demo.js b/examples/demo.js index 28cf805..0f668bc 100755 --- a/examples/demo.js +++ b/examples/demo.js @@ -32,7 +32,7 @@ for (idx in osnames) { print (" OS short id " + name) } -var osid = "http://fedoraproject.org/fedora-11" +var osid = "https://wiki.parabola.nu/Get_Parabola" var hvid = "http://qemu.org/qemu-kvm-0.11.0" var drvclass = "net" //var drvclass = "audio" diff --git a/examples/libosinfo-dummy-data.xml b/examples/libosinfo-dummy-data.xml index 65d23b7..8df9f37 100644 --- a/examples/libosinfo-dummy-data.xml +++ b/examples/libosinfo-dummy-data.xml @@ -64,87 +64,11 @@ - - - fedora11 - Fedora 11 - 11 - Fedora Project - apples - marmot - aardvark - - - - - es1391 - - - ac97+ - - - - - - fedora10 - Fedora 10 - 10 - Fedora Project - - - - - ac97 - - - es1391 - - - - - - opensuse11.2 - OpenSuse 11.2 - 11.2 - OpenSuse Project + + parabola + Parabola GNU/Linux-libre + Parabola Project - - - - - - - ac97 - - - ES1370 - - - 3com - - - - - - - - - - - es1370 - - - ac97 - - - es1371 - - - 3com - - - - diff --git a/po/POTFILES.in b/po/POTFILES.in index 446432a..bd31157 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,350 +1,3 @@ -data/os/altlinux.org/altlinux-1.0.xml.in -data/os/altlinux.org/altlinux-2.0.xml.in -data/os/altlinux.org/altlinux-2.2.xml.in -data/os/altlinux.org/altlinux-2.4.xml.in -data/os/altlinux.org/altlinux-3.0.xml.in -data/os/altlinux.org/altlinux-4.0.xml.in -data/os/altlinux.org/altlinux-4.1.xml.in -data/os/altlinux.org/altlinux-5.0.xml.in -data/os/altlinux.org/altlinux-6.0.xml.in -data/os/altlinux.org/altlinux-7.0.xml.in -data/os/apple.com/macosx-10.0.xml.in -data/os/apple.com/macosx-10.1.xml.in -data/os/apple.com/macosx-10.2.xml.in -data/os/apple.com/macosx-10.3.xml.in -data/os/apple.com/macosx-10.4.xml.in -data/os/apple.com/macosx-10.5.xml.in -data/os/apple.com/macosx-10.6.xml.in -data/os/apple.com/macosx-10.7.xml.in -data/os/centos.org/centos-6.0.xml.in -data/os/centos.org/centos-6.1.xml.in -data/os/centos.org/centos-6.2.xml.in -data/os/centos.org/centos-6.3.xml.in -data/os/centos.org/centos-6.4.xml.in -data/os/centos.org/centos-6.5.xml.in -data/os/centos.org/centos-6.6.xml.in -data/os/centos.org/centos-6.7.xml.in -data/os/centos.org/centos-7.0.xml.in -data/os/debian.org/debian-1.1.xml.in -data/os/debian.org/debian-1.2.xml.in -data/os/debian.org/debian-1.3.xml.in -data/os/debian.org/debian-2.0.xml.in -data/os/debian.org/debian-2.1.xml.in -data/os/debian.org/debian-2.2.xml.in -data/os/debian.org/debian-3.1.xml.in -data/os/debian.org/debian-3.xml.in -data/os/debian.org/debian-4.xml.in -data/os/debian.org/debian-5.xml.in -data/os/debian.org/debian-6.xml.in -data/os/debian.org/debian-7.xml.in -data/os/debian.org/debian-8.xml.in -data/os/debian.org/debian-testing.xml.in -data/os/fedoraproject.org/fedora-1.xml.in -data/os/fedoraproject.org/fedora-2.xml.in -data/os/fedoraproject.org/fedora-3.xml.in -data/os/fedoraproject.org/fedora-4.xml.in -data/os/fedoraproject.org/fedora-5.xml.in -data/os/fedoraproject.org/fedora-6.xml.in -data/os/fedoraproject.org/fedora-7.xml.in -data/os/fedoraproject.org/fedora-8.xml.in -data/os/fedoraproject.org/fedora-9.xml.in -data/os/fedoraproject.org/fedora-10.xml.in -data/os/fedoraproject.org/fedora-11.xml.in -data/os/fedoraproject.org/fedora-12.xml.in -data/os/fedoraproject.org/fedora-13.xml.in -data/os/fedoraproject.org/fedora-14.xml.in -data/os/fedoraproject.org/fedora-15.xml.in -data/os/fedoraproject.org/fedora-16.xml.in -data/os/fedoraproject.org/fedora-17.xml.in -data/os/fedoraproject.org/fedora-18.xml.in -data/os/fedoraproject.org/fedora-19.xml.in -data/os/fedoraproject.org/fedora-20.xml.in -data/os/fedoraproject.org/fedora-21.xml.in -data/os/fedoraproject.org/fedora-22.xml.in -data/os/fedoraproject.org/fedora-23.xml.in -data/os/fedoraproject.org/fedora-unknown.xml.in -data/os/freebsd.org/freebsd-1.0.xml.in -data/os/freebsd.org/freebsd-2.0.5.xml.in -data/os/freebsd.org/freebsd-2.0.xml.in -data/os/freebsd.org/freebsd-2.2.8.xml.in -data/os/freebsd.org/freebsd-2.2.9.xml.in -data/os/freebsd.org/freebsd-3.0.xml.in -data/os/freebsd.org/freebsd-3.2.xml.in -data/os/freebsd.org/freebsd-4.0.xml.in -data/os/freebsd.org/freebsd-4.10.xml.in -data/os/freebsd.org/freebsd-4.11.xml.in -data/os/freebsd.org/freebsd-4.1.xml.in -data/os/freebsd.org/freebsd-4.2.xml.in -data/os/freebsd.org/freebsd-4.3.xml.in -data/os/freebsd.org/freebsd-4.4.xml.in -data/os/freebsd.org/freebsd-4.5.xml.in -data/os/freebsd.org/freebsd-4.6.xml.in -data/os/freebsd.org/freebsd-4.7.xml.in -data/os/freebsd.org/freebsd-4.8.xml.in -data/os/freebsd.org/freebsd-4.9.xml.in -data/os/freebsd.org/freebsd-5.0.xml.in -data/os/freebsd.org/freebsd-5.1.xml.in -data/os/freebsd.org/freebsd-5.2.1.xml.in -data/os/freebsd.org/freebsd-5.2.xml.in -data/os/freebsd.org/freebsd-5.3.xml.in -data/os/freebsd.org/freebsd-5.4.xml.in -data/os/freebsd.org/freebsd-5.5.xml.in -data/os/freebsd.org/freebsd-6.0.xml.in -data/os/freebsd.org/freebsd-6.1.xml.in -data/os/freebsd.org/freebsd-6.2.xml.in -data/os/freebsd.org/freebsd-6.3.xml.in -data/os/freebsd.org/freebsd-6.4.xml.in -data/os/freebsd.org/freebsd-7.0.xml.in -data/os/freebsd.org/freebsd-7.1.xml.in -data/os/freebsd.org/freebsd-7.2.xml.in -data/os/freebsd.org/freebsd-7.3.xml.in -data/os/freebsd.org/freebsd-7.4.xml.in -data/os/freebsd.org/freebsd-8.0.xml.in -data/os/freebsd.org/freebsd-8.1.xml.in -data/os/freebsd.org/freebsd-8.2.xml.in -data/os/freebsd.org/freebsd-8.3.xml.in -data/os/freebsd.org/freebsd-8.4.xml.in -data/os/freebsd.org/freebsd-9.0.xml.in -data/os/freebsd.org/freebsd-9.1.xml.in -data/os/freebsd.org/freebsd-9.2.xml.in -data/os/freebsd.org/freebsd-9.3.xml.in -data/os/freebsd.org/freebsd-10.0.xml.in -data/os/freebsd.org/freebsd-10.1.xml.in -data/os/freebsd.org/freebsd-10.2.xml.in -data/os/freebsd.org/freebsd-10.3.xml.in -data/os/gnome.org/gnome-3.6.xml.in -data/os/gnome.org/gnome-3.8.xml.in -data/os/gnome.org/gnome-continuous-3.10.xml.in -data/os/gnome.org/gnome-continuous-3.12.xml.in -data/os/gnome.org/gnome-continuous-3.14.xml.in -data/os/mageia.org/mageia-1.xml.in -data/os/mageia.org/mageia-2.xml.in -data/os/mageia.org/mageia-3.xml.in -data/os/mandriva.com/mandrake-5.1.xml.in -data/os/mandriva.com/mandrake-5.2.xml.in -data/os/mandriva.com/mandrake-5.3.xml.in -data/os/mandriva.com/mandrake-6.0.xml.in -data/os/mandriva.com/mandrake-6.1.xml.in -data/os/mandriva.com/mandrake-7.0.xml.in -data/os/mandriva.com/mandrake-7.1.xml.in -data/os/mandriva.com/mandrake-7.2.xml.in -data/os/mandriva.com/mandrake-8.0.xml.in -data/os/mandriva.com/mandrake-8.1.xml.in -data/os/mandriva.com/mandrake-8.2.xml.in -data/os/mandriva.com/mandrake-9.0.xml.in -data/os/mandriva.com/mandrake-9.1.xml.in -data/os/mandriva.com/mandrake-9.2.xml.in -data/os/mandriva.com/mandrake-10.0.xml.in -data/os/mandriva.com/mandrake-10.1.xml.in -data/os/mandriva.com/mandrake-10.2.xml.in -data/os/mandriva.com/mandriva-2006.0.xml.in -data/os/mandriva.com/mandriva-2007.1.xml.in -data/os/mandriva.com/mandriva-2007.xml.in -data/os/mandriva.com/mandriva-2008.0.xml.in -data/os/mandriva.com/mandriva-2008.1.xml.in -data/os/mandriva.com/mandriva-2009.0.xml.in -data/os/mandriva.com/mandriva-2009.1.xml.in -data/os/mandriva.com/mandriva-2010.0.xml.in -data/os/mandriva.com/mandriva-2010.1.xml.in -data/os/mandriva.com/mandriva-2010.2.xml.in -data/os/mandriva.com/mandriva-2011.xml.in -data/os/mandriva.com/mbs-1.0.xml.in -data/os/mandriva.com/mes-5.0.xml.in -data/os/mandriva.com/mes-5.1.xml.in -data/os/microsoft.com/msdos-6.22.xml.in -data/os/microsoft.com/win-1.0.xml.in -data/os/microsoft.com/win-10.xml.in -data/os/microsoft.com/win-2.0.xml.in -data/os/microsoft.com/win-2.1.xml.in -data/os/microsoft.com/win-2k12r2.xml.in -data/os/microsoft.com/win-2k12.xml.in -data/os/microsoft.com/win-2k3r2.xml.in -data/os/microsoft.com/win-2k3.xml.in -data/os/microsoft.com/win-2k8r2.xml.in -data/os/microsoft.com/win-2k8.xml.in -data/os/microsoft.com/win-2k.xml.in -data/os/microsoft.com/win-3.1.xml.in -data/os/microsoft.com/win-7.xml.in -data/os/microsoft.com/win-8.1.xml.in -data/os/microsoft.com/win-8.xml.in -data/os/microsoft.com/win-95.xml.in -data/os/microsoft.com/win-98.xml.in -data/os/microsoft.com/win-me.xml.in -data/os/microsoft.com/winnt-3.1.xml.in -data/os/microsoft.com/winnt-3.51.xml.in -data/os/microsoft.com/winnt-3.5.xml.in -data/os/microsoft.com/winnt-4.0.xml.in -data/os/microsoft.com/win-vista.xml.in -data/os/microsoft.com/win-xp.xml.in -data/os/netbsd.org/netbsd-0.8.xml.in -data/os/netbsd.org/netbsd-0.9.xml.in -data/os/netbsd.org/netbsd-1.0.xml.in -data/os/netbsd.org/netbsd-1.1.xml.in -data/os/netbsd.org/netbsd-1.2.xml.in -data/os/netbsd.org/netbsd-1.3.xml.in -data/os/netbsd.org/netbsd-1.4.xml.in -data/os/netbsd.org/netbsd-1.5.xml.in -data/os/netbsd.org/netbsd-1.6.xml.in -data/os/netbsd.org/netbsd-2.0.xml.in -data/os/netbsd.org/netbsd-3.0.xml.in -data/os/netbsd.org/netbsd-4.0.xml.in -data/os/netbsd.org/netbsd-5.0.xml.in -data/os/netbsd.org/netbsd-5.1.xml.in -data/os/novell.com/netware-4.xml.in -data/os/novell.com/netware-5.xml.in -data/os/novell.com/netware-6.xml.in -data/os/openbsd.org/openbsd-4.2.xml.in -data/os/openbsd.org/openbsd-4.3.xml.in -data/os/openbsd.org/openbsd-4.4.xml.in -data/os/openbsd.org/openbsd-4.5.xml.in -data/os/openbsd.org/openbsd-4.8.xml.in -data/os/openbsd.org/openbsd-4.9.xml.in -data/os/openbsd.org/openbsd-5.0.xml.in -data/os/openbsd.org/openbsd-5.1.xml.in -data/os/openbsd.org/openbsd-5.2.xml.in -data/os/openbsd.org/openbsd-5.3.xml.in -data/os/openbsd.org/openbsd-5.4.xml.in -data/os/openbsd.org/openbsd-5.5.xml.in -data/os/openbsd.org/openbsd-5.6.xml.in -data/os/openbsd.org/openbsd-5.7.xml.in -data/os/openbsd.org/openbsd-5.8.xml.in -data/os/opensuse.org/opensuse-10.2.xml.in -data/os/opensuse.org/opensuse-10.3.xml.in -data/os/opensuse.org/opensuse-11.0.xml.in -data/os/opensuse.org/opensuse-11.1.xml.in -data/os/opensuse.org/opensuse-11.2.xml.in -data/os/opensuse.org/opensuse-11.3.xml.in -data/os/opensuse.org/opensuse-11.4.xml.in -data/os/opensuse.org/opensuse-12.1.xml.in -data/os/opensuse.org/opensuse-12.2.xml.in -data/os/opensuse.org/opensuse-12.3.xml.in -data/os/opensuse.org/opensuse-13.1.xml.in -data/os/opensuse.org/opensuse-13.2.xml.in -data/os/opensuse.org/opensuse-42.1.xml.in -data/os/opensuse.org/opensuse-tumbleweed.xml.in -data/os/opensuse.org/opensuse-factory.xml.in -data/os/opensuse.org/opensuse-unknown.xml.in -data/os/oracle.com/solaris-11.xml.in -data/os/redhat.com/rhel-2.1.1.xml.in -data/os/redhat.com/rhel-2.1.2.xml.in -data/os/redhat.com/rhel-2.1.3.xml.in -data/os/redhat.com/rhel-2.1.4.xml.in -data/os/redhat.com/rhel-2.1.5.xml.in -data/os/redhat.com/rhel-2.1.6.xml.in -data/os/redhat.com/rhel-2.1.7.xml.in -data/os/redhat.com/rhel-2.1.xml.in -data/os/redhat.com/rhel-3.1.xml.in -data/os/redhat.com/rhel-3.2.xml.in -data/os/redhat.com/rhel-3.3.xml.in -data/os/redhat.com/rhel-3.4.xml.in -data/os/redhat.com/rhel-3.5.xml.in -data/os/redhat.com/rhel-3.6.xml.in -data/os/redhat.com/rhel-3.7.xml.in -data/os/redhat.com/rhel-3.8.xml.in -data/os/redhat.com/rhel-3.9.xml.in -data/os/redhat.com/rhel-3.xml.in -data/os/redhat.com/rhel-4.0.xml.in -data/os/redhat.com/rhel-4.1.xml.in -data/os/redhat.com/rhel-4.2.xml.in -data/os/redhat.com/rhel-4.3.xml.in -data/os/redhat.com/rhel-4.4.xml.in -data/os/redhat.com/rhel-4.5.xml.in -data/os/redhat.com/rhel-4.6.xml.in -data/os/redhat.com/rhel-4.7.xml.in -data/os/redhat.com/rhel-4.8.xml.in -data/os/redhat.com/rhel-4.9.xml.in -data/os/redhat.com/rhel-5.0.xml.in -data/os/redhat.com/rhel-5.10.xml.in -data/os/redhat.com/rhel-5.11.xml.in -data/os/redhat.com/rhel-5.1.xml.in -data/os/redhat.com/rhel-5.2.xml.in -data/os/redhat.com/rhel-5.3.xml.in -data/os/redhat.com/rhel-5.4.xml.in -data/os/redhat.com/rhel-5.5.xml.in -data/os/redhat.com/rhel-5.6.xml.in -data/os/redhat.com/rhel-5.7.xml.in -data/os/redhat.com/rhel-5.8.xml.in -data/os/redhat.com/rhel-5.9.xml.in -data/os/redhat.com/rhel-6.0.xml.in -data/os/redhat.com/rhel-6.1.xml.in -data/os/redhat.com/rhel-6.2.xml.in -data/os/redhat.com/rhel-6.3.xml.in -data/os/redhat.com/rhel-6.4.xml.in -data/os/redhat.com/rhel-6.5.xml.in -data/os/redhat.com/rhel-6.6.xml.in -data/os/redhat.com/rhel-6.7.xml.in -data/os/redhat.com/rhel-6.8.xml.in -data/os/redhat.com/rhel-7.0.xml.in -data/os/redhat.com/rhel-7.1.xml.in -data/os/redhat.com/rhel-7.2.xml.in -data/os/redhat.com/rhel-atomic-7.0.xml.in -data/os/redhat.com/rhel-atomic-7.1.xml.in -data/os/redhat.com/rhel-atomic-7.2.xml.in -data/os/redhat.com/rhl-1.0.xml.in -data/os/redhat.com/rhl-1.1.xml.in -data/os/redhat.com/rhl-2.0.xml.in -data/os/redhat.com/rhl-2.1.xml.in -data/os/redhat.com/rhl-3.0.3.xml.in -data/os/redhat.com/rhl-4.0.xml.in -data/os/redhat.com/rhl-4.1.xml.in -data/os/redhat.com/rhl-4.2.xml.in -data/os/redhat.com/rhl-5.0.xml.in -data/os/redhat.com/rhl-5.1.xml.in -data/os/redhat.com/rhl-5.2.xml.in -data/os/redhat.com/rhl-6.0.xml.in -data/os/redhat.com/rhl-6.1.xml.in -data/os/redhat.com/rhl-6.2.xml.in -data/os/redhat.com/rhl-7.1.xml.in -data/os/redhat.com/rhl-7.2.xml.in -data/os/redhat.com/rhl-7.3.xml.in -data/os/redhat.com/rhl-7.xml.in -data/os/redhat.com/rhl-8.0.xml.in -data/os/redhat.com/rhl-9.xml.in -data/os/sun.com/opensolaris-2009.06.xml.in -data/os/sun.com/solaris-9.xml.in -data/os/sun.com/solaris-10.xml.in -data/os/suse.com/sled-9.xml.in -data/os/suse.com/sled-10.xml.in -data/os/suse.com/sled-11.1.xml.in -data/os/suse.com/sled-11.2.xml.in -data/os/suse.com/sled-11.3.xml.in -data/os/suse.com/sled-11.4.xml.in -data/os/suse.com/sled-11.xml.in -data/os/suse.com/sled-12.xml.in -data/os/suse.com/sled-12.1.xml.in -data/os/suse.com/sles-9.xml.in -data/os/suse.com/sles-10.xml.in -data/os/suse.com/sles-11.1.xml.in -data/os/suse.com/sles-11.2.xml.in -data/os/suse.com/sles-11.3.xml.in -data/os/suse.com/sles-11.4.xml.in -data/os/suse.com/sles-11.xml.in -data/os/suse.com/sles-12.xml.in -data/os/suse.com/sles-12.1.xml.in -data/os/ubuntu.com/ubuntu-4.10.xml.in -data/os/ubuntu.com/ubuntu-5.04.xml.in -data/os/ubuntu.com/ubuntu-5.10.xml.in -data/os/ubuntu.com/ubuntu-6.06.xml.in -data/os/ubuntu.com/ubuntu-6.10.xml.in -data/os/ubuntu.com/ubuntu-7.04.xml.in -data/os/ubuntu.com/ubuntu-7.10.xml.in -data/os/ubuntu.com/ubuntu-8.04.xml.in -data/os/ubuntu.com/ubuntu-8.10.xml.in -data/os/ubuntu.com/ubuntu-9.04.xml.in -data/os/ubuntu.com/ubuntu-9.10.xml.in -data/os/ubuntu.com/ubuntu-10.04.xml.in -data/os/ubuntu.com/ubuntu-10.10.xml.in -data/os/ubuntu.com/ubuntu-11.04.xml.in -data/os/ubuntu.com/ubuntu-11.10.xml.in -data/os/ubuntu.com/ubuntu-12.04.xml.in -data/os/ubuntu.com/ubuntu-12.10.xml.in -data/os/ubuntu.com/ubuntu-13.04.xml.in -data/os/ubuntu.com/ubuntu-13.10.xml.in -data/os/ubuntu.com/ubuntu-14.04.xml.in -data/os/ubuntu.com/ubuntu-14.10.xml.in -data/os/ubuntu.com/ubuntu-15.04.xml.in -data/os/ubuntu.com/ubuntu-15.10.xml.in -data/os/ubuntu.com/ubuntu-16.04.xml.in data/platform/linux-kvm.org/qemu-kvm-1.0.1.xml.in data/platform/linux-kvm.org/qemu-kvm-1.0.xml.in data/platform/linux-kvm.org/qemu-kvm-1.1.0.xml.in @@ -385,14 +38,6 @@ data/platform/qemu.org/qemu-2.1.3.xml.in data/platform/qemu.org/qemu-2.2.0.xml.in data/platform/qemu.org/qemu-2.2.1.xml.in data/platform/qemu.org/qemu-2.3.0.xml.in -data/platform/redhat.com/xen-rhel-3.0.3.5.0.xml.in -data/platform/redhat.com/xen-rhel-3.1.0.5.1.xml.in -data/platform/redhat.com/xen-rhel-3.1.0.5.2.xml.in -data/platform/redhat.com/xen-rhel-3.1.0.5.3.xml.in -data/platform/redhat.com/xen-rhel-3.1.0.5.4.xml.in -data/platform/redhat.com/xen-rhel-3.1.0.5.5.xml.in -data/platform/redhat.com/xen-rhel-3.1.0.5.6.xml.in -data/platform/redhat.com/xen-rhel-3.1.0.5.7.xml.in data/platform/xen.org/xen-3.0.2.xml.in data/platform/xen.org/xen-3.0.3.xml.in data/platform/xen.org/xen-3.0.4.xml.in diff --git b/po/POTFILES.skip b/po/POTFILES.skip new file mode 100644 index 0000000..c867203 --- /dev/null +++ b/po/POTFILES.skip @@ -0,0 +1,8 @@ +data/platform/redhat.com/xen-rhel-3.0.3.5.0.xml.in +data/platform/redhat.com/xen-rhel-3.1.0.5.1.xml.in +data/platform/redhat.com/xen-rhel-3.1.0.5.2.xml.in +data/platform/redhat.com/xen-rhel-3.1.0.5.3.xml.in +data/platform/redhat.com/xen-rhel-3.1.0.5.4.xml.in +data/platform/redhat.com/xen-rhel-3.1.0.5.5.xml.in +data/platform/redhat.com/xen-rhel-3.1.0.5.6.xml.in +data/platform/redhat.com/xen-rhel-3.1.0.5.7.xml.in diff --git a/test/test-isodetect.c b/test/test-isodetect.c index a1d3ccc..e4d82c3 100644 --- a/test/test-isodetect.c +++ b/test/test-isodetect.c @@ -366,90 +366,6 @@ static void test_one(const gchar *vendor) g_object_unref(loader); } -START_TEST(test_fedora) -{ - test_one("fedora"); -} -END_TEST - -START_TEST(test_rhel) -{ - test_one("rhel"); -} -END_TEST - -START_TEST(test_ubuntu) -{ - test_one("ubuntu"); -} -END_TEST - -START_TEST(test_debian) -{ - test_one("debian"); -} -END_TEST - -START_TEST(test_windows) -{ - test_one("windows"); -} -END_TEST - -START_TEST(test_freebsd) -{ - test_one("freebsd"); -} -END_TEST - -START_TEST(test_openbsd) -{ - test_one("openbsd"); -} -END_TEST - -START_TEST(test_opensuse) -{ - test_one("opensuse"); -} -END_TEST - -START_TEST(test_centos) -{ - test_one("centos"); -} -END_TEST - -START_TEST(test_gnome) -{ - test_one("gnome"); -} -END_TEST - -START_TEST(test_altlinux) -{ - test_one("altlinux"); -} -END_TEST - -START_TEST(test_mageia) -{ - test_one("mageia"); -} -END_TEST - -START_TEST(test_sles) -{ - test_one("sles"); -} -END_TEST - -START_TEST(test_sled) -{ - test_one("sled"); -} -END_TEST - static Suite * list_suite(void) { @@ -457,20 +373,6 @@ list_suite(void) TCase *tc = tcase_create("Core"); tcase_set_timeout(tc, 20); - tcase_add_test(tc, test_fedora); - tcase_add_test(tc, test_rhel); - tcase_add_test(tc, test_ubuntu); - tcase_add_test(tc, test_debian); - tcase_add_test(tc, test_windows); - tcase_add_test(tc, test_freebsd); - tcase_add_test(tc, test_openbsd); - tcase_add_test(tc, test_opensuse); - tcase_add_test(tc, test_centos); - tcase_add_test(tc, test_gnome); - tcase_add_test(tc, test_altlinux); - tcase_add_test(tc, test_mageia); - tcase_add_test(tc, test_sles); - tcase_add_test(tc, test_sled); suite_add_tcase(s, tc); return s; } diff --git a/test/test-xml-validate b/test/test-xml-validate index 66a552f..ae53a46 100755 --- a/test/test-xml-validate +++ b/test/test-xml-validate @@ -42,7 +42,7 @@ exit $ret : ${srcdir=.} . $srcdir/test-lib.sh -DIRS="datamap os platform device install-script" +DIRS="datamap platform device" SCHEMA="libosinfo.rng" check_schema "$DIRS" "$SCHEMA"