summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--BuildTools/SCons/Tools/textfile.py4
-rw-r--r--Swift/ChangeLog.md4
-rw-r--r--Swift/Packaging/Debian/changelog.debian-unstable4
-rw-r--r--Swift/Packaging/Debian/debian/copyright2
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
@@ -65,3 +65,3 @@ def _do_subst(node, subs):
"""
- contents = node.get_text_contents()
+ contents = node.get_contents().decode('utf-8')
if not subs: return contents
@@ -115,3 +115,3 @@ def _action(target, source, env):
if lsep: fd.write(lsep)
- fd.write(_do_subst(s, subs))
+ fd.write(_do_subst(s, subs).encode("utf-8"))
lsep = linesep
diff --git a/Swift/ChangeLog.md b/Swift/ChangeLog.md
index d43a6db..9152b50 100644
--- a/Swift/ChangeLog.md
+++ b/Swift/ChangeLog.md
@@ -1 +1,5 @@
+4.0.3 (2019-01-03)
+------------------
+- Fix handling of empty bookmark responses
+
4.0.2 (2018-04-05)
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,2 +1,2 @@
-swift-im (4.0.2-1) UNRELEASED; urgency=medium
+swift-im (4.0.3-1) UNRELEASED; urgency=medium
@@ -16,3 +16,3 @@ swift-im (4.0.2-1) UNRELEASED; urgency=medium
- -- 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
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
@@ -5,3 +5,3 @@ 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.