Signed-off-by: Daniel P. Berrange <berrange@xxxxxxxxxx> --- configure.ac | 1 + data/oses/Makefile.am | 2 +- data/oses/debian.org/Makefile.am | 1 + data/oses/debian.org/debian-1.1.xml.in | 11 ++ data/oses/debian.org/debian-1.2.xml.in | 13 ++ data/oses/debian.org/debian-1.3.xml.in | 13 ++ data/oses/debian.org/debian-2.0.xml.in | 13 ++ data/oses/debian.org/debian-2.1.xml.in | 13 ++ data/oses/debian.org/debian-2.2.xml.in | 13 ++ data/oses/debian.org/debian-3.1.xml.in | 13 ++ data/oses/debian.org/debian-3.xml.in | 13 ++ data/oses/debian.org/debian-4.xml.in | 13 ++ data/oses/debian.org/debian-5.xml.in | 32 ++++ data/oses/debian.org/debian-6.xml.in | 71 ++++++++ data/oses/debian.org/debian-7.xml.in | 53 ++++++ data/oses/debian.org/debian-8.xml.in | 53 ++++++ data/oses/debian.xml.in | 315 --------------------------------- po/POTFILES.in | 14 +- 18 files changed, 340 insertions(+), 317 deletions(-) create mode 100644 data/oses/debian.org/Makefile.am create mode 100644 data/oses/debian.org/debian-1.1.xml.in create mode 100644 data/oses/debian.org/debian-1.2.xml.in create mode 100644 data/oses/debian.org/debian-1.3.xml.in create mode 100644 data/oses/debian.org/debian-2.0.xml.in create mode 100644 data/oses/debian.org/debian-2.1.xml.in create mode 100644 data/oses/debian.org/debian-2.2.xml.in create mode 100644 data/oses/debian.org/debian-3.1.xml.in create mode 100644 data/oses/debian.org/debian-3.xml.in create mode 100644 data/oses/debian.org/debian-4.xml.in create mode 100644 data/oses/debian.org/debian-5.xml.in create mode 100644 data/oses/debian.org/debian-6.xml.in create mode 100644 data/oses/debian.org/debian-7.xml.in create mode 100644 data/oses/debian.org/debian-8.xml.in delete mode 100644 data/oses/debian.xml.in diff --git a/configure.ac b/configure.ac index a91265c..896d346 100644 --- a/configure.ac +++ b/configure.ac @@ -174,6 +174,7 @@ AC_CONFIG_FILES([ data/oses/Makefile data/oses/altlinux.org/Makefile data/oses/centos.org/Makefile + data/oses/debian.org/Makefile data/schemas/Makefile tools/Makefile test/Makefile diff --git a/data/oses/Makefile.am b/data/oses/Makefile.am index 13b18cf..b304b8a 100644 --- a/data/oses/Makefile.am +++ b/data/oses/Makefile.am @@ -2,11 +2,11 @@ SUBDIRS = \ altlinux.org \ centos.org \ + debian.org \ $(NULL) databasedir = $(pkgdatadir)/db/oses/ database_in_files = \ - debian.xml.in \ dos.xml.in \ fedora.xml.in \ freebsd.xml.in \ diff --git a/data/oses/debian.org/Makefile.am b/data/oses/debian.org/Makefile.am new file mode 100644 index 0000000..ee4552b --- /dev/null +++ b/data/oses/debian.org/Makefile.am @@ -0,0 +1 @@ +include ../../Makefile.inc diff --git a/data/oses/debian.org/debian-1.1.xml.in b/data/oses/debian.org/debian-1.1.xml.in new file mode 100644 index 0000000..4a6528d --- /dev/null +++ b/data/oses/debian.org/debian-1.1.xml.in @@ -0,0 +1,11 @@ +<libosinfo version="0.0.1"> + <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> + <_vendor>Debian Project</_vendor> + <family>linux</family> + <distro>debian</distro> + </os> +</libosinfo> diff --git a/data/oses/debian.org/debian-1.2.xml.in b/data/oses/debian.org/debian-1.2.xml.in new file mode 100644 index 0000000..d67f986 --- /dev/null +++ b/data/oses/debian.org/debian-1.2.xml.in @@ -0,0 +1,13 @@ +<libosinfo version="0.0.1"> + <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/debian/1.1"/> + <derives-from id="http://debian.org/debian/1.1"/> + </os> +</libosinfo> diff --git a/data/oses/debian.org/debian-1.3.xml.in b/data/oses/debian.org/debian-1.3.xml.in new file mode 100644 index 0000000..64b5b38 --- /dev/null +++ b/data/oses/debian.org/debian-1.3.xml.in @@ -0,0 +1,13 @@ +<libosinfo version="0.0.1"> + <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/debian/1.2"/> + <derives-from id="http://debian.org/debian/1.2"/> + </os> +</libosinfo> diff --git a/data/oses/debian.org/debian-2.0.xml.in b/data/oses/debian.org/debian-2.0.xml.in new file mode 100644 index 0000000..f5f2196 --- /dev/null +++ b/data/oses/debian.org/debian-2.0.xml.in @@ -0,0 +1,13 @@ +<libosinfo version="0.0.1"> + <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/debian/1.3"/> + <derives-from id="http://debian.org/debian/1.3"/> + </os> +</libosinfo> diff --git a/data/oses/debian.org/debian-2.1.xml.in b/data/oses/debian.org/debian-2.1.xml.in new file mode 100644 index 0000000..469a25b --- /dev/null +++ b/data/oses/debian.org/debian-2.1.xml.in @@ -0,0 +1,13 @@ +<libosinfo version="0.0.1"> + <os id="http://debian.org/debian/2.1";> + <short-id>debian2.1</short-id> + <short-id>debianslink</short-id> + <_name>Debian Slink</_name> + <version>2.1</version> + <_vendor>Debian Project</_vendor> + <family>linux</family> + <distro>debian</distro> + <upgrades id="http://debian.org/debian/2.0"/> + <derives-from id="http://debian.org/debian/2.0"/> + </os> +</libosinfo> diff --git a/data/oses/debian.org/debian-2.2.xml.in b/data/oses/debian.org/debian-2.2.xml.in new file mode 100644 index 0000000..e582061 --- /dev/null +++ b/data/oses/debian.org/debian-2.2.xml.in @@ -0,0 +1,13 @@ +<libosinfo version="0.0.1"> + <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/debian/2.1"/> + <derives-from id="http://debian.org/debian/2.1"/> + </os> +</libosinfo> diff --git a/data/oses/debian.org/debian-3.1.xml.in b/data/oses/debian.org/debian-3.1.xml.in new file mode 100644 index 0000000..9311630 --- /dev/null +++ b/data/oses/debian.org/debian-3.1.xml.in @@ -0,0 +1,13 @@ +<libosinfo version="0.0.1"> + <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/debian/3"/> + <derives-from id="http://debian.org/debian/3"/> + </os> +</libosinfo> diff --git a/data/oses/debian.org/debian-3.xml.in b/data/oses/debian.org/debian-3.xml.in new file mode 100644 index 0000000..8209bb1 --- /dev/null +++ b/data/oses/debian.org/debian-3.xml.in @@ -0,0 +1,13 @@ +<libosinfo version="0.0.1"> + <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/debian/2.2"/> + <derives-from id="http://debian.org/debian/2.2"/> + </os> +</libosinfo> diff --git a/data/oses/debian.org/debian-4.xml.in b/data/oses/debian.org/debian-4.xml.in new file mode 100644 index 0000000..3cb6ffa --- /dev/null +++ b/data/oses/debian.org/debian-4.xml.in @@ -0,0 +1,13 @@ +<libosinfo version="0.0.1"> + <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/debian/3.1"/> + <derives-from id="http://debian.org/debian/3.1"/> + </os> +</libosinfo> diff --git a/data/oses/debian.org/debian-5.xml.in b/data/oses/debian.org/debian-5.xml.in new file mode 100644 index 0000000..8129fda --- /dev/null +++ b/data/oses/debian.org/debian-5.xml.in @@ -0,0 +1,32 @@ +<libosinfo version="0.0.1"> + <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/debian/4"/> + <derives-from id="http://debian.org/debian/4"/> + + <devices> + <device id="http://pcisig.com/pci/1af4/1000"/> + <device id="http://pcisig.com/pci/1af4/1001"/> + </devices> + + <resources arch="all"> + <minimum> + <cpu>1000000000</cpu> + <n-cpus>1</n-cpus> + <ram>134217728</ram> + <storage>5368709120</storage> + </minimum> + <recommended> + <cpu>1000000000</cpu> + <ram>536870912</ram> + <storage>5368709120</storage> + </recommended> + </resources> + </os> +</libosinfo> diff --git a/data/oses/debian.org/debian-6.xml.in b/data/oses/debian.org/debian-6.xml.in new file mode 100644 index 0000000..75925bc --- /dev/null +++ b/data/oses/debian.org/debian-6.xml.in @@ -0,0 +1,71 @@ +<libosinfo version="0.0.1"> + <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/debian/5"/> + <derives-from id="http://debian.org/debian/5"/> + + <devices> + <device id="http://usb.org/usb/80ee/0021"/> + </devices> + + <resources arch="all"> + <minimum> + <cpu>1000000000</cpu> + <n-cpus>1</n-cpus> + <ram>134217728</ram> + <storage>5368709120</storage> + </minimum> + <recommended> + <cpu>1000000000</cpu> + <ram>536870912</ram> + <storage>5368709120</storage> + </recommended> + </resources> + + <media arch="i686"> + <url>http://cdimage.debian.org/mirror/cdimage/archive/6.0.8/i386/iso-dvd/debian-6.0.8-i386-DVD-1.iso</url> + <iso> + <volume-id>Debian 6.0.\d i386 1</volume-id> + </iso> + <kernel>install.386/vmlinuz</kernel> + <initrd>install.386/initrd.gz</initrd> + </media> + <media arch="x86_64"> + <url>http://cdimage.debian.org/mirror/cdimage/archive/6.0.8/amd64/iso-dvd/debian-6.0.8-amd64-DVD-1.iso</url> + <iso> + <volume-id>Debian 6.0.\d amd64 1</volume-id> + </iso> + <kernel>install.amd/vmlinuz</kernel> + <initrd>install.amd/initrd.gz</initrd> + </media> + + <media arch="i686" live="true"> + <url>http://live.debian.net/cdimage/release/6.0.8/i386/iso-hybrid/debian-live-6.0.8-i386-gnome-desktop.iso</url> + <iso> + <volume-id>Debian squeeze.*</volume-id> + <system-id>LINUX</system-id> + </iso> + <kernel>install/vmlinuz</kernel> + <initrd>install/initrd.gz</initrd> + </media> + <media arch="x86_64" live="true"> + <url>http://live.debian.net/cdimage/release/6.0.8/amd64/iso-hybrid/debian-live-6.0.8-amd64-gnome-desktop.iso</url> + <iso> + <volume-id>Debian squeeze.*</volume-id> + <system-id>LINUX</system-id> + </iso> + <kernel>install/vmlinuz</kernel> + <initrd>install/initrd.gz</initrd> + </media> + + <installer> + <script id='http://debian.org/scripts/debian/jeos'/> + </installer> + </os> +</libosinfo> diff --git a/data/oses/debian.org/debian-7.xml.in b/data/oses/debian.org/debian-7.xml.in new file mode 100644 index 0000000..94cb930 --- /dev/null +++ b/data/oses/debian.org/debian-7.xml.in @@ -0,0 +1,53 @@ +<libosinfo version="0.0.1"> + <os id="http://debian.org/debian/7";> + <short-id>debian7</short-id> + <short-id>debianwheezy</short-id> + <_name>Debian Wheezy</_name> + <version>7</version> + <_vendor>Debian Project</_vendor> + <family>linux</family> + <distro>debian</distro> + <upgrades id="http://debian.org/debian/6"/> + <derives-from id="http://debian.org/debian/6"/> + + <devices> + <device id="http://usb.org/usb/80ee/0021"/> <!-- USB Tablet --> + </devices> + + <resources arch="all"> + <minimum> + <cpu>1000000000</cpu> + <n-cpus>1</n-cpus> + <ram>134217728</ram> + <storage>5368709120</storage> + </minimum> + <recommended> + <cpu>1000000000</cpu> + <ram>1073741824</ram> + <storage>21474836480</storage> + </recommended> + </resources> + + <media arch="i686"> + <url>http://cdimage.debian.org/debian-cd/7.3.0/i386/iso-dvd/debian-7.3.0-i386-DVD-1.iso</url> + <iso> + <volume-id>Debian 7.\d.\d i386 1</volume-id> + </iso> + <kernel>install.386/vmlinuz</kernel> + <initrd>install.386/initrd.gz</initrd> + </media> + <media arch="x86_64"> + <url>http://cdimage.debian.org/debian-cd/7.3.0/amd64/iso-dvd/debian-7.3.0-amd64-DVD-1.iso</url> + <iso> + <volume-id>Debian 7.\d.\d amd64 1</volume-id> + </iso> + <kernel>install.amd/vmlinuz</kernel> + <initrd>install.amd/initrd.gz</initrd> + </media> + + <installer> + <script id='http://debian.org/scripts/debian/jeos'/> + <script id='http://debian.org/scripts/debian/desktop'/> + </installer> + </os> +</libosinfo> diff --git a/data/oses/debian.org/debian-8.xml.in b/data/oses/debian.org/debian-8.xml.in new file mode 100644 index 0000000..4a45164 --- /dev/null +++ b/data/oses/debian.org/debian-8.xml.in @@ -0,0 +1,53 @@ +<libosinfo version="0.0.1"> + <os id="http://debian.org/debian/8";> + <short-id>debian8</short-id> + <short-id>debianjessie</short-id> + <_name>Debian Jessie</_name> + <version>8</version> + <_vendor>Debian Project</_vendor> + <family>linux</family> + <distro>debian</distro> + <upgrades id="http://debian.org/debian/7"/> + <derives-from id="http://debian.org/debian/7"/> + + <devices> + <device id="http://usb.org/usb/80ee/0021"/> <!-- USB Tablet --> + </devices> + + <resources arch="all"> + <minimum> + <cpu>1000000000</cpu> + <n-cpus>1</n-cpus> + <ram>1073741824</ram> + <storage>10737418240</storage> + </minimum> + <recommended> + <cpu>1000000000</cpu> + <ram>1073741824</ram> + <storage>21474836480</storage> + </recommended> + </resources> + + <media arch="i686"> + <url>http://cdimage.debian.org/debian-cd/8.0.0/i386/iso-dvd/debian-8.0.0-i386-DVD-1.iso</url> + <iso> + <volume-id>Debian 8.\d.\d i386 1</volume-id> + </iso> + <kernel>install.386/vmlinuz</kernel> + <initrd>install.386/initrd.gz</initrd> + </media> + <media arch="x86_64"> + <url>http://cdimage.debian.org/debian-cd/8.0.0/amd64/iso-dvd/debian-8.0.0-amd64-DVD-1.iso</url> + <iso> + <volume-id>Debian 8.\d.\d amd64 1</volume-id> + </iso> + <kernel>install.amd/vmlinuz</kernel> + <initrd>install.amd/initrd.gz</initrd> + </media> + + <installer> + <script id='http://debian.org/scripts/debian/jeos'/> + <script id='http://debian.org/scripts/debian/desktop'/> + </installer> + </os> +</libosinfo> diff --git a/data/oses/debian.xml.in b/data/oses/debian.xml.in deleted file mode 100644 index 51da273..0000000 --- a/data/oses/debian.xml.in +++ /dev/null @@ -1,315 +0,0 @@ -<libosinfo version="0.0.1"> - - <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> - <_vendor>Debian Project</_vendor> - <family>linux</family> - <distro>debian</distro> - </os> - - <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/debian/1.0"/> - <derives-from id="http://debian.org/debian/1.0"/> - </os> - - <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/debian/1.2"/> - <derives-from id="http://debian.org/debian/1.2"/> - </os> - - <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/debian/1.3"/> - <derives-from id="http://debian.org/debian/1.3"/> - </os> - - <os id="http://debian.org/debian/2.1";> - <short-id>debian2.1</short-id> - <short-id>debianslink</short-id> - <_name>Debian Slink</_name> - <version>2.1</version> - <_vendor>Debian Project</_vendor> - <family>linux</family> - <distro>debian</distro> - <upgrades id="http://debian.org/debian/2.0"/> - <derives-from id="http://debian.org/debian/2.0"/> - </os> - - <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/debian/2.1"/> - <derives-from id="http://debian.org/debian/2.1"/> - </os> - - <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/debian/2.2"/> - <derives-from id="http://debian.org/debian/2.2"/> - </os> - - - <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/debian/3"/> - <derives-from id="http://debian.org/debian/3"/> - </os> - - <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/debian/3.1"/> - <derives-from id="http://debian.org/debian/3.1"/> - </os> - - <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/debian/4"/> - <derives-from id="http://debian.org/debian/4"/> - - <devices> - <device id="http://pcisig.com/pci/1af4/1000"/> - <device id="http://pcisig.com/pci/1af4/1001"/> - </devices> - - <resources arch="all"> - <minimum> - <cpu>1000000000</cpu> - <n-cpus>1</n-cpus> - <ram>134217728</ram> - <storage>5368709120</storage> - </minimum> - <recommended> - <cpu>1000000000</cpu> - <ram>536870912</ram> - <storage>5368709120</storage> - </recommended> - </resources> - </os> - - <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/debian/5"/> - <derives-from id="http://debian.org/debian/5"/> - - <devices> - <device id="http://usb.org/usb/80ee/0021"/> - </devices> - - <resources arch="all"> - <minimum> - <cpu>1000000000</cpu> - <n-cpus>1</n-cpus> - <ram>134217728</ram> - <storage>5368709120</storage> - </minimum> - <recommended> - <cpu>1000000000</cpu> - <ram>536870912</ram> - <storage>5368709120</storage> - </recommended> - </resources> - - <media arch="i686"> - <url>http://cdimage.debian.org/mirror/cdimage/archive/6.0.8/i386/iso-dvd/debian-6.0.8-i386-DVD-1.iso</url> - <iso> - <volume-id>Debian 6.0.\d i386 1</volume-id> - </iso> - <kernel>install.386/vmlinuz</kernel> - <initrd>install.386/initrd.gz</initrd> - </media> - <media arch="x86_64"> - <url>http://cdimage.debian.org/mirror/cdimage/archive/6.0.8/amd64/iso-dvd/debian-6.0.8-amd64-DVD-1.iso</url> - <iso> - <volume-id>Debian 6.0.\d amd64 1</volume-id> - </iso> - <kernel>install.amd/vmlinuz</kernel> - <initrd>install.amd/initrd.gz</initrd> - </media> - - <media arch="i686" live="true"> - <url>http://live.debian.net/cdimage/release/6.0.8/i386/iso-hybrid/debian-live-6.0.8-i386-gnome-desktop.iso</url> - <iso> - <volume-id>Debian squeeze.*</volume-id> - <system-id>LINUX</system-id> - </iso> - <kernel>install/vmlinuz</kernel> - <initrd>install/initrd.gz</initrd> - </media> - <media arch="x86_64" live="true"> - <url>http://live.debian.net/cdimage/release/6.0.8/amd64/iso-hybrid/debian-live-6.0.8-amd64-gnome-desktop.iso</url> - <iso> - <volume-id>Debian squeeze.*</volume-id> - <system-id>LINUX</system-id> - </iso> - <kernel>install/vmlinuz</kernel> - <initrd>install/initrd.gz</initrd> - </media> - - <installer> - <script id='http://debian.org/scripts/debian/jeos'/> - </installer> - </os> - - <os id="http://debian.org/debian/7";> - <short-id>debian7</short-id> - <short-id>debianwheezy</short-id> - <_name>Debian Wheezy</_name> - <version>7</version> - <_vendor>Debian Project</_vendor> - <family>linux</family> - <distro>debian</distro> - <upgrades id="http://debian.org/debian/6"/> - <derives-from id="http://debian.org/debian/6"/> - - <devices> - <device id="http://usb.org/usb/80ee/0021"/> <!-- USB Tablet --> - </devices> - - <resources arch="all"> - <minimum> - <cpu>1000000000</cpu> - <n-cpus>1</n-cpus> - <ram>134217728</ram> - <storage>5368709120</storage> - </minimum> - <recommended> - <cpu>1000000000</cpu> - <ram>1073741824</ram> - <storage>21474836480</storage> - </recommended> - </resources> - - <media arch="i686"> - <url>http://cdimage.debian.org/debian-cd/7.3.0/i386/iso-dvd/debian-7.3.0-i386-DVD-1.iso</url> - <iso> - <volume-id>Debian 7.\d.\d i386 1</volume-id> - </iso> - <kernel>install.386/vmlinuz</kernel> - <initrd>install.386/initrd.gz</initrd> - </media> - <media arch="x86_64"> - <url>http://cdimage.debian.org/debian-cd/7.3.0/amd64/iso-dvd/debian-7.3.0-amd64-DVD-1.iso</url> - <iso> - <volume-id>Debian 7.\d.\d amd64 1</volume-id> - </iso> - <kernel>install.amd/vmlinuz</kernel> - <initrd>install.amd/initrd.gz</initrd> - </media> - - <installer> - <script id='http://debian.org/scripts/debian/jeos'/> - <script id='http://debian.org/scripts/debian/desktop'/> - </installer> - </os> - - <os id="http://debian.org/debian/8";> - <short-id>debian8</short-id> - <short-id>debianjessie</short-id> - <_name>Debian Jessie</_name> - <version>8</version> - <_vendor>Debian Project</_vendor> - <family>linux</family> - <distro>debian</distro> - <upgrades id="http://debian.org/debian/7"/> - <derives-from id="http://debian.org/debian/7"/> - - <devices> - <device id="http://usb.org/usb/80ee/0021"/> <!-- USB Tablet --> - </devices> - - <resources arch="all"> - <minimum> - <cpu>1000000000</cpu> - <n-cpus>1</n-cpus> - <ram>1073741824</ram> - <storage>10737418240</storage> - </minimum> - <recommended> - <cpu>1000000000</cpu> - <ram>1073741824</ram> - <storage>21474836480</storage> - </recommended> - </resources> - - <media arch="i686"> - <url>http://cdimage.debian.org/debian-cd/8.0.0/i386/iso-dvd/debian-8.0.0-i386-DVD-1.iso</url> - <iso> - <volume-id>Debian 8.\d.\d i386 1</volume-id> - </iso> - <kernel>install.386/vmlinuz</kernel> - <initrd>install.386/initrd.gz</initrd> - </media> - <media arch="x86_64"> - <url>http://cdimage.debian.org/debian-cd/8.0.0/amd64/iso-dvd/debian-8.0.0-amd64-DVD-1.iso</url> - <iso> - <volume-id>Debian 8.\d.\d amd64 1</volume-id> - </iso> - <kernel>install.amd/vmlinuz</kernel> - <initrd>install.amd/initrd.gz</initrd> - </media> - - <installer> - <script id='http://debian.org/scripts/debian/jeos'/> - <script id='http://debian.org/scripts/debian/desktop'/> - </installer> - </os> - -</libosinfo> diff --git a/po/POTFILES.in b/po/POTFILES.in index 581cde3..8e6ab18 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -15,6 +15,19 @@ data/oses/centos.org/centos-6.3.xml.in data/oses/centos.org/centos-6.4.xml.in data/oses/centos.org/centos-6.5.xml.in data/oses/centos.org/centos-7.0.xml.in +data/oses/debian.org/debian-1.1.xml.in +data/oses/debian.org/debian-1.2.xml.in +data/oses/debian.org/debian-1.3.xml.in +data/oses/debian.org/debian-2.0.xml.in +data/oses/debian.org/debian-2.1.xml.in +data/oses/debian.org/debian-2.2.xml.in +data/oses/debian.org/debian-3.1.xml.in +data/oses/debian.org/debian-3.xml.in +data/oses/debian.org/debian-4.xml.in +data/oses/debian.org/debian-5.xml.in +data/oses/debian.org/debian-6.xml.in +data/oses/debian.org/debian-7.xml.in +data/oses/debian.org/debian-8.xml.in data/oses/netware.xml.in data/oses/solaris.xml.in data/oses/dos.xml.in @@ -28,7 +41,6 @@ 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/openbsd.xml.in data/oses/freebsd.xml.in -- 2.4.3 _______________________________________________ Libosinfo mailing list Libosinfo@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libosinfo
