From 081552f6a7cd97f5b6499fd896f755c990b5b769 Mon Sep 17 00:00:00 2001
From: Luca Falavigna <dktrkranz@debian.org>
Date: Mon, 20 Aug 2012 23:34:35 +0200
Subject: debian/patches/unicode.patch removed, applied upstream

---
 debian/changelog             |  2 ++
 debian/patches/series        |  1 -
 debian/patches/unicode.patch | 16 ----------------
 3 files changed, 2 insertions(+), 17 deletions(-)
 delete mode 100644 debian/patches/unicode.patch

diff --git a/debian/changelog b/debian/changelog
index e8b9426..7ad7383 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 scons-doc (2.2.0-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * debian/patches/unicode.patch:
+    - Removed, applied upstream.
 
  -- Luca Falavigna <dktrkranz@debian.org>  Mon, 20 Aug 2012 23:31:13 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index 23715f1..8717987 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 no_remote_dtd.patch
-unicode.patch
diff --git a/debian/patches/unicode.patch b/debian/patches/unicode.patch
deleted file mode 100644
index 5dd92aa..0000000
--- a/debian/patches/unicode.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-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
-- 
cgit v1.2.3