Bug#601805: viewvc: diff for NMU version 1.1.5-1.1

[Ana Guerrero]

tags 601805 + pending
thanks

Dear maintainer,

I've prepared an NMU for viewvc (versioned as 1.1.5-1.1) and
I will upload it to DELAYED/10. Please feel free to tell me if I
should delay it longer.

Ana

diff -u viewvc-1.1.5/debian/changelog viewvc-1.1.5/debian/changelog
--- viewvc-1.1.5/debian/changelog
+++ viewvc-1.1.5/debian/changelog
@@ -1,3 +1,13 @@
+viewvc (1.1.5-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Backporting oneliner fix from version 1.1.6, r2369,
+    (escape): Ensure that the input is string-ified before doing string
+    transformations on it. (Closes: #601805)
+    Thanks to Tom Albers.
+
+ -- Ana Beatriz Guerrero Lopez <a...@debian.org>  Sat, 30 Oct 2010 12:12:36 +0200
+
 viewvc (1.1.5-1) unstable; urgency=medium
 
   [ John Zaitseff ]
diff -u viewvc-1.1.5/debian/patches/series viewvc-1.1.5/debian/patches/series
--- viewvc-1.1.5/debian/patches/series
+++ viewvc-1.1.5/debian/patches/series
@@ -4,0 +5 @@
+rev2369
only in patch2:
unchanged:
--- viewvc-1.1.5.orig/debian/patches/rev2369
+++ viewvc-1.1.5/debian/patches/rev2369
@@ -0,0 +1,10 @@
+--- a/lib/sapi.py
++++ b/lib/sapi.py
+@@ -33,6 +33,7 @@ server = None
+ # that character as-is, and sometimes needs to embed escaped values
+ # into HTML attributes.
+ def escape(s):
++  s = str(s)
+   s = string.replace(s, '&', '&amp;')
+   s = string.replace(s, '>', '&gt;')
+   s = string.replace(s, '<', '&lt;')