From 6874d64ed2684d83cb3e340f58f6c8c5089aa857 Mon Sep 17 00:00:00 2001
From: Tobias Markmann <tm@ayena.de>
Date: Thu, 3 Jan 2019 14:16:13 +0100
Subject: Update for Debian
Fix UTF-8 handling issues in
BuildTools/SCons/Tools/textfile.py .
Test-Information:
Tested that ./scons test=unit Swift works on Debain
Unstable (sid) and macOS 10.14.2. Tested that
build_for_debian.sh runs successfully on latest Debian
Unstable (sid).
Change-Id: I29d8c97ce3b4eb3e4fd680bdc814fb0c911262ff
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
@@ -63,7 +63,7 @@ def _do_subst(node, subs):
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)
@@ -113,7 +113,7 @@ def _action(target, source, env):
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()
diff --git a/Swift/ChangeLog.md b/Swift/ChangeLog.md
index d43a6db..9152b50 100644
--- a/Swift/ChangeLog.md
+++ b/Swift/ChangeLog.md
@@ -1,3 +1,7 @@
+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
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,4 +1,4 @@
-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)
@@ -14,7 +14,7 @@ swift-im (4.0.2-1) UNRELEASED; urgency=medium
* 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
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.
--
cgit v0.10.2-6-g49f6