tags 607720 + patch
thanks
50patchtemplatefordebian shouldn't be adding the debian_webpath tag to
bug/show-header.html.tmpl, since that template just sets javascript_urls,
which are then emitted by global/header.html.tmpl with debian_webpath
already prepended.
I'm guessing the regex in 50patchtemplatefordebian didn't match
bug/show-header.html.tmpl in the past, and changes in a newer upstream
version caused it to start matching accidentally.
Attached is a patch against the bugzilla3 packaging in sid.
john
--
John Morrissey _o /\ ---- __o
[email protected] _-< \_ / \ ---- < \,
www.horde.net/ __(_)/_(_)________/ \_______(_) /_(_)__
--- ./debian/pre-checksetup.d/50patchtemplatefordebian~ 2010-11-15 03:47:40.000000000 -0500
+++ ./debian/pre-checksetup.d/50patchtemplatefordebian 2011-04-09 11:19:05.000000000 -0400
@@ -12,10 +12,10 @@
debian_webpath="[% Locations('debian_webpath') %]"
for f in `find "$BUGZILLA_TEMPLATEDIR" -type f -name "*.tmpl" 2>/dev/null`; do
- if ! grep -q " Locations('debian_webpath') " "$f" && grep -q "=\"skins/\|\[% \"skins/\|\[% style_url[\.[:space:]]\|\[% javascript_url\|\[% atomlink\|\[% Param('urlbase') " "$f"; then
+ if ! grep -q " Locations('debian_webpath') " "$f" && grep -q "=\"skins/\|\[% \"skins/\|\[% style_url[\.[:space:]]\|=\"\[% javascript_url\|\[% atomlink\|\[% Param('urlbase') " "$f"; then
sed -e "s,\[% Param('urlbase') %\]bugzilla.dtd,${debian_webpath}bugzilla.dtd,g" \
-e "s,\(.\+\)\(\[% style_url[\.[:space:]]\),\1${debian_webpath}\2,g" \
- -e "s,\(\[% javascript_url\),${debian_webpath}\1,g" \
+ -e "s,\(=\"\[% javascript_url\),${debian_webpath}\1,g" \
-e "s,=\"skins/,=\"${debian_webpath}skins/,g" \
-e "s,\[% \"skins,${debian_webpath}[% \"skins,g" \
-e "s,\(\[% atomlink\),${debian_webpath}\1,g" \
