From 86faf14f64aacab0479697f269196befc45b7048 Mon Sep 17 00:00:00 2001
From: Thanos Doukoudakis <thanos.doukoudakis@isode.com>
Date: Fri, 2 Mar 2018 14:29:07 +0000
Subject: Update the debian and ubuntu distributions

This patch updates the build scripts and documentation for newer
distributions of Debian (9) and Ubuntu (17.10).

Test-Information:

Tested packaging scripts on Ubuntu 16.04.4 for Debian stretch and Ubuntu
artful distributions.

Change-Id: Id567d75bdf3c6abe3cf08a2fd617363a5c1c987f

diff --git a/README.md b/README.md
index 1407683..f1b56bd 100644
--- a/README.md
+++ b/README.md
@@ -26,8 +26,9 @@ Platforms we officially test our releases on are listed below. We only test on d
 * Swift
     * Windows 7 to Windows 10
     * Mac OS X 10.10 and Mac OS X 10.11
-    * Ubuntu 14.04 ( Trusty Tahr ) and Ubuntu 16.04 ( Xenial Xerus )
+    * Ubuntu 17.10 ( Artful Aardvark ) and Ubuntu 16.04 ( Xenial Xerus )
     * Debian 8 ( jessie )
+    * Debian 9 ( stretch )
 
 ## External Dependencies
 The Swift repository includes some third party dependencies in the 3rdParty directory
diff --git a/Swift/Packaging/Debian/Testing/swift-distr-tests.sh b/Swift/Packaging/Debian/Testing/swift-distr-tests.sh
index 8d03282..e817974 100755
--- a/Swift/Packaging/Debian/Testing/swift-distr-tests.sh
+++ b/Swift/Packaging/Debian/Testing/swift-distr-tests.sh
@@ -40,25 +40,31 @@ arr[0,0]="ubuntu"
 arr[0,1]="http://archive.ubuntu.com/ubuntu"
 arr[0,2]="xenial"
 
-#Ubuntu yakkety
+#Ubuntu artful
 arr[1,0]="ubuntu"
 arr[1,1]="http://archive.ubuntu.com/ubuntu"
-arr[1,2]="yakkety"
+arr[1,2]="artful"
 
 #Debian jessie
 arr[2,0]="debian"
 arr[2,1]="http://deb.debian.org/debian/"
 arr[2,2]="jessie"
 
-#Debian sid
+#Debian stretch
 arr[3,0]="debian"
 arr[3,1]="http://deb.debian.org/debian/"
-arr[3,2]="sid"
+arr[3,2]="stretch"
+
+#Debian sid
+arr[4,0]="debian"
+arr[4,1]="http://deb.debian.org/debian/"
+arr[4,2]="sid"
+
 
 DIST="$1"
 RETURN_VALUE=0
 
-for counter in {0..3}
+for counter in {0..4}
 do
 #  for ARCH in "amd64" "i386"
   for ARCH in "amd64"
diff --git a/Swift/Packaging/Debian/package_all_platforms.sh b/Swift/Packaging/Debian/package_all_platforms.sh
index a61201d..afd0621 100755
--- a/Swift/Packaging/Debian/package_all_platforms.sh
+++ b/Swift/Packaging/Debian/package_all_platforms.sh
@@ -26,7 +26,7 @@ unset SWIFT_FORCE_LUCID
 
 if [ -z ${SWIFT_PACKAGE_PLATFORMS+x} ];
 then
-	platformsarray=( xenial yakkety jessie sid )
+	platformsarray=( xenial artful jessie stretch sid )
 else
 	platformsarray=( $SWIFT_PACKAGE_PLATFORMS )
 fi
diff --git a/Swift/Packaging/Debian/update_debian_repo.sh b/Swift/Packaging/Debian/update_debian_repo.sh
index db9f326..b057103 100644
--- a/Swift/Packaging/Debian/update_debian_repo.sh
+++ b/Swift/Packaging/Debian/update_debian_repo.sh
@@ -74,7 +74,7 @@ command -v reprepro >/dev/null 2>&1 || { echo >&2 "This script requires aptly bu
 mkdir -p $APT_REPO_ROOT
 
 if [ -z ${SWIFT_PACKAGE_PLATFORMS+x} ]; then
-	platformsarray=( xenial yakkety jessie sid )
+	platformsarray=( xenial artful jessie stretch sid )
 else
 	platformsarray=( $SWIFT_PACKAGE_PLATFORMS )
 fi
-- 
cgit v0.10.2-6-g49f6