From 50325c8b66ea5fcd510dcfcd4bcc643dc14103a5 Mon Sep 17 00:00:00 2001
From: paulbeach <pbeach@ibphoenix.com>
Date: Mon, 3 Jul 2017 16:05:21 +0200
Subject: [PATCH] Consolidated distribution file

---
 .../{DistributionCS.xml => Distribution.xml}   |  2 +-
 .../arch-specific/darwin/DistributionSS.xml    | 18 ------------------
 2 files changed, 1 insertion(+), 19 deletions(-)
 rename builds/install/arch-specific/darwin/{DistributionCS.xml => Distribution.xml} (86%)
 delete mode 100644 builds/install/arch-specific/darwin/DistributionSS.xml

diff --git a/builds/install/arch-specific/darwin/DistributionCS.xml b/builds/install/arch-specific/darwin/Distribution.xml
similarity index 86%
rename from builds/install/arch-specific/darwin/DistributionCS.xml
rename to builds/install/arch-specific/darwin/Distribution.xml
index fd9498fb22..8de602dce3 100644
--- a/builds/install/arch-specific/darwin/DistributionCS.xml
+++ b/builds/install/arch-specific/darwin/Distribution.xml
@@ -14,5 +14,5 @@
     <choice id="com.firebirdsql.Firebird" visible="false">
         <pkg-ref id="com.firebirdsql.Firebird"/>
     </choice>
-    <pkg-ref id="com.firebirdsql.Firebird" version="2.5.0" onConclusion="none">FirebirdCS.pkg</pkg-ref>
+    <pkg-ref id="com.firebirdsql.Firebird" version="3.0.0" onConclusion="none">Firebird.pkg</pkg-ref>
 </installer-gui-script>
diff --git a/builds/install/arch-specific/darwin/DistributionSS.xml b/builds/install/arch-specific/darwin/DistributionSS.xml
deleted file mode 100644
index b33d511cd6..0000000000
--- a/builds/install/arch-specific/darwin/DistributionSS.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<installer-gui-script minSpecVersion="1">
-    <title>Firebird Database Server (SuperServer)</title>
-    <welcome file="Welcome.txt" mime-type="text/plain"/>
-    <license file="License.txt" mime-type="text/plain"/>
-    <pkg-ref id="com.firebirdsql.Firebird"/>
-    <options customize="never" require-scripts="false"/>
-    <choices-outline>
-        <line choice="default">
-            <line choice="com.firebirdsql.Firebird"/>
-        </line>
-    </choices-outline>
-    <choice id="default"/>
-    <choice id="com.firebirdsql.Firebird" visible="false">
-        <pkg-ref id="com.firebirdsql.Firebird"/>
-    </choice>
-    <pkg-ref id="com.firebirdsql.Firebird" version="2.5.0" onConclusion="none">FirebirdSS.pkg</pkg-ref>
-</installer-gui-script>