[Libosinfo] [PATCH osinfo-db 3/3] Derive Debian testing from the latest stable release

[Guido Günther]

this allows us to move QXL and ac97 back to the current oldstable
release and drop redundant entries.
---
 data/os/debian.org/debian-7.xml.in       |  2 ++
 data/os/debian.org/debian-testing.xml.in | 10 ++--------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/data/os/debian.org/debian-7.xml.in b/data/os/debian.org/debian-7.xml.in
index d11a1a2..93edf89 100644
--- a/data/os/debian.org/debian-7.xml.in
+++ b/data/os/debian.org/debian-7.xml.in
@@ -16,10 +16,12 @@
     <eol-date>2018-05-31</eol-date>
 
     <devices>
+      <device id="http://pcisig.com/pci/8086/2415"/> <!-- AC97 -->
       <device id="http://pcisig.com/pci/1af4/1002"/> <!-- virtio-balloon -->
       <device id="http://pcisig.com/pci/1af4/1003"/> <!-- virtio-console -->
       <device id="http://pcisig.com/pci/1af4/1004"/> <!-- virtio-scsi -->
       <device id="http://pcisig.com/pci/1af4/1009"/> <!-- virtio-9p -->
+      <device id="http://pcisig.com/pci/1b36/0100"/> <!-- QXL -->
     </devices>
 
     <resources arch="all">
diff --git a/data/os/debian.org/debian-testing.xml.in b/data/os/debian.org/debian-testing.xml.in
index a06fe3e..744de8f 100644
--- a/data/os/debian.org/debian-testing.xml.in
+++ b/data/os/debian.org/debian-testing.xml.in
@@ -8,14 +8,8 @@
     <_vendor>Debian Project</_vendor>
     <family>linux</family>
     <distro>debian</distro>
-
-    <devices>
-      <device id="http://pcisig.com/pci/8086/2415"/> <!-- AC97 -->
-      <device id="http://pcisig.com/pci/1b36/0100"/> <!-- QXL -->
-      <device id="http://pcisig.com/pci/1af4/1001"/> <!-- virtio-block -->
-      <device id="http://pcisig.com/pci/1af4/1000"/> <!-- virtio-net -->
-      <device id="http://usb.org/usb/80ee/0021"/> <!-- USB tablet -->
-    </devices>
+    <upgrades id="http://debian.org/debian/8"/>
+    <derives-from id="http://debian.org/debian/8"/>
 
     <resources arch="all">
       <minimum>
-- 
2.10.2