From 2cfd89d631319cf791c38b5b9f5a8a6331dc2ef2 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 15 Nov 2010 14:17:20 +0000 Subject: [PATCH] inspector: Replace code for listing applications with new core API. --- inspector/example4.xml | 19 + inspector/example5.xml | 2876 +++++++++++++++++++----------------------- inspector/example6.xml | 540 +++++++- inspector/virt-inspector | 150 +-- inspector/virt-inspector.rng | 8 + 5 files changed, 1888 insertions(+), 1705 deletions(-) diff --git a/inspector/example4.xml b/inspector/example4.xml index f517ddd..16da2dc 100644 --- a/inspector/example4.xml +++ b/inspector/example4.xml @@ -17,5 +17,24 @@ F2E8996AE8992E3B + + + Mozilla Firefox (3.6.12) + Mozilla Firefox (3.6.12) + 3.6.12 (en-GB) + C:\Program Files\Mozilla Firefox + Mozilla + http://www.mozilla.com/en-GB/ + Mozilla Firefox + + + VLC media player + VLC media player 1.1.5 + 1.1.5 + C:\Program Files\VideoLAN\VLC + VideoLAN + http://www.videolan.org/ + + diff --git a/inspector/example5.xml b/inspector/example5.xml index 4bb2144..4b48b9c 100644 --- a/inspector/example5.xml +++ b/inspector/example5.xml @@ -7,6 +7,8 @@ 5.0.6 5 0 + deb + apt / /usr @@ -16,17 +18,16 @@ /boot + + ext3 + 96b22229-3575-408e-8270-aeba18b3ebf1 + ext3 e15bda18-deca-40d1-beb4-ff31e4068741 - - ext2 - b6590940-dc13-4fc5-b306-7c7bdf075f17 - - - ext3 - 96b22229-3575-408e-8270-aeba18b3ebf1 + + swap ext3 @@ -40,12 +41,11 @@ ext3 0eb2cef5-e765-440f-8be7-f40c46b93874 - - swap + + ext2 + b6590940-dc13-4fc5-b306-7c7bdf075f17 - deb - apt acpi-support-base @@ -58,9 +58,8 @@ 1lenny2 - alacarte - 0.11.5 - 1 + adduser + 3.110 alsa-base @@ -78,31 +77,69 @@ 13.1 + apt + 0.8.8 + + + apt-utils + 0.8.8 + + aptitude - 0.4.11.11 - 1~lenny1 + 0.6.3 + 3.2 - arj - 3.10.22 - 6 + at + 3.1.10.2 - aspell - 0.60.6 + augeas-lenses + 0.2.2 + 1 + + + autoconf + 2.67 + 2 + + + automake + 1:1.11.1 1 + autopoint + 0.18.1.1 + 3 + + + autotools-dev + 20100122.1 + + avahi-daemon 0.6.23 3lenny2 + base-files + 5lenny7 + + + base-passwd + 3.5.20 + + bash 3.2 4 + bash-completion + 20080705 + + bc 1.06.94 3 @@ -113,9 +150,9 @@ 0+lenny2 - bluez-gnome - 0.27 - 1 + binutils + 2.20.1 + 15 bsd-mailx @@ -123,6 +160,10 @@ 0.20071201cvs-3 + bsdmainutils + 6.1.10 + + bsdutils 1:2.13.1.1 1 @@ -143,24 +184,17 @@ 2 - bzip2 - 1.0.5 - 1 + ca-certificates + 20080809 - capplets-data - 1:2.22.2.1 + camlp4 + 3.11.2 2 - cdrdao - 1:1.2.2 - 16 - - - cheese - 2.22.3 - 3 + console-common + 0.7.80 console-data @@ -173,6 +207,11 @@ 65.1 + consolekit + 0.4.2 + 1 + + coreutils 6.10 6 @@ -184,8 +223,8 @@ cpp - 4:4.3.2 - 2 + 4:4.4.5 + 1 cpp-4.3 @@ -193,6 +232,11 @@ 1.1 + cpp-4.4 + 4.4.5 + 6 + + cpufrequtils 004 2 @@ -204,23 +248,23 @@ cups - 1.3.8 - 1+lenny8 + 1.4.4 + 6 cups-bsd - 1.3.8 - 1+lenny8 + 1.4.4 + 6 cups-client - 1.3.8 - 1+lenny8 + 1.4.4 + 6 cups-common - 1.3.8 - 1+lenny8 + 1.4.4 + 6 cups-driver-gutenprint @@ -233,11 +277,6 @@ 5 - cupsddk-drivers - 1.2.3 - 5 - - dbus 1.2.1 5+lenny1 @@ -253,21 +292,44 @@ 3 - defoma - 0.11.10 - 0.2 + debconf + 1.5.24 - deskbar-applet - 2.22.3.1 - 1 + debconf-i18n + 1.5.24 + + + debian-archive-keyring + 2010.08.28~lenny1 + + + debian-faq + 4.0.4 - desktop-file-utils - 0.15 + debianutils + 2.30 + + + debirf + 0.27 1 + debootstrap + 1.0.25 + + + defoma + 0.11.10 + 0.2 + + + desktop-base + 5.0.3 + + dhcdbd 3.0 5 @@ -283,26 +345,34 @@ 6+lenny4 + dictionaries-common + 0.98.12 + + diff 2.8.1 12 - djvulibre-desktop - 3.5.20 - 8+lenny1 - - dmidecode 2.9 1 + dmsetup + 2:1.02.48 + 4 + + dnsutils 1:9.6.ESV.R1+dfsg 0+lenny2 + doc-debian + 4.0.1 + + doc-linux-text 2008.08 1 @@ -313,9 +383,8 @@ 6 - dvd+rw-tools - 7.1 - 3 + dpkg + 1.15.8.5 e2fslibs @@ -338,78 +407,33 @@ 4 - ekiga - 2.0.12 - 1+nmu1 - - - eog - 2.22.3 - 2 - - epiphany-browser - 2.22.3 - 9 + 2.30.6 + 1 epiphany-browser-data - 2.22.3 - 9 - - - epiphany-extensions - 2.22.2 + 2.30.6 1 - epiphany-gecko - 2.22.3 - 9 - - esound-common 0.2.36 3 - evince - 2.22.2 - 4~lenny1 - - - evolution - 2.22.3.1 - 1 - - - evolution-common - 2.22.3.1 - 1 - - - evolution-data-server - 2.22.3 - 1.1+lenny2 - - - evolution-data-server-common - 2.22.3 - 1.1+lenny2 - - - evolution-exchange - 2.22.3.dfsg - 1 + etherboot-qemu + 5.4.4 + 7 - evolution-plugins - 2.22.3.1 + evince + 2.30.3 1 - evolution-webcal - 2.21.92 + evince-common + 2.30.3 1 @@ -433,8 +457,13 @@ 9 - fast-user-switch-applet - 2.22.0 + fakechroot + 2.11 + 2 + + + fakeroot + 1.14.4 1 @@ -448,29 +477,19 @@ 1 - file-roller - 2.22.4 - 2 - - findutils 4.4.0 2 - finger - 0.17 - 12 - - fontconfig 2.6.0 3 fontconfig-config - 2.6.0 - 3 + 2.8.0 + 2.1 foo2zjs @@ -479,13 +498,13 @@ foomatic-db - 20080211 - 2+nmu1 + 20100804 + 1 foomatic-db-engine - 3.0.2 - 20080211-1 + 4.0.4 + 3 foomatic-db-gutenprint @@ -493,14 +512,9 @@ 4 - foomatic-db-hpijs - 20080211 - 1 - - foomatic-filters - 3.0.2 - 20080211-3.2 + 4.0.5 + 5 foomatic-filters-ppds @@ -513,9 +527,9 @@ 18 - gcalctool - 5.22.3 - 2 + gcc + 4:4.4.5 + 1 gcc-4.2-base @@ -523,44 +537,39 @@ 6 - gcc-4.3-base + gcc-4.3 4.3.2 1.1 - gcj-4.3-base + gcc-4.3-base 4.3.2 - 2 - - - gconf-editor - 2.22.0 - 1 + 1.1 - gconf2 - 2.22.0 - 1 + gcc-4.4 + 4.4.5 + 6 - gconf2-common - 2.22.0 - 1 + gcc-4.4-base + 4.4.5 + 6 - gdm - 2.20.7 - 4lenny1 + gcj-4.3-base + 4.3.2 + 2 - gedit - 2.22.3 - 1+lenny1 + gconf2 + 2.28.1 + 5 - gedit-common - 2.22.3 - 1+lenny1 + gconf2-common + 2.28.1 + 5 genisoimage @@ -568,14 +577,24 @@ 1 + gettext + 0.18.1.1 + 3 + + gettext-base 0.17 4 ghostscript - 8.62.dfsg.1 - 3.2lenny5 + 8.71~dfsg2 + 6 + + + ghostscript-cups + 8.71~dfsg2 + 6 gij-4.3 @@ -593,201 +612,96 @@ 1 - gksu - 2.0.0 - 8 - - - gnome-about - 2.22.3 - 2 - - - gnome-app-install - 0.5.5.1 - 1 - - - gnome-applets - 2.22.3 + gir1.0-clutter-1.0 + 1.2.12 3 - gnome-applets-data - 2.22.3 - 3 + gir1.0-freedesktop + 0.6.14 + 1+b1 - gnome-backgrounds - 2.22.0 - 1 + gir1.0-glib-2.0 + 0.6.14 + 1+b1 - gnome-cards-data - 1:2.22.3 - 3 + gir1.0-gstreamer-0.10 + 0.10.30 + 1 - gnome-control-center - 1:2.22.2.1 - 2 + gir1.0-gtk-2.0 + 0.6.5 + 6+b1 - gnome-desktop-data - 2.22.3 + gir1.0-json-glib-1.0 + 0.10.2 2 - gnome-doc-utils - 0.12.2 + git + 4.9.4 1 - gnome-games - 1:2.22.3 - 3 + git-core + 1:1.5.6.5 + 3+lenny3.2 - gnome-games-data - 1:2.22.3 - 3 + gksu + 2.0.0 + 8 - gnome-icon-theme - 2.22.0 + gnome-doc-utils + 0.20.1 1 - gnome-keyring - 2.22.3 - 2 + gnome-icon-theme + 2.30.3 + 1 - gnome-media - 2.22.0 - 3 + gnome-js-common + 0.1.2 + 1 - gnome-media-common - 2.22.0 + gnome-keyring + 2.30.3 3 - gnome-menus - 2.22.2 - 4 - - gnome-mime-data 2.18.0 1 - gnome-mount - 0.7 - 2 - - - gnome-netstatus-applet - 2.12.1 - 2 - - - gnome-nettool - 2.22.0 - 1 - - - gnome-network-admin - 2.22.0 - 4 - - - gnome-panel - 2.20.3 - 5 - - - gnome-panel-data - 2.20.3 - 5 - - - gnome-power-manager - 2.22.1 - 4 - - - gnome-screensaver - 2.22.2 - 2 - - - gnome-session - 2.22.3 - 2 - - - gnome-settings-daemon - 2.22.2.1 - 2 - - - gnome-spell - 1.0.7 - 1 - - - gnome-system-monitor - 2.22.3 - 1 - - - gnome-system-tools - 2.22.0 - 4 - - gnome-terminal - 2.22.3 - 3 + 2.30.2 + 1 gnome-terminal-data - 2.22.3 - 3 - - - gnome-themes - 2.22.2 + 2.30.2 1 gnome-user-guide - 2.22.1 - 1 - - - gnome-utils - 2.20.0.1 - 3 - - - gnome-vfs-obexftp - 0.4 + 2.30.1 1 - gnome-volume-manager - 2.22.1 + gnuit + 4.9.4 1 - gnuchess - 5.07 - 4.1 - - gnupg 1.4.9 3+lenny1 @@ -798,6 +712,11 @@ 1+b1 + gperf + 3.0.3 + 1 + + gpgv 1.4.9 3+lenny1 @@ -819,13 +738,8 @@ grub-common - 1.96+20080724 - 16 - - - gs-common - 8.62.dfsg.1 - 3.2lenny5 + 1.98+20100804 + 7 gsfonts @@ -833,41 +747,21 @@ 3 - gstreamer0.10-alsa - 0.10.19 - 2 - - gstreamer0.10-ffmpeg 0.10.4 3 - gstreamer0.10-gnomevfs - 0.10.19 - 2 - - gstreamer0.10-plugins-base - 0.10.19 - 2 + 0.10.30 + 1 gstreamer0.10-plugins-good - 0.10.8 - 4.1~lenny2 - - - gstreamer0.10-plugins-ugly - 0.10.8 + 0.10.24 1 - gstreamer0.10-tools - 0.10.19 - 3 - - gstreamer0.10-x 0.10.19 2 @@ -883,31 +777,11 @@ 1+lenny2 - gtk2-engines - 1:2.14.3 - 2 - - - gtk2-engines-pixbuf - 2.12.12 - 1~lenny2 - - - gtkhtml3.14 - 3.18.3 - 1 - - - gucharmap - 1:2.22.3 + gvfs + 1.6.4 2 - guile-1.8-libs - 1.8.5+1 - 4.1 - - gzip 1.3.12 6+lenny1 @@ -938,24 +812,18 @@ 1 + hostname + 2.95 + + hp-ppd 0.9 0.1 hpijs - 2.8.6.b - 4 - - - hplip - 2.8.6.b - 4 - - - hplip-data - 2.8.6.b - 4 + 3.10.6 + 1.1 iamerican @@ -969,20 +837,19 @@ iceweasel - 3.0.6 - 3 - - - iceweasel-gnome-support - 3.0.6 - 3 + 3.5.15 + 1 iceweasel-l10n-en-gb - 1:3.0.6+debian + 1:3.5.15+debian 1 + ifupdown + 0.6.8+nmu1 + + ijsgutenprint 5.0.2 4 @@ -993,6 +860,10 @@ 4 + initramfs-tools + 0.92o + + initscripts 2.86.ds1 61 @@ -1003,6 +874,10 @@ 2.lenny2 + installation-report + 2.38 + + iproute 20080725 2 @@ -1028,6 +903,10 @@ 4.4 + java-common + 0.30 + + java-gcj-compat 1.0.78 2 @@ -1048,16 +927,20 @@ 2 + laptop-detect + 0.13.6 + + + ledit + 2.01 + 6 + + less 418 1 - liba52-0.7.4 - 0.7.4 - 11 - - libaa1 1.4p5 37+b1 @@ -1068,24 +951,14 @@ 2 - libao2 - 0.8.8 - 4 - - - libapm1 - 3.2.2 - 12 - - libart-2.0-2 2.3.20 2 libasound2 - 1.0.16 - 2 + 1.0.23 + 2.1 libaspell15 @@ -1093,8 +966,18 @@ 1 + libasyncns0 + 0.3 + 1 + + + libatasmart4 + 0.17+git20100219 + 2 + + libatk1.0-0 - 1.22.0 + 1.30.0 1 @@ -1108,6 +991,16 @@ 7+lenny1 + libaugeas-dev + 0.7.3 + 1 + + + libaugeas0 + 0.7.3 + 1 + + libavahi-client3 0.6.23 3lenny2 @@ -1123,11 +1016,6 @@ 3lenny2 - libavahi-compat-libdnssd1 - 0.6.23 - 3lenny2 - - libavahi-core5 0.6.23 3lenny2 @@ -1143,11 +1031,6 @@ 3lenny2 - libavahi-ui0 - 0.6.23 - 3lenny2 - - libavc1394-0 0.5.3 1+b1 @@ -1164,8 +1047,8 @@ libavutil49 - 0.svn20080206 - 18+lenny1 + 4:0.5.2 + 6 libbcel-java @@ -1189,22 +1072,22 @@ libblkid1 - 1.41.3 - 1 + 2.17.2 + 3.3 - libbluetooth2 - 3.36 + libbluetooth3 + 4.70 1 libbonobo2-0 - 2.22.0 + 2.24.3 1 libbonobo2-common - 2.22.0 + 2.24.3 1 @@ -1218,44 +1101,59 @@ 1 + libboost-iostreams1.42.0 + 1.42.0 + 4 + + + libbrlapi0.5 + 4.2 + 4 + + libbz2-1.0 1.0.5 1 - libc6 - 2.7 - 18lenny4 + libc-bin + 2.11.2 + 7 - libc6-i386 - 2.7 - 18lenny4 + libc-dev-bin + 2.11.2 + 7 - libcaca0 - 0.99.beta14 - 1 + libc6 + 2.11.2 + 7 - libcairo-perl - 1.060 - 1 + libc6-dev + 2.11.2 + 7 - libcairo2 - 1.6.4 + libc6-i386 + 2.11.2 7 - libcairomm-1.0-1 - 1.6.0 + libcaca0 + 0.99.beta17 1 - libcamel1.2-11 - 2.22.3 - 1.1+lenny2 + libcairo2 + 1.8.10 + 6 + + + libcairomm-1.0-1 + 1.8.4 + 3 libcap2 @@ -1263,16 +1161,21 @@ 2 - libcdio7 - 0.78.2+dfsg1 - 3 - - libcdparanoia0 3.10.2+debian 5 + libck-connector0 + 0.4.2 + 1 + + + libclutter-1.0-0 + 1.2.12 + 3 + + libcomerr2 1.41.3 1 @@ -1289,28 +1192,38 @@ libcroco3 - 0.6.1 - 2 - - - libcucul0 - 0.99.beta14 + 0.6.2 1 libcups2 - 1.3.8 - 1+lenny8 + 1.4.4 + 6 + + + libcupscgi1 + 1.4.4 + 6 + + + libcupsdriver1 + 1.4.4 + 6 libcupsimage2 - 1.3.8 - 1+lenny8 + 1.4.4 + 6 - libcupsys2 - 1.3.8 - 1+lenny8 + libcupsmime1 + 1.4.4 + 6 + + + libcupsppdc1 + 1.4.4 + 6 libcurl3 @@ -1333,9 +1246,9 @@ 2lenny1 - libdatrie0 - 0.1.3 - 2 + libdatrie1 + 0.2.4 + 1 libdb4.5 @@ -1348,33 +1261,48 @@ 11 + libdb4.7 + 4.7.25 + 9 + + + libdb4.8 + 4.8.30 + 2 + + libdbus-1-3 1.2.1 5+lenny1 libdbus-glib-1-2 - 0.76 - 1 + 0.88 + 2 libdevmapper1.02.1 - 2:1.02.27 + 2:1.02.48 4 + libdigest-sha1-perl + 2.11 + 2+b1 + + libdirectfb-1.0-0 1.0.1 11 - libdjvulibre21 - 3.5.20 - 8+lenny1 + libdjvulibre-text + 3.5.23 + 3 - libdmx1 - 1:1.0.2 + libdjvulibre21 + 3.5.23 3 @@ -1389,8 +1317,8 @@ libdrm2 - 2.3.1 - 2 + 2.4.21 + 1~squeeze3 libdv4 @@ -1398,74 +1326,28 @@ 1+b1 - libdvdread3 - 0.9.7 - 11 - - - libebook1.2-9 - 2.22.3 - 1.1+lenny2 + libedit2 + 2.11~20080614 + 1 - libecal1.2-7 - 2.22.3 - 1.1+lenny2 - - - libedata-book1.2-2 - 2.22.3 - 1.1+lenny2 - - - libedata-cal1.2-6 - 2.22.3 - 1.1+lenny2 - - - libedataserver1.2-9 - 2.22.3 - 1.1+lenny2 - - - libedataserverui1.2-8 - 2.22.3 - 1.1+lenny2 - - - libedit2 - 2.11~20080614 - 1 - - - libeel2-2.20 - 2.20.0 - 7 - - - libeel2-data - 2.20.0 - 7 - - - libegroupwise1.2-13 - 2.22.3 - 1.1+lenny2 + libeggdbus-1-0 + 0.6 + 1 libenchant1c2a - 1.4.2 - 3.3 + 1.6.0 + 1 - libepc-1.0-1 - 0.3.5 - 2 + libept1 + 1.0.4 - libepc-ui-1.0-1 - 0.3.5 - 2 + liberror-perl + 0.17 + 1 libesd0 @@ -1478,13 +1360,8 @@ 3 - libexchange-storage1.2-3 - 2.22.3 - 1.1+lenny2 - - - libexempi3 - 2.0.1 + libevince2 + 2.30.3 1 @@ -1513,14 +1390,24 @@ 1 + libfindlib-ocaml + 1.2.5+debian + 1+b1 + + + libfindlib-ocaml-dev + 1.2.5+debian + 1+b1 + + libflac8 1.2.1 1.2 libfontconfig1 - 2.6.0 - 3 + 2.8.0 + 2.1 libfontenc1 @@ -1533,11 +1420,26 @@ 2+lenny3 + libfribidi0 + 0.19.2 + 1 + + libfs6 2:1.0.1 1 + libfuse-dev + 2.7.4 + 1.1+lenny1 + + + libfuse2 + 2.7.4 + 1.1+lenny1 + + libgadu3 1:1.8.0+r592 3 @@ -1553,19 +1455,14 @@ 1 - libgalago3 - 0.5.2 - 2 - - libgc1c2 1:6.8 1.1 libgcc1 - 1:4.3.2 - 1.1 + 1:4.4.5 + 6 libgcj-bc @@ -1594,13 +1491,18 @@ libgconf2-4 - 2.22.0 - 1 + 2.28.1 + 5 + + + libgcr0 + 2.30.3 + 3 libgcrypt11 - 1.4.1 - 1 + 1.4.5 + 2 libgd2-noxpm @@ -1608,39 +1510,14 @@ 3+lenny1 - libgda3-3 - 3.0.2 - 5 - - - libgda3-common - 3.0.2 - 5 - - - libgdata-google1.2-1 - 2.22.3 - 1.1+lenny2 - - - libgdata1.2-1 - 2.22.3 - 1.1+lenny2 - - libgdbm3 1.8.3 3 - libgdl-1-0 - 0.7.11 - 1 - - - libgdl-1-common - 0.7.11 - 1 + libgdu0 + 2.30.1 + 2 libgfortran3 @@ -1648,29 +1525,14 @@ 1.1 - libggz2 - 0.0.14.1 - 1 - - - libggzcore9 - 0.0.14.1 - 1 - - - libggzmod4 - 0.0.14.1 - 1 - - libgimp2.0 2.4.7 1 - libgksu1.2-0 - 1.3.8 - 1 + libgirepository1.0-0 + 0.6.14 + 1+b1 libgksu2-0 @@ -1678,11 +1540,6 @@ 1 - libgksuui1.0-1 - 1.0.7 - 2 - - libgl1-mesa-dri 7.0.3 7 @@ -1698,24 +1555,19 @@ 1 - libglib-perl - 1:1.190 - 2 - - libglib2.0-0 - 2.16.6 - 3 + 2.24.2 + 1 - libglibmm-2.4-1c2a - 2.16.4 + libglib2.0-data + 2.24.2 1 - libglu1-mesa - 7.0.3 - 7 + libglibmm-2.4-1c2a + 2.24.2 + 1 libgmp3c2 @@ -1723,66 +1575,21 @@ 3 - libgmyth0 - 1:0.7.1 - 1 - - - libgnome-desktop-2 - 2.22.3 - 2 - - libgnome-keyring0 - 2.22.3 - 2 - - - libgnome-media0 - 2.22.0 - 3 - - - libgnome-menu2 - 2.22.2 - 4 - - - libgnome-pilot2 - 2.0.15 - 2.4 - - - libgnome-window-settings1 - 1:2.22.2.1 - 2 + 2.30.1 + 1 libgnome2-0 - 2.20.1.1 + 2.30.0 1 - libgnome2-canvas-perl - 1.002 - 1+b2 - - libgnome2-common - 2.20.1.1 + 2.30.0 1 - libgnome2-perl - 1.042 - 1+b1 - - - libgnome2-vfs-perl - 1.080 - 1+b1 - - libgnomecanvas2-0 2.20.1.1 1 @@ -1793,99 +1600,59 @@ 1 - libgnomecups1.0-1 - 0.2.3 - 3 - - - libgnomekbd-common - 2.22.0 - 1 - - - libgnomekbd2 - 2.22.0 + libgnomeui-0 + 2.24.3 1 - libgnomekbdui2 - 2.22.0 + libgnomeui-common + 2.24.3 1 - libgnomeprint2.2-0 - 2.18.5 + libgnomevfs2-0 + 1:2.24.3 1 - libgnomeprint2.2-data - 2.18.5 + libgnomevfs2-common + 1:2.24.3 1 - libgnomeprintui2.2-0 - 2.18.3 + libgnomevfs2-extra + 1:2.24.3 1 - libgnomeprintui2.2-common - 2.18.3 + libgnutls26 + 2.8.6 1 - libgnomeui-0 - 2.20.1.1 - 2 - - - libgnomeui-common - 2.20.1.1 - 2 - - - libgnomevfs2-0 - 1:2.22.0 - 5 - - - libgnomevfs2-bin - 1:2.22.0 - 5 - - - libgnomevfs2-common - 1:2.22.0 - 5 - - - libgnomevfs2-extra - 1:2.22.0 - 5 + libgomp1 + 4.4.5 + 6 - libgnutls26 - 2.4.2 - 6+lenny2 + libgp11-0 + 2.30.3 + 3 libgpg-error0 - 1.4 - 2 - - - libgpgme11 - 1.1.6 - 2 + 1.6 + 1 libgphoto2-2 - 2.4.1 - 3 + 2.4.6 + 1+b1 libgphoto2-port0 - 2.4.1 - 3 + 2.4.6 + 1+b1 libgpm2 @@ -1893,34 +1660,34 @@ 3.1 - libgpod3 - 0.6.0 - 6 - - libgraphviz4 2.20.2 3 libgs8 - 8.62.dfsg.1 - 3.2lenny5 + 8.71~dfsg2 + 6 libgsf-1-114 - 1.14.8 - 1lenny2 + 1.14.19 + 2 libgsf-1-common - 1.14.8 - 1lenny2 + 1.14.19 + 2 libgsm1 - 1.0.12 - 1 + 1.0.13 + 3 + + + libgssapi-krb5-2 + 1.8.3+dfsg + 2 libgssglue1 @@ -1929,28 +1696,18 @@ libgstreamer-plugins-base0.10-0 - 0.10.19 - 2 + 0.10.30 + 1 libgstreamer0.10-0 - 0.10.19 - 3 - - - libgtk-vnc-1.0-0 - 0.3.8 - 2 - - - libgtk2-perl - 1:1.190 + 0.10.30 1 libgtk2.0-0 - 2.12.12 - 1~lenny2 + 2.20.1 + 2 libgtk2.0-bin @@ -1968,33 +1725,8 @@ 2 - libgtkhtml3.14-19 - 3.18.3 - 1 - - libgtkmm-2.4-1c2a - 1:2.12.7 - 1 - - - libgtksourceview-common - 1.8.5 - 1 - - - libgtksourceview1.0-0 - 1.8.5 - 1 - - - libgtksourceview2.0-0 - 2.2.2 - 1 - - - libgtksourceview2.0-common - 2.2.2 + 1:2.20.3 1 @@ -2004,18 +1736,18 @@ libgtop2-7 - 2.22.3 + 2.28.1 1 libgtop2-common - 2.22.3 + 2.28.1 1 - libgucharmap6 - 1:2.22.3 - 2 + libgudev-1.0-0 + 164 + 1 libgutenprint2 @@ -2023,16 +1755,6 @@ 4 - libgweather-common - 2.22.3 - 1 - - - libgweather1 - 2.22.3 - 1 - - libhal-storage1 0.5.11 8 @@ -2048,33 +1770,33 @@ 18.3 - libhsqldb-java - 1.8.0.9 - 3 + libhivex-dev + 1.2.2+git20100712 + 2 - libhsqldb-java-gcj - 1.8.0.9 - 3 + libhivex0 + 1.2.2+git20100712 + 2 - libhtml-parser-perl - 3.56 - 1+lenny1 + libhpmud0 + 3.10.6 + 1.1 - libhtml-tagset-perl - 3.20 - 2 + libhsqldb-java + 1.8.0.9 + 3 - libhtml-tree-perl - 3.23 - 1 + libhsqldb-java-gcj + 1.8.0.9 + 3 libhunspell-1.2-0 - 1.2.6 + 1.2.11 1 @@ -2093,9 +1815,9 @@ 3+lenny2 - libid3tag0 - 0.15.1b - 10 + libicu44 + 4.4.2 + 1 libidl0 @@ -2109,8 +1831,8 @@ libiec61883-0 - 1.1.0 - 2 + 1.2.0 + 0.1 libieee1284-3 @@ -2128,6 +1850,11 @@ 2+nmu2 + libintl-perl + 1.20 + 1 + + libiptcdata0 1.0.2+libtool01 2 @@ -2183,14 +1910,29 @@ 3 + libjbig2dec0 + 0.11 + 1 + + libjline-java 0.9.94 1 libjpeg62 - 6b - 14 + 6b1 + 1 + + + libjson-glib-1.0-0 + 0.10.2 + 2 + + + libk5crypto3 + 1.8.3+dfsg + 2 libkeyutils1 @@ -2203,14 +1945,24 @@ 2 - libkpathsea4 - 2007.dfsg.2 - 4+lenny3 + libkpathsea5 + 2009 + 7 + + + libkrb5-3 + 1.8.3+dfsg + 2 libkrb53 - 1.6.dfsg.4~beta1 - 5lenny4 + 1.8.3+dfsg + 2 + + + libkrb5support0 + 1.8.3+dfsg + 2 liblapack3gf @@ -2228,11 +1980,6 @@ 1+lenny2 - liblircclient0 - 0.8.3 - 3 - - liblocale-gettext-perl 1.05 4 @@ -2248,11 +1995,21 @@ 4 + libltdl-dev + 2.2.6b + 2 + + libltdl3 1.5.26 4+lenny1 + libltdl7 + 2.2.6b + 2 + + liblua5.1-0 5.1.3 1 @@ -2268,9 +2025,14 @@ 0+lenny2 - libmad0 - 0.15.1b - 4 + liblzma2 + 4.999.9beta+20100810 + 1 + + + libmagic-dev + 4.26 + 1 libmagic1 @@ -2288,34 +2050,19 @@ 1~lenny3 - libmalaga7 - 7.12 - 1 - - libmeanwhile1 1.0.2 3 - libmetacity0 - 1:2.22.0 - 2 - - libmng1 1.0.9 1 - libmozjs1d - 1.9.0.19 - 4 - - - libmpeg2-4 - 0.4.1 - 3 + libmozjs2d + 1.9.1.15 + 1 libmpfr1ldbl @@ -2323,13 +2070,8 @@ 2 - libmtp7 - 0.2.6.1 - 3 - - - libmusicbrainz4c2a - 2.1.5 + libmpfr4 + 3.0.0 2 @@ -2338,29 +2080,24 @@ 4 - libmysqlclient15off - 5.0.51a - 24+lenny4 - - - libnautilus-burn4 - 2.20.0 - 1 - - libnautilus-extension1 - 2.20.0 - 7 + 2.30.1 + 2 libncurses5 - 5.7+20081213 - 1 + 5.7+20100313 + 4 + + + libncurses5-dev + 5.7+20100313 + 4 libncursesw5 - 5.7+20081213 - 1 + 5.7+20100313 + 4 libneon27 @@ -2368,11 +2105,6 @@ 6.1 - libnet-dbus-perl - 0.33.6 - 1+b1 - - libnewt0.52 0.52.2 11.3+lenny1 @@ -2388,8 +2120,8 @@ 2 - libnm-glib0 - 0.6.6 + libnm-glib2 + 0.8.1 3 @@ -2398,14 +2130,19 @@ 3 - libnotify1 - 0.4.4 + libnm-util1 + 0.8.1 3 + libnotify1 + 0.5.0 + 2 + + libnspr4-0d - 4.7.1 - 5 + 4.8.6 + 1 libnss-mdns @@ -2414,8 +2151,8 @@ libnss3-1d - 3.12.3.1 - 0lenny1 + 3.12.8 + 1 libogg0 @@ -2428,24 +2165,14 @@ 1 - liboobs-1-4 - 2.22.0 - 2 - - - libopal-2.2 - 2.2.11~dfsg1 - 4 - - libopenexr6 1.6.1 3+lenny3 - libopenobex1 - 1.3+cvs20070425 - 2 + libopenjpeg2 + 1.3+dfsg + 4 liborbit2 @@ -2453,44 +2180,58 @@ 0.1 - libosp5 - 1.5.2 - 6 + liborc-0.4-0 + 1:0.4.6 + 2 libpam-gnome-keyring - 2.22.3 - 2 + 2.30.3 + 3 libpam-modules - 1.0.1 - 5+lenny1 + 1.1.1 + 6.1 libpam-runtime - 1.0.1 - 5+lenny1 + 1.1.1 + 6.1 libpam0g - 1.0.1 - 5+lenny1 + 1.1.1 + 6.1 libpanel-applet2-0 - 2.20.3 - 5 + 2.30.2 + 2 libpango1.0-0 - 1.20.5 - 6 + 1.28.3 + 1 libpango1.0-common - 1.20.5 - 6 + 1.28.3 + 1 + + + libpangomm-1.4-1 + 2.26.2 + 1 + + + libpaper1 + 1.1.23+nmu1 + + + libparted0debian1 + 2.3 + 3 libparted1.8-10 @@ -2498,39 +2239,44 @@ 11.1 + libpcap0.8 + 1.1.1 + 2 + + libpci3 1:3.0.0 6 libpcre3 - 7.6 - 2.1 + 8.02 + 1.1 - libpcsclite1 - 1.4.102 - 1+lenny3 + libpcre3-dev + 8.02 + 1.1 - libperl5.10 - 5.10.0 - 19lenny2 + libpcrecpp0 + 8.02 + 1.1 - libpisock9 - 0.12.3 - 5 + libpcsclite1 + 1.4.102 + 1+lenny3 - libpisync1 - 0.12.3 - 5 + libperl5.10 + 5.10.1 + 16 libpixman-1-0 - 0.10.0 - 2 + 0.16.4 + 1 libpng12-0 @@ -2538,44 +2284,69 @@ 2+lenny4 + libpolkit-agent-1-0 + 0.96 + 3 + + + libpolkit-backend-1-0 + 0.96 + 3 + + + libpolkit-gobject-1-0 + 0.96 + 3 + + libpoppler-glib3 0.8.7 3.1 + libpoppler-glib4 + 0.12.4 + 1.2 + + libpoppler3 0.8.7 3.1 + libpoppler5 + 0.12.4 + 1.2 + + libpopt0 - 1.14 - 4 + 1.16 + 1 libpostproc51 - 0.svn20080206 - 18+lenny1 + 4:0.5.2 + 6 - libpt-1.10.10 - 1.10.10 + libproxy0 + 0.3.1 2 - libpt-1.10.10-plugins-alsa - 1.10.10 + libpthread-stubs0 + 0.1 2 - libpt-1.10.10-plugins-v4l - 1.10.10 + libpthread-stubs0-dev + 0.1 2 - libpth20 - 2.0.7 - 12 + libpulse0 + 0.9.21 + 3+b1 libpurple0 @@ -2588,6 +2359,11 @@ 1 + libraw1394-11 + 2.0.5 + 2 + + libraw1394-8 1.3.0 4 @@ -2598,6 +2374,16 @@ 3.1 + libreadline5-dev + 5.2 + 3.1 + + + libreadline6 + 6.1 + 3 + + libregexp-java 1.4 5 @@ -2609,18 +2395,22 @@ librsvg2-2 - 2.22.2 - 2lenny1 + 2.26.3 + 1 librsvg2-common - 2.22.2 - 2lenny1 + 2.26.3 + 1 libsane - 1.0.19 - 23 + 1.0.21 + 5 + + + libsane-extras + 1.0.21.2 libsasl2-2 @@ -2643,21 +2433,36 @@ 2 + libseed0 + 2.30.0 + 1+b1 + + libselinux1 - 2.0.65 - 5 + 2.0.96 + 1 - libsensors3 - 1:2.10.7 + libselinux1-dev + 2.0.96 1 + libsensors4 + 1:3.1.2 + 6 + + libsepol1 2.0.30 2 + libsepol1-dev + 2.0.30 + 2 + + libservlet2.4-java 5.0.30 8 @@ -2668,13 +2473,18 @@ 2+b1 - libshout3 - 2.2.2 - 5 + libsgmls-perl + 1.03ii + 32 + + + libsgutils2-2 + 1.29 + 1 - libsidplay1 - 1.36.59 + libshout3 + 2.2.2 5 @@ -2683,11 +2493,6 @@ 2 - libslab0 - 0.9.8.svn.20070430 - 1.1 - - libslang2 2.1.3 3 @@ -2704,8 +2509,8 @@ libsmbclient - 2:3.2.5 - 4lenny13 + 2:3.5.6~dfsg + 1 libsmbios2 @@ -2713,14 +2518,24 @@ 1 + libsndfile1 + 1.0.23 + 1 + + libsnmp-base - 5.4.1~dfsg - 12 + 5.4.3~dfsg + 1 libsnmp15 - 5.4.1~dfsg - 12 + 5.4.3~dfsg + 1 + + + libsoup-gnome2.4-1 + 2.30.2 + 1 libsoup2.2-8 @@ -2729,28 +2544,28 @@ libsoup2.4-1 - 2.4.1 - 2 + 2.30.2 + 1 - libspectre1 - 0.2.0.ds - 1 + libsp1c2 + 1.3.4 + 1.2.1-47 - libspeex1 - 1.2~rc1 + libspectre1 + 0.2.6 1 - libspeexdsp1 + libspeex1 1.2~rc1 1 libsqlite3-0 - 3.5.9 - 6 + 3.7.3 + 1 libss2 @@ -2764,18 +2579,23 @@ libssl0.9.8 - 0.9.8g - 15+lenny8 + 0.9.8o + 2 libstartup-notification0 - 0.9 + 0.10 1 libstdc++6 - 4.3.2 - 1.1 + 4.4.5 + 6 + + + libstring-shellquote-perl + 1.03 + 1 libsuitesparse-3.1.0 @@ -2788,28 +2608,38 @@ 27 - libswfdec-0.6-90 - 0.6.8 - 1 - - libsysfs2 2.1.0 5 + libt1-5 + 5.1.2 + 3 + + libtag1c2a 1.5 3 - libtalloc1 - 1.2.0~git20080616 + libtalloc2 + 2.0.1 1 libtasn1-3 - 1.4 + 2.7 + 1 + + + libterm-readkey-perl + 2.30 + 4 + + + libtest-simple-perl + 0.94 1 @@ -2829,18 +2659,18 @@ libthai-data - 0.1.9 - 4+lenny1 + 0.1.14 + 2 libthai0 - 0.1.9 - 4+lenny1 + 0.1.14 + 2 libtheora0 - 1.0~beta3 - 1+lenny1 + 1.1.1+dfsg.1 + 3 libtiff4 @@ -2848,13 +2678,8 @@ 11.3 - libtotem-plparser10 - 2.22.3 - 1 - - - libtrackerclient0 - 0.6.6 + libtool + 2.2.6b 2 @@ -2863,31 +2688,61 @@ 4 - liburi-perl - 1.35.dfsg.1 + libudev0 + 164 1 + libunistring0 + 0.9.3 + 3 + + libusb-0.1-4 2:0.1.12 13 + libuuid-perl + 0.02 + 4 + + libuuid1 - 1.41.3 + 2.17.2 + 3.3 + + + libv4l-0 + 0.8.1 1 + libvde0 + 2.2.3 + 3 + + + libvdeplug2 + 2.2.3 + 3 + + + libvirt-dev + 0.4.6 + 10 + + + libvirt0 + 0.4.6 + 10 + + libvisual-0.4-0 0.4.0 2.1 - libvoikko1 - 1.7 - 2 - - libvolume-id0 0.125 7+lenny3 @@ -2903,19 +2758,14 @@ 3.1+lenny1 - libvorbisfile3 - 1.2.0.dfsg - 3.1+lenny1 - - libvte-common 1:0.16.14 4 libvte9 - 1:0.16.14 - 4 + 1:0.24.3 + 1 libwavpack1 @@ -2924,8 +2774,18 @@ libwbclient0 - 2:3.2.5 - 4lenny13 + 2:3.5.6~dfsg + 1 + + + libwebkit-1.0-2 + 1.2.5 + 2 + + + libwebkit-1.0-common + 1.2.5 + 2 libwmf0.2-7 @@ -2939,8 +2799,8 @@ libwnck22 - 2.22.3 - 1 + 2.30.4 + 2 libwpd8c2a @@ -2963,14 +2823,9 @@ 16 - libwww-perl - 5.813 - 1+lenny2 - - libx11-6 - 2:1.1.5 - 2 + 2:1.3.3 + 3 libx11-data @@ -2978,6 +2833,11 @@ 2 + libx11-dev + 2:1.3.3 + 3 + + libx86-1 1.1+ds1 2 @@ -2998,6 +2858,16 @@ 4 + libxapian22 + 1.2.3 + 2 + + + libxau-dev + 1:1.0.3 + 3 + + libxau6 1:1.0.3 3 @@ -3008,8 +2878,23 @@ 2 + libxcb-atom1 + 0.3.6 + 1 + + + libxcb-aux0 + 0.3.6 + 1 + + + libxcb-event1 + 0.3.6 + 1 + + libxcb-render-util0 - 0.2.1+git1 + 0.3.6 1 @@ -3018,14 +2903,14 @@ 1.2 - libxcb-xlib0 - 1.1 - 1.2 + libxcb1 + 1.6 + 1 - libxcb1 - 1.1 - 1.2 + libxcb1-dev + 1.6 + 1 libxcomposite1 @@ -3043,11 +2928,26 @@ 4 + libxdmcp-dev + 1:1.0.2 + 3 + + libxdmcp6 1:1.0.2 3 + libxen-dev + 3.2.1 + 2 + + + libxenstore3.0 + 3.2.1 + 2 + + libxerces2-java 2.9.1 2+lenny1 @@ -3079,8 +2979,8 @@ libxi6 - 2:1.1.4 - 1 + 2:1.3 + 4 libxinerama1 @@ -3093,24 +2993,24 @@ 1 - libxklavier12 - 3.5 - 2 + libxml-light-ocaml-dev + 2.2 + 12+b1 - libxml-parser-perl - 2.36 - 1.1+b1 + libxml-writer-perl + 0.604 + 1 - libxml-twig-perl - 1:3.32 + libxml2 + 2.7.8.dfsg 1 - libxml2 - 2.6.32.dfsg - 5+lenny1 + libxml2-dev + 2.7.8.dfsg + 1 libxml2-utils @@ -3134,8 +3034,8 @@ libxrandr2 - 2:1.2.3 - 1 + 2:1.3.0 + 3 libxrender1 @@ -3149,8 +3049,8 @@ libxslt1.1 - 1.1.24 - 2 + 1.1.26 + 6 libxss1 @@ -3199,8 +3099,22 @@ liferea - 1.4.18 - 1.1 + 1.6.4 + 1 + + + liferea-data + 1.6.4 + 1 + + + linux-base + 2.6.32 + 27 + + + linux-image-2.6-amd64 + 2.6.32+28 linux-image-2.6.26-2-amd64 @@ -3208,14 +3122,24 @@ 25 + linux-image-2.6.32-5-amd64 + 2.6.32 + 27 + + + linux-libc-dev + 2.6.26 + 25lenny1 + + linux-sound-base 1.0.17.dfsg 4 locales - 2.7 - 18lenny4 + 2.11.2 + 7 login @@ -3238,19 +3162,14 @@ 20 - lsb-release - 3.2 - 20 - - lsof 4.78.dfsg.1 4 lvm2 - 2.02.39 - 8 + 2.02.66 + 4 lzma @@ -3259,8 +3178,13 @@ m4 - 1.4.11 - 1 + 1.4.14 + 3 + + + make + 3.81 + 8 makedev @@ -3283,14 +3207,12 @@ 11.1 - metacity - 1:2.22.0 - 2 + menu + 2.1.41 - metacity-common - 1:2.22.0 - 2 + menu-xdg + 0.3 mime-support @@ -3298,6 +3220,16 @@ 1 + min12xxw + 0.0.9 + 3 + + + mkisofs + 9:1.1.9 + 1 + + mktemp 1.5 9 @@ -3333,39 +3265,19 @@ 3 - mysql-common - 5.0.51a - 24+lenny4 - - nano 2.0.7 5 - nautilus - 2.20.0 - 7 - - - nautilus-cd-burner - 2.20.0 - 1 - - - nautilus-data - 2.20.0 - 7 - - ncurses-base 5.7+20081213 1 ncurses-bin - 5.7+20081213 - 1 + 5.7+20100313 + 4 ncurses-term @@ -3378,6 +3290,10 @@ 22 + netbase + 4.34 + + netcat-traditional 1.10 38 @@ -3403,11 +3319,61 @@ 1+b1 + ocaml + 3.11.2 + 2 + + + ocaml-base + 3.11.2 + 2 + + + ocaml-base-nox + 3.11.2 + 2 + + + ocaml-findlib + 1.2.5+debian + 1+b1 + + + ocaml-interp + 3.11.2 + 2 + + + ocaml-native-compilers + 3.11.2 + 2 + + + ocaml-nox + 3.11.2 + 2 + + + openbios-ppc + 1.0+svn821 + 2 + + + openbios-sparc + 1.0+svn821 + 2 + + openbsd-inetd 0.20080125 2 + openhackware + 0.4.1 + 4 + + openoffice.org 1:2.4.1+dfsg 1+lenny8 @@ -3538,19 +3504,35 @@ 2+nmu1 + openssh-blacklist + 0.4.1 + + + openssh-blacklist-extra + 0.4.1 + + openssh-client 1:5.1p1 5 + openssh-server + 1:5.1p1 + 5 + + openssl 0.9.8g 15+lenny8 - p7zip - 4.58~dfsg.1 - 1 + openssl-blacklist + 0.4.2 + + + os-prober + 1.39 passwd @@ -3569,18 +3551,18 @@ perl - 5.10.0 - 19lenny2 + 5.10.1 + 16 perl-base - 5.10.0 - 19lenny2 + 5.10.1 + 16 perl-modules - 5.10.0 - 19lenny2 + 5.10.1 + 16 pidgin @@ -3603,9 +3585,29 @@ 1 + pnm2ppa + 1.12 + 16.3 + + + po4a + 0.34 + 2 + + + policykit-1 + 0.96 + 3 + + + policykit-1-gnome + 0.96 + 2 + + poppler-utils - 0.8.7 - 3.1 + 0.12.4 + 1.2 portmap @@ -3613,9 +3615,17 @@ 9 - procmail - 3.22 - 16 + powermgmt-base + 1.30+nmu1 + + + printconf + 0.7.9.1 + + + procmail + 3.22 + 16 procps @@ -3633,18 +3643,12 @@ 3 - python-4suite-xml - 1.0.2 - 5 - - - python-cairo - 1.4.12 - 1.2 + python-central + 0.6.16+nmu1 python-cups - 1.9.31 + 1.9.48 1 @@ -3654,13 +3658,8 @@ python-dbus - 0.82.4 - 2 - - - python-eggtrayicon - 2.19.1 - 3.1 + 0.83.1 + 1 python-elementtree @@ -3668,79 +3667,13 @@ 12 - python-gdata - 1.1.1 - 1 - - - python-gdbm - 2.5.2 - 1 - - - python-glade2 - 2.12.1 - 6 - - - python-gmenu - 2.22.2 - 4 - - - python-gnome2 - 2.22.0 - 1 - - - python-gnome2-desktop - 2.22.0 - 2 - - - python-gnome2-extras - 2.19.1 - 3.1 - - - python-gnupginterface - 0.3.2 - 9 + python-foomatic + 0.7.9.1 python-gobject - 2.14.2 - 2 - - - python-gst0.10 - 0.10.12 - 1.1 - - - python-gtk2 - 2.12.1 - 6 - - - python-gtkhtml2 - 2.19.1 - 3.1 - - - python-gtkmozembed - 2.19.1 - 3.1 - - - python-gtksourceview2 - 2.2.0 - 1+b1 - - - python-imaging - 1.1.6 - 3 + 2.21.4+is.2.21.3 + 1 python-ipy @@ -3749,8 +3682,8 @@ python-libxml2 - 2.6.32.dfsg - 5+lenny1 + 2.7.8.dfsg + 1 python-minimal @@ -3758,49 +3691,43 @@ 3 - python-notify - 0.1.1 - 2+b1 - - - python-numeric - 24.2 - 9 + python-support + 1.0.11 - python-pyorbit - 2.14.3 - 2 + python2.5 + 2.5.2 + 15+lenny1 - python-sexy - 0.1.9 - 1 + python2.5-minimal + 2.5.2 + 15+lenny1 - python-software-properties - 0.60.debian - 1.1 + qemu + 0.13.0+dfsg + 2 - python-vte - 1:0.16.14 - 4 + qemu-keymaps + 0.13.0+dfsg + 2 - python-xdg - 0.15 - 1.1 + qemu-system + 0.13.0+dfsg + 2 - python2.5 - 2.5.2 - 15+lenny1 + qemu-user + 0.13.0+dfsg + 2 - python2.5-minimal - 2.5.2 - 15+lenny1 + qemu-utils + 0.13.0+dfsg + 2 rarian-compat @@ -3818,9 +3745,13 @@ 3.1 - rhythmbox - 0.11.6 - 1 + reportbug + 3.48 + + + rsync + 3.0.3 + 2 rsyslog @@ -3828,8 +3759,8 @@ 4 - seahorse - 2.22.3 + seabios + 0.6.0+git20100710 2 @@ -3838,24 +3769,26 @@ 6 - serpentine - 0.9 - 6 + sgml-base + 1.26 + + + sgml-data + 2.0.3 shared-mime-info - 0.30 - 2 + 0.71 + 3 - software-properties-gtk - 0.60.debian - 1.1 + sp + 1.3.4 + 1.2.1-47 - sound-juicer - 2.22.0 - 3 + ssl-cert + 1.0.23 sudo @@ -3868,26 +3801,6 @@ 27 - swfdec-gnome - 2.22.2 - 2 - - - swfdec-mozilla - 0.6.0 - 5 - - - system-config-printer - 1.0.0 - 4lenny1 - - - system-tools-backends - 2.6.0 - 2lenny4 - - sysv-rc 2.86.ds1 61 @@ -3908,6 +3821,19 @@ 1+lenny1 + tasksel + 2.78 + + + tasksel-data + 2.78 + + + tcl8.5 + 8.5.8 + 2 + + tcpd 7.6.q 16 @@ -3928,24 +3854,9 @@ 23 - totem-common - 2.22.2 - 6 - - - totem-gstreamer - 2.22.2 - 6 - - - totem-mozilla - 2.22.2 - 6 - - - totem-plugins - 2.22.2 - 6 + tk8.5 + 8.5.8 + 1 traceroute @@ -3953,16 +3864,6 @@ 2 - transmission-common - 1.22 - 1+lenny2 - - - transmission-gtk - 1.22 - 1+lenny2 - - tsclient 0.150 1 @@ -3983,6 +3884,11 @@ 3 + ttf-freefont + 20090104 + 7 + + ttf-liberation 1.04.93 1 @@ -4003,39 +3909,22 @@ 0lenny1 - udev - 0.125 - 7+lenny3 + ucf + 3.0016 - unattended-upgrades - 0.25.1debian1 - 0.1 - - - unzip - 5.52 - 12 - - - update-manager - 0.68.debian - 7 - - - update-manager-core - 0.68.debian - 7 + udev + 164 + 1 - update-notifier - 0.70.7.debian - 5 + udisks + 1.0.1+git20100614 + 3 - update-notifier-common - 0.70.7.debian - 5 + update-inetd + 4.31 usbutils @@ -4044,13 +3933,13 @@ util-linux - 2.13.1.1 - 1 + 2.17.2 + 3.3 util-linux-locales - 2.13.1.1 - 1 + 2.17.2 + 3.3 vbetool @@ -4058,6 +3947,16 @@ 3 + vde2 + 2.2.3 + 3 + + + vgabios + 0.6c + 2 + + vim-common 1:7.1.314 3+lenny2 @@ -4068,21 +3967,6 @@ 3+lenny2 - vinagre - 0.5.1 - 2 - - - vino - 2.22.2 - 1 - - - w3c-dtd-xhtml - 1.1 - 5 - - w3m 0.5.2 2+lenny1 @@ -4108,9 +3992,8 @@ 11.3+lenny1 - wodim - 9:1.1.9 - 1 + whois + 4.7.30 wpasupplicant @@ -4118,268 +4001,97 @@ 3 - xauth - 1:1.0.3 - 2 - - - xbitmaps - 1.0.1 - 2 - - - xdg-utils - 1.0.2 - 6.1 - - - xfonts-100dpi - 1:1.0.0 - 4 - - - xfonts-75dpi - 1:1.0.0 - 4 - - - xfonts-base - 1:1.0.0 - 5 - - - xfonts-encodings - 1:1.0.2 - 3 + x-ttcidfont-conf + 32 - xfonts-scalable - 1:1.0.0 - 6 + x11-apps + 7.3+4 - xinit - 1.0.9 - 2 + x11-common + 1:7.3+20 - xkb-data - 1.3 - 2 + x11-session-utils + 7.3+1 - xsane - 0.996 - 1 + x11-utils + 7.3+2+nmu1 - xsane-common - 0.996 - 1 + x11-xfs-utils + 7.3+1 - xserver-xorg-core - 2:1.4.2 - 10.lenny2 + x11-xkb-utils + 7.4+1 - xserver-xorg-input-evdev - 1:2.0.8 - 1 + x11-xserver-utils + 7.3+5 - xserver-xorg-input-kbd - 1:1.3.1 + x11proto-core-dev + 7.0.12 1 - xserver-xorg-input-mouse - 1:1.3.0 - 1 + x11proto-input-dev + 1.4.3 + 2 - xserver-xorg-input-synaptics - 0.14.7~git20070706 + x11proto-kb-dev + 1.0.3 3 - xserver-xorg-input-wacom - 0.7.9.3 + xauth + 1:1.0.3 2 - xserver-xorg-video-apm - 1:1.2.0 - 1 - - - xserver-xorg-video-ark - 1:0.7.0 - 1 - - - xserver-xorg-video-ati - 1:6.9.0 - 1+lenny4 - - - xserver-xorg-video-chips - 1:1.2.0 - 1 - - - xserver-xorg-video-cirrus - 1:1.2.1 - 1.lenny1 - - - xserver-xorg-video-cyrix - 1:1.1.0 - 8 - - - xserver-xorg-video-dummy - 1:0.3.0 - 1 - - - xserver-xorg-video-fbdev - 1:0.4.0 - 1 - - - xserver-xorg-video-glint - 1:1.2.1 - 1 - - - xserver-xorg-video-i128 - 1:1.3.0 - 1 - - - xserver-xorg-video-intel - 2:2.3.2 - 2+lenny8 - - - xserver-xorg-video-mach64 - 6.8.0 - 1 - - - xserver-xorg-video-mga - 1:1.4.9.dfsg - 1 - - - xserver-xorg-video-neomagic - 1:1.2.1 - 1 - - - xserver-xorg-video-nv - 1:2.1.10 - 1 + xbase-clients + 1:7.3+20 - xserver-xorg-video-openchrome - 1:0.2.902+svn579 - 4 - - - xserver-xorg-video-r128 - 6.8.0 - 1 - - - xserver-xorg-video-radeon - 1:6.9.0 - 1+lenny4 - - - xserver-xorg-video-radeonhd - 1.2.1 - 2 - - - xserver-xorg-video-rendition - 1:4.2.0.dfsg.1 + xbitmaps + 1.0.1 2 - xserver-xorg-video-s3 - 1:0.6.0 - 1 - - - xserver-xorg-video-s3virge - 1:1.10.1 - 1 - - - xserver-xorg-video-savage - 1:2.2.1 - 2.lenny1 - - - xserver-xorg-video-siliconmotion - 1:1.6.0 - 1 - - - xserver-xorg-video-sis - 1:0.10.0 - 1 - - - xserver-xorg-video-sisusb - 1:0.9.0 - 1 - - - xserver-xorg-video-tdfx - 1:1.4.0 - 1 - - - xserver-xorg-video-tga - 1:1.1.0 - 9 - - - xserver-xorg-video-trident - 1:1.3.0 - 1 + xdg-utils + 1.0.2 + 6.1 - xserver-xorg-video-tseng - 1:1.2.0 - 1 + xfonts-encodings + 1:1.0.2 + 3 - xserver-xorg-video-v4l - 0.2.0 - 1 + xfonts-utils + 1:7.4+1 - xserver-xorg-video-vesa - 1:1.3.0 - 4 + xinit + 1.0.9 + 2 - xserver-xorg-video-vga - 1:4.1.0 - 8 + xml-core + 0.12 - xserver-xorg-video-vmware - 1:10.16.2 + xsane + 0.996 1 - xserver-xorg-video-voodoo - 1:1.2.0 + xsane-common + 0.996 1 @@ -4393,28 +4105,23 @@ 2 - xulrunner-1.9 - 1.9.0.19 - 4 - - - xulrunner-1.9-gnome-support - 1.9.0.19 - 4 + xtrans-dev + 1.2 + 2 - yelp - 2.22.1 - 8+b1 + xulrunner-1.9.1 + 1.9.1.15 + 1 - zenity - 2.22.1 - 2 + xz-utils + 4.999.9beta+20100810 + 1 - zip - 2.32 + yelp + 2.30.1+webkit 1 @@ -4422,6 +4129,11 @@ 1:1.2.3.3.dfsg 12 + + zlib1g-dev + 1:1.2.3.3.dfsg + 12 + diff --git a/inspector/example6.xml b/inspector/example6.xml index 54bda86..c854070 100644 --- a/inspector/example6.xml +++ b/inspector/example6.xml @@ -3,10 +3,12 @@ /dev/sda1 linux x86_64 - debian - squeeze/sid - 0 - 0 + ubuntu + Ubuntu 10.10 + 10 + 10 + deb + apt / @@ -20,15 +22,21 @@ c0d1b68f-c0f9-4497-a366-938b37532613 - deb - apt + acpi-support + 0.137 + + acpid 1.0.10 5ubuntu4 + adduser + 3.112ubuntu1 + + adium-theme-ubuntu 0.3 0ubuntu1 @@ -59,6 +67,14 @@ 14ubuntu1 + app-install-data + 0.10.10.6 + + + app-install-data-partner + 12.10.10.2 + + apparmor 2.5.1~rc1 0ubuntu2 @@ -79,11 +95,39 @@ 0ubuntu8 + apport-symptoms + 0.9 + + + apt + 0.8.3ubuntu7 + + + apt-transport-https + 0.8.3ubuntu7 + + + apt-utils + 0.8.3ubuntu7 + + + apt-xapian-index + 0.39ubuntu1 + + aptdaemon 0.31+bzr506 0ubuntu2 + apturl + 0.4.1ubuntu7 + + + apturl-common + 0.4.1ubuntu7 + + aspell 0.60.6 4ubuntu1 @@ -124,6 +168,14 @@ 0ubuntu1 + base-files + 5.0.0ubuntu23 + + + base-passwd + 3.5.22 + + bash 4.1 2ubuntu4 @@ -149,6 +201,10 @@ 2 + binfmt-support + 1.2.18 + + binutils 2.20.51.20100908 0ubuntu2 @@ -219,6 +275,10 @@ 3ubuntu1 + bsdmainutils + 8.0.11ubuntu1 + + bsdutils 1:2.17.2 0ubuntu1 @@ -244,11 +304,35 @@ 4ubuntu1 + ca-certificates + 20090814 + + capplets-data 1:2.32.0 0ubuntu2 + checkbox + 0.10.3 + + + checkbox-gtk + 0.10.3 + + + cli-common + 0.7.1 + + + command-not-found + 0.2.40ubuntu15 + + + command-not-found-data + 0.2.40ubuntu15 + + compiz 1:0.8.6 0ubuntu9 @@ -289,6 +373,10 @@ 0ubuntu1 + console-setup + 1.34ubuntu15 + + console-terminus 4.30 2 @@ -379,6 +467,22 @@ 2 + debconf + 1.5.32ubuntu3 + + + debconf-i18n + 1.5.32ubuntu3 + + + debianutils + 3.2.3 + + + defoma + 0.11.11ubuntu1 + + desktop-file-utils 0.16 0ubuntu4 @@ -399,6 +503,10 @@ 2ubuntu6 + dictionaries-common + 1.5.11ubuntu1 + + diffutils 1:3.0 1 @@ -414,6 +522,10 @@ 1ubuntu6 + dmz-cursor-theme + 0.4.1 + + dnsmasq-base 2.55 1 @@ -424,6 +536,10 @@ 2 + doc-base + 0.9.5 + + docbook-xml 4.5 7 @@ -434,6 +550,10 @@ 1 + dpkg + 1.15.8.4ubuntu3 + + dvd+rw-tools 7.1 6 @@ -584,6 +704,10 @@ 1 + example-content + 43 + + exiv2 0.19 3 @@ -659,6 +783,10 @@ 0ubuntu3 + friendly-recovery + 0.2.10 + + ftp 0.17 23 @@ -734,6 +862,10 @@ 0ubuntu4 + gdm-guest-session + 0.16 + + gedit 2.30.3 1ubuntu1 @@ -809,6 +941,10 @@ 0ubuntu1 + gnome-codec-install + 0.4.7ubuntu2 + + gnome-control-center 1:2.32.0 0ubuntu2 @@ -979,6 +1115,18 @@ 0ubuntu1 + gnome-themes-ubuntu + 0.6.1 + + + gnome-user-guide + 2.30.0+git20100403ubuntu2 + + + gnome-user-guide-en + 2.30.0+git20100403ubuntu2 + + gnome-utils 2.31.1 0ubuntu1 @@ -1139,6 +1287,10 @@ 1 + hostname + 3.04ubuntu1 + + hpijs 3.10.6 1ubuntu10 @@ -1159,6 +1311,10 @@ 1ubuntu10 + humanity-icon-theme + 0.5.3.2 + + hunspell-en-ca 1:3.2.1 2ubuntu1 @@ -1199,6 +1355,14 @@ 1 + ifupdown + 0.6.10ubuntu3 + + + im-switch + 1.20ubuntu2 + + indicator-applet 0.4.6 0ubuntu1 @@ -1239,6 +1403,14 @@ 5ubuntu1 + initramfs-tools + 0.98.1ubuntu6 + + + initramfs-tools-bin + 0.98.1ubuntu6 + + initscripts 2.87dsf 4ubuntu18 @@ -1324,6 +1496,46 @@ 1 + language-pack-en + 1:10.10+20100930 + + + language-pack-en-base + 1:10.10+20100930 + + + language-pack-gnome-en + 1:10.10+20100930 + + + language-pack-gnome-en-base + 1:10.10+20100930 + + + language-selector + 0.6.6 + + + language-selector-common + 0.6.6 + + + language-support-en + 1:9.10+20090909 + + + language-support-writing-en + 1:10.04+20100311 + + + laptop-detect + 0.13.7ubuntu2 + + + launchpad-integration + 0.1.38 + + less 436 1 @@ -1879,6 +2091,10 @@ 1 + libept1 + 1.0.3 + + libespeak1 1.44.05~really 1.44.04-0ubuntu1 @@ -2714,6 +2930,14 @@ 5ubuntu0.1 + liblaunchpad-integration1 + 0.1.38 + + + liblaunchpad-integration1.0-cil + 0.1.38 + + liblcms1 1.18.dfsg 1ubuntu2 @@ -3064,6 +3288,14 @@ 1 + libpaper-utils + 1.1.24 + + + libpaper1 + 1.1.24 + + libparted0debian1 2.3 2ubuntu1 @@ -3939,6 +4171,18 @@ 1 + light-themes + 0.1.8.2 + + + linux-firmware + 1.38 + + + linux-generic + 2.6.35.22.23 + + linux-headers-2.6.35-22 2.6.35 22.33 @@ -3949,11 +4193,19 @@ 22.33 + linux-headers-generic + 2.6.35.22.23 + + linux-image-2.6.35-22-generic 2.6.35 22.33 + linux-image-generic + 2.6.35.22.23 + + linux-libc-dev 2.6.35 1022.33 @@ -3979,6 +4231,10 @@ 1 + lockfile-progs + 0.1.15 + + login 1:4.1.4.2 1ubuntu3 @@ -4134,6 +4390,10 @@ 0ubuntu1 + mountall + 2.19 + + mousetweaks 2.32.0 0ubuntu1 @@ -4214,6 +4474,10 @@ 23ubuntu3 + netbase + 4.35ubuntu3 + + netcat-openbsd 1.89 3ubuntu2 @@ -4244,6 +4508,10 @@ 0ubuntu3 + notify-osd-icons + 0.6 + + ntfs-3g 1:2010.8.8 0ubuntu1 @@ -4269,6 +4537,10 @@ 0ubuntu1 + nvidia-common + 0.2.24 + + nvidia-current-modaliases 260.19.06 0ubuntu1 @@ -4339,6 +4611,10 @@ 6ubuntu1 + openoffice.org-hyphenation + 0.6 + + openoffice.org-hyphenation-en-us 2.5 1ubuntu1 @@ -4404,6 +4680,10 @@ 1ubuntu4.1 + os-prober + 1.39 + + parted 2.3 2ubuntu1 @@ -4489,16 +4769,36 @@ 2ubuntu4 + policykit-desktop-privileges + 0.2 + + poppler-utils 0.14.3 0ubuntu1 + popularity-contest + 1.48ubuntu1 + + + powermgmt-base + 1.31 + + ppp 2.4.5~git20081126t100229 0ubuntu4 + pppconfig + 2.3.18ubuntu2 + + + pppoeconf + 1.19ubuntu1 + + pptp-linux 1.7.2 5 @@ -4569,6 +4869,10 @@ 0ubuntu8 + python-apt + 0.7.96.1ubuntu11 + + python-aptdaemon 0.31+bzr506 0ubuntu2 @@ -4599,6 +4903,10 @@ 1 + python-central + 0.6.15ubuntu2 + + python-configglue 0.9pre1 0ubuntu1 @@ -4629,6 +4937,10 @@ 1ubuntu3 + python-debian + 0.1.16ubuntu1 + + python-desktopcouch-records 0.6.9b 0ubuntu1 @@ -4744,6 +5056,10 @@ 0ubuntu2 + python-launchpad-integration + 0.1.38 + + python-launchpadlib 1.6.1 1 @@ -4884,11 +5200,19 @@ 0ubuntu1 + python-software-properties + 0.76.7 + + python-speechd 0.7 5ubuntu3 + python-support + 1.0.9ubuntu1 + + python-telepathy 0.15.17 1 @@ -4969,6 +5293,10 @@ 2ubuntu1 + python-xkit + 0.4.2.2 + + python-zope.interface 3.6.1 0ubuntu1 @@ -5064,6 +5392,10 @@ 14ubuntu4 + screen-resolution-extra + 0.14 + + screensaver-default-images 0.2 1 @@ -5079,11 +5411,23 @@ 7 + sensible-utils + 0.0.4ubuntu1 + + sessioninstaller 0.20+bzr115 0ubuntu1 + sgml-base + 1.26 + + + sgml-data + 2.0.4 + + shared-mime-info 0.71 3 @@ -5104,6 +5448,14 @@ 1ubuntu8 + software-center + 3.0.4 + + + software-properties-gtk + 0.76.7 + + speech-dispatcher 0.7 5ubuntu3 @@ -5119,6 +5471,10 @@ 4ubuntu4 + ssl-cert + 1.0.26 + + strace 4.5.20 2ubuntu2 @@ -5129,6 +5485,10 @@ 1ubuntu2 + synaptic + 0.63.1ubuntu14 + + syslinux 2:4.01+dfsg 3ubuntu1 @@ -5294,6 +5654,10 @@ 7 + ttf-indic-fonts-core + 1:0.5.10ubuntu1 + + ttf-kacst-one 3.0 1ubuntu2 @@ -5319,6 +5683,10 @@ 7ubuntu1 + ttf-punjabi-fonts + 1:0.5.10ubuntu1 + + ttf-takao-pgothic 003.02.01 2ubuntu1 @@ -5354,11 +5722,55 @@ 0ubuntu5 + ubuntu-artwork + 53.8 + + + ubuntu-desktop + 1.207 + + + ubuntu-docs + 10.10.3 + + + ubuntu-extras-keyring + 2010.09.27 + + + ubuntu-keyring + 2010.+09.30 + + + ubuntu-minimal + 1.207 + + + ubuntu-mono + 0.0.22 + + + ubuntu-sounds + 0.12 + + ubuntu-sso-client 1.0.3 0ubuntu1 + ubuntu-standard + 1.207 + + + ubuntu-system-service + 0.1.20.1 + + + ubuntu-wallpapers + 0.31.6 + + ubuntuone-client 1.4.4.1 0ubuntu1 @@ -5369,6 +5781,10 @@ 0ubuntu1 + ucf + 3.0025 + + udev 162 2 @@ -5384,6 +5800,10 @@ 1ubuntu2 + unattended-upgrades + 0.62ubuntu1 + + uno-libs3 1.6.1+OOo3.2.1 7ubuntu1 @@ -5394,6 +5814,26 @@ 4 + update-inetd + 4.36 + + + update-manager + 1:0.142.19 + + + update-manager-core + 1:0.142.19 + + + update-notifier + 0.105ubuntu1 + + + update-notifier-common + 0.105ubuntu1 + + upower 0.9.5 4 @@ -5414,6 +5854,14 @@ 8 + usb-creator-common + 0.2.25 + + + usb-creator-gtk + 0.2.25 + + usb-modeswitch 1.1.4 1 @@ -5494,6 +5942,14 @@ 1 + whois + 5.0.7ubuntu1 + + + wireless-crda + 1.12 + + wireless-tools 30~pre9 3ubuntu4 @@ -5509,6 +5965,38 @@ 2 + x-ttcidfont-conf + 32 + + + x11-apps + 7.5+5 + + + x11-common + 1:7.5+6ubuntu3 + + + x11-session-utils + 7.5+1 + + + x11-utils + 7.5+4 + + + x11-xfs-utils + 7.4+1build2 + + + x11-xkb-utils + 7.5+5 + + + x11-xserver-utils + 7.5+2ubuntu1 + + xauth 1:1.0.4 1 @@ -5539,16 +6027,36 @@ 1 + xfonts-100dpi + 1:1.0.1 + + + xfonts-75dpi + 1:1.0.1 + + + xfonts-base + 1:1.0.1 + + xfonts-encodings 1:1.0.3 1 + xfonts-mathml + 4ubuntu1 + + xfonts-scalable 1:1.0.1 1 + xfonts-utils + 1:7.5+2 + + xinit 1.2.0 2 @@ -5564,6 +6072,14 @@ 1ubuntu8 + xml-core + 0.13 + + + xorg + 1:7.5+6ubuntu3 + + xorg-docs-core 1:1.5 1 @@ -5584,11 +6100,19 @@ 0ubuntu7 + xserver-xorg + 1:7.5+6ubuntu3 + + xserver-xorg-core 2:1.9.0 0ubuntu7 + xserver-xorg-input-all + 1:7.5+6ubuntu3 + + xserver-xorg-input-evdev 1:2.3.2 6ubuntu3 @@ -5614,6 +6138,10 @@ 0ubuntu1 + xserver-xorg-video-all + 1:7.5+6ubuntu3 + + xserver-xorg-video-apm 1:1.2.3 0ubuntu1 diff --git a/inspector/virt-inspector b/inspector/virt-inspector index ce9ac0e..c721b1d 100755 --- a/inspector/virt-inspector +++ b/inspector/virt-inspector @@ -189,6 +189,8 @@ $xml->startTag ("operatingsystems"); my $root; foreach $root (@roots) { + # Note that output_applications requires the filesystems + # to be mounted up. my %fses = $g->inspect_get_mountpoints ($root); my @fses = sort { length $a <=> length $b } keys %fses; foreach (@fses) { @@ -213,6 +215,10 @@ foreach $root (@roots) { $xml->dataElement (major_version => $s); $s = $g->inspect_get_minor_version ($root); $xml->dataElement (minor_version => $s); + $s = $g->inspect_get_package_format ($root); + $xml->dataElement (package_format => $s) if $s ne "unknown"; + $s = $g->inspect_get_package_management ($root); + $xml->dataElement (package_management => $s) if $s ne "unknown"; eval { $s = $g->inspect_get_windows_systemroot ($root); @@ -361,8 +367,9 @@ installed. 1 -(The version and release fields may not be available for -some package types). +The version and release fields may not be available for some types +guests. Other fields are possible, see +L. =cut @@ -371,124 +378,33 @@ sub output_applications local $_; my $root = shift; - # Based on the distro, take a guess at the package format - # and package management. - my ($package_format, $package_management); - $package_format = $g->inspect_get_package_format ($root); - $package_management = $g->inspect_get_package_management ($root); + my @apps = $g->inspect_list_applications ($root); - $xml->dataElement (package_format => $package_format) - if $package_format ne "unknown"; - $xml->dataElement (package_management => $package_management) - if $package_management ne "unknown"; - - # Do we know how to get a list of applications? - if ($package_format eq "rpm") { - output_applications_rpm ($root); - } - elsif ($package_format eq "deb") { - output_applications_deb ($root); - } -} - -sub output_applications_rpm -{ - local $_; - my $root = shift; - - # Previous virt-inspector ran the 'rpm' program from the guest. - # This is insecure, and unnecessary because we can get the same - # information directly from the RPM database. - - my @applications; - - eval { - my ($fh, $filename) = tempfile (UNLINK => 1); - my $fddev = "/dev/fd/" . fileno ($fh); - $g->download ("/var/lib/rpm/Name", $fddev); - close $fh or die "close: $!"; - - # Read the database with the Berkeley DB dump tool. - my $cmd = "db_dump -p '$filename'"; - open PIPE, "$cmd |" or die "close: $!"; - while () { - chomp; - last if /^HEADER=END$/; - } - while () { - chomp; - last if /^DATA=END$/; - - # First character on each data line is a space. - if (length $_ > 0 && substr ($_, 0, 1) eq ' ') { - $_ = substr ($_, 1); - } - # Name should never contain non-printable chars. - die "name contains non-printable chars" if /\\/; - push @applications, $_; - - $_ = ; # discard value - } - close PIPE or die "close: $!"; - }; - if (!$@ && @applications > 0) { - @applications = sort @applications; - $xml->startTag ("applications"); - foreach (@applications) { - $xml->startTag ("application"); - $xml->dataElement (name => $_); - $xml->endTag ("application"); - } - $xml->endTag ("applications"); - } -} - -sub output_applications_deb -{ - local $_; - my $root = shift; - - my @applications; - - eval { - my ($fh, $filename) = tempfile (UNLINK => 1); - my $fddev = "/dev/fd/" . fileno ($fh); - $g->download ("/var/lib/dpkg/status", $fddev); - close $fh or die "close: $!"; - - # Read the file. Each package is separated by a blank line. - open FILE, $filename or die "$filename: $!"; - my ($name, $installed, $version, $release); - while () { - chomp; - if (/^Package: (.*)/) { - $name = $1; - } elsif (/^Status: .*\binstalled\b/) { - $installed = 1; - } elsif (/^Version: (.*?)-(.*)/) { - $version = $1; - $release = $2; - } elsif ($_ eq "") { - if ($installed && - defined $name && defined $version && defined $release) { - push @applications, [ $name, $version, $release ]; - } - $name = undef; - $installed = undef; - $version = undef; - $release = undef; - } - } - close FILE or die "$filename: $!"; - }; - if (!$@ && @applications > 0) { - @applications = sort { $a->[0] cmp $b->[0] } @applications; + if (@apps) { $xml->startTag ("applications"); - foreach (@applications) { + foreach (@apps) { $xml->startTag ("application"); - $xml->dataElement (name => $_->[0]); - $xml->dataElement (version => $_->[1]); - $xml->dataElement (release => $_->[2]); + $xml->dataElement (name => $_->{app_name}); + $xml->dataElement (display_name => $_->{app_display_name}) + if $_->{app_display_name} ne ""; + $xml->dataElement (epoch => $_->{app_epoch}) + if $_->{app_epoch} != 0; + $xml->dataElement (version => $_->{app_version}) + if $_->{app_version} ne ""; + $xml->dataElement (release => $_->{app_release}) + if $_->{app_release} ne ""; + $xml->dataElement (install_path => $_->{app_install_path}) + if $_->{app_install_path} ne ""; + $xml->dataElement (publisher => $_->{app_publisher}) + if $_->{app_publisher} ne ""; + $xml->dataElement (url => $_->{app_url}) + if $_->{app_url} ne ""; + $xml->dataElement (source_package => $_->{app_source_package}) + if $_->{app_source_package} ne ""; + $xml->dataElement (summary => $_->{app_summary}) + if $_->{app_summary} ne ""; + $xml->dataElement (description => $_->{app_description}) + if $_->{app_description} ne ""; $xml->endTag ("application"); } $xml->endTag ("applications"); diff --git a/inspector/virt-inspector.rng b/inspector/virt-inspector.rng index cd9d422..10aa6db 100644 --- a/inspector/virt-inspector.rng +++ b/inspector/virt-inspector.rng @@ -84,8 +84,16 @@ + + + + + + + + -- 1.8.3.1