On 19.10.2012 05:49, Zeeshan Ali (Khattak) wrote: > From: "Zeeshan Ali (Khattak)" <zeeshanak@xxxxxxxxx> > > --- > data/devices/Makefile.am | 14 +- > data/devices/qemu-pci.xml | 152 ----- > data/devices/qemu-pci.xml.in | 152 +++++ > data/devices/qemu-ps2.xml | 20 - > data/devices/qemu-ps2.xml.in | 20 + > data/devices/qemu-usb.xml | 14 - > data/devices/qemu-usb.xml.in | 14 + > data/devices/virtio-pci.xml | 54 -- > data/devices/virtio-pci.xml.in | 54 ++ > data/devices/xen.xml | 28 - > data/devices/xen.xml.in | 28 + > data/hypervisors/Makefile.am | 8 +- > data/hypervisors/rhel-xen.xml | 131 ---- > data/hypervisors/rhel-xen.xml.in | 131 ++++ > data/hypervisors/xen.xml | 287 -------- > data/hypervisors/xen.xml.in | 287 ++++++++ > data/oses/Makefile.am | 44 +- > data/oses/centos.xml | 39 -- > data/oses/centos.xml.in | 39 ++ > data/oses/debian.xml | 212 ------ > data/oses/debian.xml.in | 212 ++++++ > data/oses/dos.xml | 10 - > data/oses/dos.xml.in | 10 + > data/oses/fedora.xml | 1374 -------------------------------------- > data/oses/fedora.xml.in | 1374 ++++++++++++++++++++++++++++++++++++++ > data/oses/freebsd.xml | 521 --------------- > data/oses/freebsd.xml.in | 521 +++++++++++++++ > data/oses/gnome.xml | 32 - > data/oses/gnome.xml.in | 32 + > data/oses/macos.xml | 102 --- > data/oses/macos.xml.in | 102 +++ > data/oses/mandrake.xml | 219 ------ > data/oses/mandrake.xml.in | 219 ++++++ > data/oses/mandriva.xml | 166 ----- > data/oses/mandriva.xml.in | 166 +++++ > data/oses/netbsd.xml | 183 ----- > data/oses/netbsd.xml.in | 183 +++++ > data/oses/netware.xml | 29 - > data/oses/netware.xml.in | 29 + > data/oses/openbsd.xml | 210 ------ > data/oses/openbsd.xml.in | 210 ++++++ > data/oses/opensuse.xml | 238 ------- > data/oses/opensuse.xml.in | 238 +++++++ > data/oses/rhel.xml | 727 -------------------- > data/oses/rhel.xml.in | 727 ++++++++++++++++++++ > data/oses/rhl.xml | 285 -------- > data/oses/rhl.xml.in | 285 ++++++++ > data/oses/solaris.xml | 39 -- > data/oses/solaris.xml.in | 39 ++ > data/oses/suse.xml | 88 --- > data/oses/suse.xml.in | 88 +++ > data/oses/ubuntu.xml | 1186 -------------------------------- > data/oses/ubuntu.xml.in | 1186 ++++++++++++++++++++++++++++++++ > data/oses/windows.xml | 771 --------------------- > data/oses/windows.xml.in | 771 +++++++++++++++++++++ > po/POTFILES.in | 26 + > 56 files changed, 7186 insertions(+), 7140 deletions(-) > delete mode 100644 data/devices/qemu-pci.xml > create mode 100644 data/devices/qemu-pci.xml.in > delete mode 100644 data/devices/qemu-ps2.xml > create mode 100644 data/devices/qemu-ps2.xml.in > delete mode 100644 data/devices/qemu-usb.xml > create mode 100644 data/devices/qemu-usb.xml.in > delete mode 100644 data/devices/virtio-pci.xml > create mode 100644 data/devices/virtio-pci.xml.in > delete mode 100644 data/devices/xen.xml > create mode 100644 data/devices/xen.xml.in > delete mode 100644 data/hypervisors/rhel-xen.xml > create mode 100644 data/hypervisors/rhel-xen.xml.in > delete mode 100644 data/hypervisors/xen.xml > create mode 100644 data/hypervisors/xen.xml.in > delete mode 100644 data/oses/centos.xml > create mode 100644 data/oses/centos.xml.in > delete mode 100644 data/oses/debian.xml > create mode 100644 data/oses/debian.xml.in > delete mode 100644 data/oses/dos.xml > create mode 100644 data/oses/dos.xml.in > delete mode 100644 data/oses/fedora.xml > create mode 100644 data/oses/fedora.xml.in > delete mode 100644 data/oses/freebsd.xml > create mode 100644 data/oses/freebsd.xml.in > delete mode 100644 data/oses/gnome.xml > create mode 100644 data/oses/gnome.xml.in > delete mode 100644 data/oses/macos.xml > create mode 100644 data/oses/macos.xml.in > delete mode 100644 data/oses/mandrake.xml > create mode 100644 data/oses/mandrake.xml.in > delete mode 100644 data/oses/mandriva.xml > create mode 100644 data/oses/mandriva.xml.in > delete mode 100644 data/oses/netbsd.xml > create mode 100644 data/oses/netbsd.xml.in > delete mode 100644 data/oses/netware.xml > create mode 100644 data/oses/netware.xml.in > delete mode 100644 data/oses/openbsd.xml > create mode 100644 data/oses/openbsd.xml.in > delete mode 100644 data/oses/opensuse.xml > create mode 100644 data/oses/opensuse.xml.in > delete mode 100644 data/oses/rhel.xml > create mode 100644 data/oses/rhel.xml.in > delete mode 100644 data/oses/rhl.xml > create mode 100644 data/oses/rhl.xml.in > delete mode 100644 data/oses/solaris.xml > create mode 100644 data/oses/solaris.xml.in > delete mode 100644 data/oses/suse.xml > create mode 100644 data/oses/suse.xml.in > delete mode 100644 data/oses/ubuntu.xml > create mode 100644 data/oses/ubuntu.xml.in > delete mode 100644 data/oses/windows.xml > create mode 100644 data/oses/windows.xml.in > Haven't check you did just rename, but seems like Christophe did. > diff --git a/data/devices/Makefile.am b/data/devices/Makefile.am > index be6ed76..b0fed4a 100644 > --- a/data/devices/Makefile.am > +++ b/data/devices/Makefile.am > @@ -1,5 +1,15 @@ > > databasedir = $(pkgdatadir)/db/devices/ > -database_DATA = xen.xml qemu-pci.xml qemu-usb.xml qemu-ps2.xml virtio-pci.xml > +database_in_files = \ > + xen.xml.in \ bad indent because of TAB > + qemu-pci.xml.in \ > + qemu-usb.xml.in \ > + qemu-ps2.xml.in \ > + virtio-pci.xml.in > + $(NULL) > > -EXTRA_DIST = $(database_DATA) > +database_DATA = $(database_in_files:.xml.in=.xml) > + > +@INTLTOOL_XML_RULE@ This is causing 'make syntax-check' to fail. However, I am not sure how to avoid that other than adding rule to cfg.mk: exclude_file_name_regexp--sc_makefile_at_at_check = ^(data/devices/Makefile.am|data/hypervisors/Makefile.am|data/oses/Makefile.am) > + > +EXTRA_DIST = $(database_in_files) $(database_DATA) > diff --git a/po/POTFILES.in b/po/POTFILES.in > index 88dfb7e..e297640 100644 > --- a/po/POTFILES.in > +++ b/po/POTFILES.in > @@ -27,3 +27,29 @@ osinfo/osinfo_resources.c > osinfo/osinfo_resourceslist.c > osinfo/osinfo_tree.c > osinfo/osinfo_treelist.c > +data/oses/netware.xml.in > +data/oses/solaris.xml.in > +data/oses/dos.xml.in > +data/oses/mandrake.xml.in > +data/oses/mandriva.xml.in > +data/oses/suse.xml.in > +data/oses/gnome.xml.in > +data/oses/rhel.xml.in > +data/oses/fedora.xml.in > +data/oses/windows.xml.in > +data/oses/opensuse.xml.in > +data/oses/macos.xml.in > +data/oses/debian.xml.in > +data/oses/ubuntu.xml.in > +data/oses/centos.xml.in > +data/oses/openbsd.xml.in > +data/oses/freebsd.xml.in > +data/oses/rhl.xml.in > +data/oses/netbsd.xml.in > +data/devices/qemu-ps2.xml.in > +data/devices/qemu-pci.xml.in > +data/devices/virtio-pci.xml.in > +data/devices/qemu-usb.xml.in > +data/devices/xen.xml.in > +data/hypervisors/rhel-xen.xml.in > +data/hypervisors/xen.xml.in > Again, this should not be here until we really do some translation. Michal
