summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorLuca Falavigna <dktrkranz@debian.org>2011-10-18 21:29:59 +0200
committerLuca Falavigna <dktrkranz@debian.org>2011-10-18 21:29:59 +0200
commit5ff1b7aedba2e6995344aed1cd43ce3a3e08eb45 (patch)
treefaf64e2b160571fe27cc6a55d597b24160ad9a67 /debian
parent642b200d79632285003c2c5e628e32a778cf326e (diff)
Make sure input variable is unicode
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog7
-rw-r--r--debian/patches/series1
-rw-r--r--debian/patches/unicode.patch16
3 files changed, 24 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index eefb275..6b320db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+scons-doc (2.0.1-2) UNRELEASED; urgency=low
+
+ * debian/patches/unicode.patch:
+ - Make sure input variable is unicode.
+
+ -- Luca Falavigna <dktrkranz@debian.org> Tue, 18 Oct 2011 21:29:35 +0200
+
scons-doc (2.1.0-1) unstable; urgency=low
* New upstream release.
diff --git a/debian/patches/series b/debian/patches/series
index 8717987..23715f1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
no_remote_dtd.patch
+unicode.patch
diff --git a/debian/patches/unicode.patch b/debian/patches/unicode.patch
new file mode 100644
index 0000000..5dd92aa
--- /dev/null
+++ b/debian/patches/unicode.patch
@@ -0,0 +1,16 @@
+Description: Make sure input variable is unicode
+Author: Luca Falavigna <dktrkranz@ubuntu.com
+
+Index: scons-doc-2.0.1/bin/scons-proc.py
+===================================================================
+--- scons-doc-2.0.1.orig/bin/scons-proc.py 2011-05-25 20:08:30.011703884 +0000
++++ scons-doc-2.0.1/bin/scons-proc.py 2011-05-25 20:08:42.501703874 +0000
+@@ -104,7 +104,7 @@
+ content = content.replace('-->\n', '-->')
+ input = xml_preamble + content + xml_postamble
+ try:
+- saxparser.parse(StringIO(input))
++ saxparser.parse(StringIO(unicode(input)))
+ except:
+ sys.stderr.write("error in %s\n" % f)
+ raise