Swift
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-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
@@ -63,7 +63,7 @@ def _do_subst(node, subs):
63 then all instances of %VERSION% in the file will be replaced with 63 then all instances of %VERSION% in the file will be replaced with
64 1.2345 and so forth. 64 1.2345 and so forth.
65 """ 65 """
66 contents = node.get_text_contents() 66 contents = node.get_contents().decode('utf-8')
67 if not subs: return contents 67 if not subs: return contents
68 for (k,v) in subs: 68 for (k,v) in subs:
69 contents = re.sub(k, v, contents) 69 contents = re.sub(k, v, contents)
@@ -113,7 +113,7 @@ def _action(target, source, env):
113 lsep = None 113 lsep = None
114 for s in source: 114 for s in source:
115 if lsep: fd.write(lsep) 115 if lsep: fd.write(lsep)
116 fd.write(_do_subst(s, subs)) 116 fd.write(_do_subst(s, subs).encode("utf-8"))
117 lsep = linesep 117 lsep = linesep
118 fd.close() 118 fd.close()
119 119
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 @@
14.0.3 (2019-01-03)
2------------------
3- Fix handling of empty bookmark responses
4
14.0.2 (2018-04-05) 54.0.2 (2018-04-05)
2------------------ 6------------------
3- Fix versioning issue in Windows Installer process 7- 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 @@
1swift-im (4.0.2-1) UNRELEASED; urgency=medium 1swift-im (4.0.3-1) UNRELEASED; urgency=medium
2 2
3 * New chat theme including a new font 3 * New chat theme including a new font
4 * Support for message carbons (XEP-0280) 4 * Support for message carbons (XEP-0280)
@@ -14,7 +14,7 @@ swift-im (4.0.2-1) UNRELEASED; urgency=medium
14 * Allow setting vCard on servers that do not return an empty vCard on fresh accounts 14 * Allow setting vCard on servers that do not return an empty vCard on fresh accounts
15 * And assorted smaller features and usability enhancements. Closes: 840151, 889062 15 * And assorted smaller features and usability enhancements. Closes: 840151, 889062
16 16
17 -- Kevin Smith <kevin@kismith.co.uk> Tue, 10 Apr 2018 10:46:13 +0200 17 -- Kevin Smith <kevin@kismith.co.uk> Thu, 03 Jan 2019 13:59:07 +0100
18 18
19swift-im (3.0.4-1) unstable; urgency=low 19swift-im (3.0.4-1) unstable; urgency=low
20 20
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>.
3 3
4The upstream sources were obtained from http://swift.im. 4The upstream sources were obtained from http://swift.im.
5 5
6Copyright (C) 2010-2016 Isode Limited. 6Copyright (C) 2010-2019 Isode Limited.
7Licensed under the GNU General Public License. 7Licensed under the GNU General Public License.
8See /usr/share/common-licenses/GPL-3 for the full license. 8See /usr/share/common-licenses/GPL-3 for the full license.
9 9