6 files changed, 35 insertions, 11 deletions
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/changelog.debian-unstable b/Swift/Packaging/Debian/changelog.debian-unstable
index ca9ffec..f2bf2c5 100644
--- a/Swift/Packaging/Debian/changelog.debian-unstable
+++ b/Swift/Packaging/Debian/changelog.debian-unstable
@@ -1,3 +1,21 @@
+swift-im (4.0.3-1) UNRELEASED; urgency=medium
+
+  * New chat theme including a new font
+  * Support for message carbons (XEP-0280)
+  * Enabled trellis mode as a default feature, allowing several tiled chats windows to be shown at once
+  * Redesigned keyword highlighting
+  * Improve date formatting
+  * Fix Last Message Correction in multi client scenarios
+  * Fix UI layout issue for translations that require right-to-left (RTL) layout
+  * Fix UX issues in trellis mode
+  * Improvements to font size handling in the chat theme
+  * Add AppImage for Linux 64-bit as a supported platform
+  * Improved spell checker support on Linux
+  * Allow setting vCard on servers that do not return an empty vCard on fresh accounts
+  * And assorted smaller features and usability enhancements. Closes: 840151, 889062
+
+ -- Kevin Smith <kevin@kismith.co.uk>  Thu, 03 Jan 2019 13:59:07 +0100
+
 swift-im (3.0.4-1) unstable; urgency=low
 
   * New upstream release
diff --git a/Swift/Packaging/Debian/debian/copyright b/Swift/Packaging/Debian/debian/copyright
index a0c2c79..9219930 100644
--- a/Swift/Packaging/Debian/debian/copyright
+++ b/Swift/Packaging/Debian/debian/copyright
@@ -3,7 +3,7 @@ with help from Olly Betts <olly@survex.com>.
 
 The upstream sources were obtained from http://swift.im.
 
-Copyright (C) 2010-2016 Isode Limited.
+Copyright (C) 2010-2019 Isode Limited.
 Licensed under the GNU General Public License.
 See /usr/share/common-licenses/GPL-3 for the full license.
 
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
diff --git a/Swift/Packaging/SConscript b/Swift/Packaging/SConscript
index bd7e6d8..3aa791f 100644
--- a/Swift/Packaging/SConscript
+++ b/Swift/Packaging/SConscript
@@ -20,10 +20,10 @@ if env["SCONS_STAGE"] == "build" :
 
         swiftenConfigHelp = env.Command(
             target='$HELP2MAN_DEBIAN_DIR/swiften-config.1', source='#/Swiften/Config/swiften-config',
-            action = Action('$HELP2MAN -m "Swift Manual" -S "swiften-config" -n "swiften-config" -N $SOURCE > $TARGET', cmdstr = "$HELP2MANSTR"))
+            action = Action('$HELP2MAN --no-discard-stderr -m "Swift Manual" -S "swiften-config" -n "swiften-config" -N $SOURCE > $TARGET', cmdstr = "$HELP2MANSTR"))
         swiftHelp = env.Command(
             target='$HELP2MAN_DEBIAN_DIR/swift-im.1', source='#/Swift/QtUI/swift-im',
-            action = Action('$HELP2MAN -m "Swift Manual" -S "Swift" -n "swift-im" -N $SOURCE > $TARGET', cmdstr = "$HELP2MANSTR"))
+            action = Action('$HELP2MAN --no-discard-stderr -m "Swift Manual" -S "Swift" -n "swift-im" -N $SOURCE > $TARGET', cmdstr = "$HELP2MANSTR"))
     else:
         print "Enabled help2man but help2man is not in the PATH of the current environment."
-        Exit(1)
-\ No newline at end of file
+        Exit(1)