diff -up happstack-server-7.0.0/happstack-server.cabal.2-blaze~ happstack-server-7.0.0/happstack-server.cabal
--- happstack-server-7.0.0/happstack-server.cabal.2-blaze~ 2012-11-10 13:04:14.796470433 +0900
+++ happstack-server-7.0.0/happstack-server.cabal 2012-11-10 13:10:44.152465822 +0900
@@ -78,7 +78,7 @@ Library
Paths_happstack_server
Build-Depends: base,
- blaze-html >= 0.3 && < 0.5,
+ blaze-html >= 0.3 && < 0.6, blaze-markup,
base64-bytestring == 0.1.*,
bytestring,
containers,
@@ -88,7 +88,7 @@ Library
hslogger >= 1.0.2,
html,
monad-control >= 0.3 && < 0.4,
- mtl >= 2 && < 2.1,
+ mtl >= 2 && < 2.2,
old-locale,
old-time,
parsec < 4,
@@ -97,7 +97,7 @@ Library
template-haskell,
text >= 0.10 && < 0.12,
time,
- transformers >= 0.1.3 && < 0.3,
+ transformers >= 0.1.3 && < 0.4,
transformers-base >= 0.4 && < 0.5,
utf8-string >= 0.3.4 && < 0.4,
xhtml,
diff -up happstack-server-7.0.0/src/Happstack/Server/Response.hs.2-blaze~ happstack-server-7.0.0/src/Happstack/Server/Response.hs
--- happstack-server-7.0.0/src/Happstack/Server/Response.hs.2-blaze~ 2012-03-30 01:00:41.000000000 +0900
+++ happstack-server-7.0.0/src/Happstack/Server/Response.hs 2012-11-10 13:04:14.798470428 +0900
@@ -39,7 +39,7 @@ import Happstack.Server.Types
import Happstack.Server.SURI (ToSURI)
import System.Locale (defaultTimeLocale)
import System.Time (CalendarTime, formatCalendarTime)
-import qualified Text.Blaze as Blaze
+import qualified Text.Blaze.Html as Blaze
import qualified Text.Blaze.Renderer.Utf8 as Blaze
import Text.Html (Html, renderHtml)
import qualified Text.XHtml as XHtml (Html, renderHtml)