From 8959e3a95b69c1ca25f33d265bcb64d888b0df91 Mon Sep 17 00:00:00 2001
From: Jeff Parsons <Jeff@pcjs.org>
Date: Mon, 3 Nov 2014 11:37:35 -0800
Subject: [PATCH] Moved Compaq files into a version-appropriate folder

---
 .../COMPAQ-DESKPRO386-SUPP-1986-08-08.json               | 0
 disks/pc/dos/compaq/{supp => 3.10}/manifest.xml          | 9 +++++++--
 disks/pc/library.xml                                     | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)
 rename disks/pc/dos/compaq/{supp => 3.10}/COMPAQ-DESKPRO386-SUPP-1986-08-08.json (100%)
 rename disks/pc/dos/compaq/{supp => 3.10}/manifest.xml (53%)

diff --git a/disks/pc/dos/compaq/supp/COMPAQ-DESKPRO386-SUPP-1986-08-08.json b/disks/pc/dos/compaq/3.10/COMPAQ-DESKPRO386-SUPP-1986-08-08.json
similarity index 100%
rename from disks/pc/dos/compaq/supp/COMPAQ-DESKPRO386-SUPP-1986-08-08.json
rename to disks/pc/dos/compaq/3.10/COMPAQ-DESKPRO386-SUPP-1986-08-08.json
diff --git a/disks/pc/dos/compaq/supp/manifest.xml b/disks/pc/dos/compaq/3.10/manifest.xml
similarity index 53%
rename from disks/pc/dos/compaq/supp/manifest.xml
rename to disks/pc/dos/compaq/3.10/manifest.xml
index 2f7fb4400..ae8bb454a 100644
--- a/disks/pc/dos/compaq/supp/manifest.xml
+++ b/disks/pc/dos/compaq/3.10/manifest.xml
@@ -1,8 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.15.8/manifest.xsl"?>
 <manifest type="software">
-	<title>COMPAQ</title>
-	<disk id="disk01" size="368640" chs="40:2:9" img="private/COMPAQ-DESKPRO386-SUPP-1986-08-08.img" href="/disks/pc/dos/compaq/supp/COMPAQ-DESKPRO386-SUPP-1986-08-08.json" md5="2bd655ae5568ac27807aeb7bf1ea046d" md5json="6b43800deab66bde7a860fe9b5cd4e9f">
+	<title>MS-DOS</title>
+	<version>3.10</version>
+	<type>DOS</type>
+	<category>Operating System</category>
+	<author>Compaq/Microsoft</author>
+	<releaseDate/>
+	<disk id="disk01" size="368640" chs="40:2:9" img="private/COMPAQ-DESKPRO386-SUPP-1986-08-08.img" href="/disks/pc/dos/compaq/3.10/COMPAQ-DESKPRO386-SUPP-1986-08-08.json" md5="2bd655ae5568ac27807aeb7bf1ea046d" md5json="6b43800deab66bde7a860fe9b5cd4e9f">
 		<name>COMPAQ DESKPRO 386 (1986)</name>
 	</disk>
 </manifest>
diff --git a/disks/pc/library.xml b/disks/pc/library.xml
index a44490b7c..d3485f509 100644
--- a/disks/pc/library.xml
+++ b/disks/pc/library.xml
@@ -14,7 +14,7 @@
 		<manifest ref="/disks/pc/dos/ibm/7.00/manifest.xml" disk="*"/>
 		<manifest ref="/disks/pc/dos/microsoft/3.20/manifest.xml" disk="*"/>
 		<manifest ref="/disks/pc/dos/microsoft/4.0M/manifest.xml" disk="*"/>
-		<manifest ref="/disks/pc/dos/compaq/supp/manifest.xml" disk="*"/>
+		<manifest ref="/disks/pc/dos/compaq/3.10/manifest.xml" disk="*"/>
 		<manifest ref="/disks/pc/os2/1.0/manifest.xml" disk="*"/>
 		<manifest ref="/disks/pc/os2/1.1/manifest.xml" disk="*"/>
 		<manifest ref="/disks/pc/os2/1.3/manifest.xml" disk="*"/>