From ccb35c770788950c044ad0afc32cb769a7ae7a65 Mon Sep 17 00:00:00 2001
From: James Turner <zakalawe@mac.com>
Date: Wed, 17 Oct 2018 12:57:48 +0000
Subject: [PATCH] Catalog spec tweaks

---
 .../catalog.config.xml                        |  2 +-
 catalog/fgaddon-catalog-ukmirror/template.xml | 20 +++++++++++++++++--
 .../stable-2018-catalog/catalog.config.xml    |  7 ++++++-
 catalog/stable-2018-catalog/template.xml      |  7 +++++--
 4 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/catalog/fgaddon-catalog-ukmirror/catalog.config.xml b/catalog/fgaddon-catalog-ukmirror/catalog.config.xml
index ea6e965..b5efa13 100644
--- a/catalog/fgaddon-catalog-ukmirror/catalog.config.xml
+++ b/catalog/fgaddon-catalog-ukmirror/catalog.config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <PropertyList>
-  <local-output>/home/fgaddon/output-trunk</local-output>
+	<local-output>/home/fgaddon/output/Aircraft</local-output>
   <download-url n="0">http://mirrors.ibiblio.org/flightgear/ftp/Aircraft/</download-url>
   <download-url n="1">http://ukmirror.flightgear.org/official/Aircraft/</download-url>
 
diff --git a/catalog/fgaddon-catalog-ukmirror/template.xml b/catalog/fgaddon-catalog-ukmirror/template.xml
index a77b225..b0babfc 100644
--- a/catalog/fgaddon-catalog-ukmirror/template.xml
+++ b/catalog/fgaddon-catalog-ukmirror/template.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <PropertyList>
   <template>
-    <version n="0">2019.*</version>
+	  <version n="0">2019.*</version>
+	  <version n="1">2018.4.*</version>
+
     <id>org.flightgear.fgaddon</id>
     <license>GPL</license>
     <url>http://mirrors.ibiblio.org/flightgear/ftp/Aircraft/catalog.xml</url>
@@ -16,11 +18,25 @@
     </fr> -->
 
 
+<!-- be nice to older versions which only accept one version element per alternate -->
     <alternate-version>
-      <version>2018.*</version>
+      <version>2018.1.*</version>
       <url>http://mirrors.ibiblio.org/flightgear/ftp/Aircraft-2018/catalog.xml</url>
       <id>org.flightgear.fgaddon.stable_2018</id>
     </alternate-version>
+    
+    <alternate-version>
+      <version>2018.2.*</version>
+      <url>http://mirrors.ibiblio.org/flightgear/ftp/Aircraft-2018/catalog.xml</url>
+      <id>org.flightgear.fgaddon.stable_2018</id>
+    </alternate-version>
+	 <alternate-version>
+      <version>2018.3.*</version>
+      <url>http://mirrors.ibiblio.org/flightgear/ftp/Aircraft-2018/catalog.xml</url>
+      <id>org.flightgear.fgaddon.stable_2018</id>
+    </alternate-version>
+
+
 
     <alternate-version>
       <version>2017.*</version>
diff --git a/catalog/stable-2018-catalog/catalog.config.xml b/catalog/stable-2018-catalog/catalog.config.xml
index 14d2f37..5a372cd 100644
--- a/catalog/stable-2018-catalog/catalog.config.xml
+++ b/catalog/stable-2018-catalog/catalog.config.xml
@@ -1,13 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--Template catalog - copy and modify for your site as required-->
 <PropertyList>
-  <local-output>/home/fgaddon/output-stable-2018</local-output>
+	<local-output>/home/fgaddon/output/Aircraft-2018</local-output>
   <download-url n="0">http://mirrors.ibiblio.org/flightgear/ftp/Aircraft-2018/</download-url>
   <download-url n="1">http://ukmirror.flightgear.org/official/Aircraft-2018/</download-url>
 
   <thumbnail-url n="0">http://mirrors.ibiblio.org/flightgear/ftp/Aircraft-2018/thumbnails</thumbnail-url>
   <thumbnail-url n="1">http://ukmirror.flightgear.org/official/Aircraft-2018/thumbnails</thumbnail-url>
 
+
+  <!-- share zips with the trunk catalog where possible -->
+  <share-output>/home/fgaddon/output/Aircraft</share-output>
+  <share-md5-sums>/home/fgaddon/fgmeta/catalog/fgaddon-catalog-ukmirror/md5sum.xml</share-md5-sums>
+
   <scm>
     <type>svn</type>
     <path>/home/fgaddon/fgaddon-release-2018.3/Aircraft</path>
diff --git a/catalog/stable-2018-catalog/template.xml b/catalog/stable-2018-catalog/template.xml
index fe48cb3..db463a5 100644
--- a/catalog/stable-2018-catalog/template.xml
+++ b/catalog/stable-2018-catalog/template.xml
@@ -2,7 +2,9 @@
 <!--Template catalog - copy and modify for your site as required-->
 <PropertyList>
   <template>
-    <version n="0">2018.*.*</version>
+	  <version n="0">2018.1.*</version>
+	  <version n="1">2018.2.*</version>
+	  <version n="2">2018.3.*</version>
     <id>org.flightgear.fgaddon.stable_2018</id>
     <license>GPL</license>
     <url>http://mirrors.ibiblio.org/flightgear/ftp/Aircraft-2018/catalog.xml</url>
@@ -12,7 +14,8 @@
     are compatible with FlightGear versions from 2018.</description>
     
     <alternate-version>
-      <version>2019.*</version>
+	    <version>2019.*</version>
+	    <version>2018.4.*</version>
       <url>http://mirrors.ibiblio.org/flightgear/ftp/Aircraft/catalog.xml</url>
       <id>org.flightgear.fgaddon</id>
     </alternate-version>