I'm NMUing with this diff since I'd like ikiwiki to get into testing sometime.
Note that I used the approach of changing the escaping code since this seemed better than build-conflicting on a fairly widely used perl library. -- see shy jo
diff -ur old/libcgi-formbuilder-perl-3.03/debian/changelog
libcgi-formbuilder-perl-3.03/debian/changelog
--- old/libcgi-formbuilder-perl-3.03/debian/changelog 2006-05-27
15:38:59.000000000 -0400
+++ libcgi-formbuilder-perl-3.03/debian/changelog 2006-05-27
15:41:37.000000000 -0400
@@ -1,3 +1,13 @@
+libcgi-formbuilder-perl (3.03-1.1) unstable; urgency=low
+
+ * NMU
+ * Fix FTBFS when HTML::Entities was installed caused by HTML::Entities
+ escaping some additional characters, especially "'". Make the internal
+ escaping code escape "'" to ', and modify the test suite to expect
+ "'" to be escaped. Closes: #338369
+
+ -- Joey Hess <[EMAIL PROTECTED]> Sat, 27 May 2006 15:38:44 -0400
+
libcgi-formbuilder-perl (3.03-1) unstable; urgency=low
* New upstream release.
diff -ur old/libcgi-formbuilder-perl-3.03/lib/CGI/FormBuilder/Util.pm
libcgi-formbuilder-perl-3.03/lib/CGI/FormBuilder/Util.pm
--- old/libcgi-formbuilder-perl-3.03/lib/CGI/FormBuilder/Util.pm
2006-03-06 17:44:38.000000000 -0500
+++ libcgi-formbuilder-perl-3.03/lib/CGI/FormBuilder/Util.pm 2006-05-27
15:28:11.000000000 -0400
@@ -151,6 +151,7 @@
$toencode =~ s!<!<!g;
$toencode =~ s!>!>!g;
$toencode =~ s!"!"!g;
+ $toencode =~ s!'!&39;!g;
return $toencode;
} else {
# dispatch to HTML::Entities
diff -ur old/libcgi-formbuilder-perl-3.03/t/1a-test17.html
libcgi-formbuilder-perl-3.03/t/1a-test17.html
--- old/libcgi-formbuilder-perl-3.03/t/1a-test17.html 2006-03-06
17:44:37.000000000 -0500
+++ libcgi-formbuilder-perl-3.03/t/1a-test17.html 2006-05-27
15:32:13.000000000 -0400
@@ -25,7 +25,7 @@
</tr>
<tr valign="top">
<td>Many</td>
- <td><select id="many" name="many" onchange="this.ham.value = "it's a
pig, man!"">
+ <td><select id="many" name="many" onchange="this.ham.value = "it's
a pig, man!"">
<option value="">-select-</option>
<option value="0">0</option>
<option value="1">1</option>
diff -ur old/libcgi-formbuilder-perl-3.03/t/1a-test21.html
libcgi-formbuilder-perl-3.03/t/1a-test21.html
--- old/libcgi-formbuilder-perl-3.03/t/1a-test21.html 2006-03-06
17:44:37.000000000 -0500
+++ libcgi-formbuilder-perl-3.03/t/1a-test21.html 2006-05-27
15:34:24.000000000 -0400
@@ -51,23 +51,23 @@
<td>Favorite Color</td>
<td><table>
<tr>
- <td><input id="favorite_color_red" name="favorite_color"
onclick="fb_other_off('_other_favorite_color')" type="radio" value="red" /></td>
+ <td><input id="favorite_color_red" name="favorite_color"
onclick="fb_other_off('_other_favorite_color')" type="radio"
value="red" /></td>
<td><label for="favorite_color_red">red</label></td>
</tr>
<tr>
- <td><input id="favorite_color_green" name="favorite_color"
onclick="fb_other_off('_other_favorite_color')" type="radio" value="green"
/></td>
+ <td><input id="favorite_color_green" name="favorite_color"
onclick="fb_other_off('_other_favorite_color')" type="radio"
value="green" /></td>
<td><label for="favorite_color_green">green</label></td>
</tr>
<tr>
- <td><input id="favorite_color_blue" name="favorite_color"
onclick="fb_other_off('_other_favorite_color')" type="radio" value="blue"
/></td>
+ <td><input id="favorite_color_blue" name="favorite_color"
onclick="fb_other_off('_other_favorite_color')" type="radio"
value="blue" /></td>
<td><label for="favorite_color_blue">blue</label></td>
</tr>
<tr>
- <td><input id="favorite_color_yellow" name="favorite_color"
onclick="fb_other_off('_other_favorite_color')" type="radio" value="yellow"
/></td>
+ <td><input id="favorite_color_yellow" name="favorite_color"
onclick="fb_other_off('_other_favorite_color')" type="radio"
value="yellow" /></td>
<td><label for="favorite_color_yellow">yellow</label></td>
</tr>
<tr>
- <td><input id="_favorite_color" name="favorite_color"
onclick="fb_other_on('_other_favorite_color')" type="radio"
value="_other_favorite_color" /></td>
+ <td><input id="_favorite_color" name="favorite_color"
onclick="fb_other_on('_other_favorite_color')" type="radio"
value="_other_favorite_color" /></td>
<td><label for="_favorite_color">Other:</label></td>
</tr>
</table> <input disabled="disabled" id="_other_favorite_color"
name="_other_favorite_color" type="text" /></td>
diff -ur old/libcgi-formbuilder-perl-3.03/t/1a-test23.html
libcgi-formbuilder-perl-3.03/t/1a-test23.html
--- old/libcgi-formbuilder-perl-3.03/t/1a-test23.html 2006-03-06
17:44:37.000000000 -0500
+++ libcgi-formbuilder-perl-3.03/t/1a-test23.html 2006-05-27
15:35:05.000000000 -0400
@@ -42,7 +42,7 @@
<table>
<tr valign="top">
<td>Favorite Color</td>
- <td><input id="favorite_color_0" name="favorite_color" type="text" /> <input
id="_grow_favorite_color" onclick="fb_grow('favorite_color')" type="button"
value="Additional Favorite Color" /></td>
+ <td><input id="favorite_color_0" name="favorite_color" type="text" /> <input
id="_grow_favorite_color" onclick="fb_grow('favorite_color')"
type="button" value="Additional Favorite Color" /></td>
</tr>
<tr valign="top">
<td align="center" colspan="2"><input id="_submit" name="_submit"
type="submit" value="Submit" /></td>
diff -ur old/libcgi-formbuilder-perl-3.03/t/3a-test17.html
libcgi-formbuilder-perl-3.03/t/3a-test17.html
--- old/libcgi-formbuilder-perl-3.03/t/3a-test17.html 2006-03-06
17:44:37.000000000 -0500
+++ libcgi-formbuilder-perl-3.03/t/3a-test17.html 2006-05-27
15:36:54.000000000 -0400
@@ -25,7 +25,7 @@
</tr>
<tr valign="top">
<td>Many</td>
- <td><select id="many" name="many" onchange="this.ham.value = "it's a
pig, man!"">
+ <td><select id="many" name="many" onchange="this.ham.value = "it's
a pig, man!"">
<option value="">-select-</option>
<option value="0">0</option>
<option value="1">1</option>
signature.asc
Description: Digital signature
