From bd7ccccda622ccd33baf9576c345ace54e93fbeb Mon Sep 17 00:00:00 2001
From: James Turner <zakalawe@mac.com>
Date: Tue, 23 Oct 2018 12:01:58 +0000
Subject: [PATCH] Catalog configs from UKmirror

---
 catalog/fgaddon-catalog-ukmirror/template.xml | 36 +----------------
 catalog/legacy-catalog/template.xml           |  9 ++---
 catalog/stable-2018-catalog/template.xml      | 39 ++-----------------
 3 files changed, 8 insertions(+), 76 deletions(-)

diff --git a/catalog/fgaddon-catalog-ukmirror/template.xml b/catalog/fgaddon-catalog-ukmirror/template.xml
index 94574af..fd28453 100644
--- a/catalog/fgaddon-catalog-ukmirror/template.xml
+++ b/catalog/fgaddon-catalog-ukmirror/template.xml
@@ -2,7 +2,7 @@
 <PropertyList>
   <template>
 	  <version n="0">2019.*</version>
-	  <version n="1">2018.4.*</version>
+	  <version n="1">2018.*</version>
 
     <id>org.flightgear.fgaddon.trunk</id>
     <license>GPL</license>
@@ -17,37 +17,5 @@
       <description>En Francais</description>
     </fr> -->
 
-
-    <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 previously did not allow multiple version entries, so we
-    duplicate the alternate version here -->
-    <alternate-version>
-      <version>2018.2.*</version>
-      <url>http://mirrors.ibiblio.org/flightgear/ftp/Aircraft/catalog.xml</url>
-      <id>org.flightgear.fgaddon</id>
-    </alternate-version>
-	 <alternate-version>
-      <version>2018.1.*</version>
-      <url>http://mirrors.ibiblio.org/flightgear/ftp/Aircraft/catalog.xml</url>
-      <id>org.flightgear.fgaddon</id>
-    </alternate-version>
-
-    <alternate-version>
-      <version>2017.*</version>
-      <url>http://mirrors.ibiblio.org/flightgear/ftp/Aircraft/catalog.xml</url>
-      <id>org.flightgear.fgaddon</id>
-    </alternate-version>
-
-    <alternate-version>
-      <version>2016.*</version>
-      <url>http://mirrors.ibiblio.org/flightgear/ftp/Aircraft/catalog.xml</url>
-      <id>org.flightgear.fgaddon</id>
-    </alternate-version>
-  </template>
+ </template>
 </PropertyList>
diff --git a/catalog/legacy-catalog/template.xml b/catalog/legacy-catalog/template.xml
index b036a1f..2fe42d4 100644
--- a/catalog/legacy-catalog/template.xml
+++ b/catalog/legacy-catalog/template.xml
@@ -8,11 +8,7 @@
     <version n="3">3.7.*</version>
     <version n="5">2016.*.*</version>
     <version n="6">2017.*.*</version>
-
-    <!-- legacy is also used by these version since they don't know how to
-     handle migrating to another ID -->
-    <version n="7">2018.1.*</version>
-    <version n="8">2018.2.*</version>
+    <version n="7">2018.*.*</version>
 
     <!-- the legacy catalog has to have this ID, becuase this is what older FG
     clients expect -->
@@ -24,7 +20,7 @@
     FlightGear project, under a free-software license. Aircraft are intended for
     use with FlightGear versions 2018.2 and older.</description>
 
-    <alternate-version>
+<!--    <alternate-version>
       <version>2019.*</version>
       <version>2018.4.*</version>
       <url>http://mirrors.ibiblio.org/flightgear/ftp/Aircraft-trunk/catalog.xml</url>
@@ -36,6 +32,7 @@
       <url>http://mirrors.ibiblio.org/flightgear/ftp/Aircraft-2018/catalog.xml</url>
       <id>org.flightgear.fgaddon.stable_2018</id>
     </alternate-version>
+-->
 
   </template>
 </PropertyList>
diff --git a/catalog/stable-2018-catalog/template.xml b/catalog/stable-2018-catalog/template.xml
index d77d369..c5d6bc5 100644
--- a/catalog/stable-2018-catalog/template.xml
+++ b/catalog/stable-2018-catalog/template.xml
@@ -1,47 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <PropertyList>
   <template>
-	  <version n="0">2018.3.*</version>
+	  <version n="0">2018.*</version>
     <id>org.flightgear.fgaddon.stable_2018</id>
     <license>GPL</license>
     <url>http://mirrors.ibiblio.org/flightgear/ftp/Aircraft-2018/catalog.xml</url>
-    <name>FlightGear aircraft distribution for 2108.x versions</name>
+    <name>FlightGear aircraft distribution for 2018.x versions</name>
     <description>This hangar provides aircraft officially supported and maintained 
     by the FlightGear project, under a free-software license. These aircraft
     are compatible with FlightGear versions from 2018.</description>
     
-    <alternate-version>
-	    <version>2019.*</version>
-	    <version>2018.4.*</version>
-      <url>http://mirrors.ibiblio.org/flightgear/ftp/Aircraft-trunk/catalog.xml</url>
-      <id>org.flightgear.fgaddon.trunk</id>
-    </alternate-version>
-
-
-    <!-- alternate version previously did not allow multiple version entries, so we
-    duplicate the alternate version here -->
-    <alternate-version>
-      <version>2018.2.*</version>
-      <url>http://mirrors.ibiblio.org/flightgear/ftp/Aircraft/catalog.xml</url>
-      <id>org.flightgear.fgaddon</id>
-    </alternate-version>
-
-	 <alternate-version>
-      <version>2018.1.*</version>
-      <url>http://mirrors.ibiblio.org/flightgear/ftp/Aircraft/catalog.xml</url>
-      <id>org.flightgear.fgaddon</id>
-    </alternate-version>
-
-    <alternate-version>
-      <version>2017.*</version>
-      <url>http://mirrors.ibiblio.org/flightgear/ftp/Aircraft/catalog.xml</url>
-      <id>org.flightgear.fgaddon</id>
-    </alternate-version>
-
-    <alternate-version>
-      <version>2016.*</version>
-      <url>http://mirrors.ibiblio.org/flightgear/ftp/Aircraft/catalog.xml</url>
-      <id>org.flightgear.fgaddon</id>
-    </alternate-version>
-    </template>
+   </template>
 </PropertyList>