4 files changed, 9 insertions, 5 deletions
diff --git a/BuildTools/SCons/Tools/textfile.py b/BuildTools/SCons/Tools/textfile.py
index 89f8963..cc58666 100644
--- a/BuildTools/SCons/Tools/textfile.py
+++ b/BuildTools/SCons/Tools/textfile.py
@@ -61,11 +61,11 @@ def _do_subst(node, subs):
     their values.  For example, if subs is
         {'%VERSION%': '1.2345', '%BASE%': 'MyProg', '%prefix%': '/bin'},
     then all instances of %VERSION% in the file will be replaced with
     1.2345 and so forth.
     """
-    contents = node.get_text_contents()
+    contents = node.get_contents().decode('utf-8')
     if not subs: return contents
     for (k,v) in subs:
         contents = re.sub(k, v, contents)
     return contents
 
@@ -111,11 +111,11 @@ def _action(target, source, env):
         raise SCons.Errors.UserError("Can't write target file %s" % target[0])
     # separate lines by 'linesep' only if linesep is not empty
     lsep = None
     for s in source:
         if lsep: fd.write(lsep)
-        fd.write(_do_subst(s, subs))
+        fd.write(_do_subst(s, subs).encode("utf-8"))
         lsep = linesep
     fd.close()
 
 def _strfunc(target, source, env):
     return "Creating '%s'" % target[0]
diff --git a/Swift/ChangeLog.md b/Swift/ChangeLog.md
index d43a6db..9152b50 100644
--- a/Swift/ChangeLog.md
+++ b/Swift/ChangeLog.md
@@ -1,5 +1,9 @@
+4.0.3 (2019-01-03)
+------------------
+- Fix handling of empty bookmark responses
+
 4.0.2 (2018-04-05)
 ------------------
 - Fix versioning issue in Windows Installer process
 
 4.0.1 (2018-03-28)
diff --git a/Swift/Packaging/Debian/changelog.debian-unstable b/Swift/Packaging/Debian/changelog.debian-unstable
index a6b7606..f2bf2c5 100644
--- a/Swift/Packaging/Debian/changelog.debian-unstable
+++ b/Swift/Packaging/Debian/changelog.debian-unstable
@@ -1,6 +1,6 @@
-swift-im (4.0.2-1) UNRELEASED; urgency=medium
+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
@@ -12,11 +12,11 @@ swift-im (4.0.2-1) UNRELEASED; urgency=medium
   * 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>  Tue, 10 Apr 2018 10:46:13 +0200
+ -- 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
   * Allow compiling with newer boosts. Closes: 810839, 822131
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
@@ -1,11 +1,11 @@
 This package was debianized by the Swift project <packages@swift.im>,
 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.
 
 
 This software is subject to the OpenSSL license exception.