From bac59cece66e97900554fdee394e8f86027a7d25 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 11 Jun 2014 01:29:00 -0400 Subject: Fix build with wai 0.3.0. This version of wai changed the type of Middleware, so I cannot seem to liftIO inside it. So, got rid of a lot of not really needed complexity to use System.Log.Logger's logging stuff, and just use the standard wai stdout logger when debug logging is enabled. Format may change some, and it logs http to stdout instead of stderr now. Doesn't matter for the webapp since both go to the same log anyway. --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index fb3f0fd1f..c4205ac12 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ git-annex (5.20140607) UNRELEASED; urgency=medium * Avoid bad commits after interrupted direct mode sync (or merge). * Windows: Fix opening webapp when repository is in a directory with spaces in the path. + * Fix build with wai 0.3.0. -- Joey Hess Mon, 09 Jun 2014 14:44:09 -0400 diff --git a/debian/control b/debian/control index 7f31cf937..e37f7d05e 100644 --- a/debian/control +++ b/debian/control @@ -40,7 +40,7 @@ Build-Depends: libghc-warp-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc sparc], libghc-warp-tls-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc sparc], libghc-wai-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc sparc], - libghc-wai-logger-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc sparc], + libghc-wai-extra-dev [i386 amd64 kfreebsd-i386 kfreebsd-amd64 powerpc sparc], libghc-securemem-dev, libghc-byteable-dev, libghc-dns-dev, -- cgit v1.2.3