tags 744328 + patch tags 744331 + patch thanks I've prepared an NMU for haskell-notmuch-web (versioned as 0.2.0-5+nmu1). Because of ongoing transitions I haven't uploaded it yet. Feel free to upload at your convenience or ping me when the relevant transitions finish.
d
diff -Nru haskell-notmuch-web-0.2.0/debian/changelog haskell-notmuch-web-0.2.0/debian/changelog --- haskell-notmuch-web-0.2.0/debian/changelog 2014-06-15 15:01:38.000000000 -0300 +++ haskell-notmuch-web-0.2.0/debian/changelog 2014-07-14 07:31:31.000000000 -0300 @@ -1,3 +1,13 @@ +haskell-notmuch-web (0.2.0-5+nmu1) unstable; urgency=medium + + * Non-maintainer upload + * Drop patch config-in-etc, thanks to Rob Browning for reporting the + problem (Closes: #744328). + * Install example configuration in /usr/share/doc/notmuch-web + (Closes: #744331). + + -- David Bremner <[email protected]> Mon, 14 Jul 2014 07:23:12 -0300 + haskell-notmuch-web (0.2.0-5) unstable; urgency=medium * Patch for newer conduit. diff -Nru haskell-notmuch-web-0.2.0/debian/patches/config-in-etc haskell-notmuch-web-0.2.0/debian/patches/config-in-etc --- haskell-notmuch-web-0.2.0/debian/patches/config-in-etc 2014-06-15 15:01:39.000000000 -0300 +++ haskell-notmuch-web-0.2.0/debian/patches/config-in-etc 1969-12-31 20:00:00.000000000 -0400 @@ -1,40 +0,0 @@ ---- a/main.hs -+++ b/main.hs -@@ -27,7 +27,7 @@ - import System.Environment (getArgs) - import System.Exit (exitWith, ExitCode(..)) - import System.IO (hSetEcho, hFlush, stdin, stdout, hPutStrLn, stderr) --import Yesod.Default.Config (fromArgs) -+import Yesod.Default.Config (fromArgsSettings, configSettings, ConfigSettings(csParseExtra, csFile)) - import Yesod.Default.Main (defaultMain) - - genPassword :: IO () -@@ -51,4 +51,7 @@ - a <- getArgs - if "--make-password" `elem` a - then genPassword -- else defaultMain (fromArgs parseExtra) makeApplication -+ else defaultMain etchack makeApplication -+ where -+ etchack = fromArgsSettings $ \env -> return (configSettings env) { csParseExtra = parseExtra -+ , csFile = const (return "/etc/notmuch-web/settings.yml") } ---- a/notmuch-web.cabal -+++ b/notmuch-web.cabal -@@ -146,7 +146,7 @@ - , warp - , xss-sanitize >= 0.3.4 - , yaml -- , yesod >= 1.2 && < 1.3 -+ , yesod >= 1.2.2 && < 1.3 - , yesod-auth - , yesod-static >= 1.2.1 && < 1.3 - else -@@ -194,7 +194,7 @@ - , warp - , xss-sanitize >= 0.3.4 - , yaml -- , yesod >= 1.2 && < 1.3 -+ , yesod >= 1.2.2 && < 1.3 - , yesod-auth - , yesod-static >= 1.2.1 && < 1.3 - diff -Nru haskell-notmuch-web-0.2.0/debian/patches/series haskell-notmuch-web-0.2.0/debian/patches/series --- haskell-notmuch-web-0.2.0/debian/patches/series 2014-06-15 15:01:40.000000000 -0300 +++ haskell-notmuch-web-0.2.0/debian/patches/series 2014-07-13 14:47:48.000000000 -0300 @@ -1,4 +1,3 @@ testsuite-http-code -config-in-etc no-attoparsec-conduit.diff newer-resourcet.diff diff -Nru haskell-notmuch-web-0.2.0/debian/rules haskell-notmuch-web-0.2.0/debian/rules --- haskell-notmuch-web-0.2.0/debian/rules 2014-06-15 15:01:40.000000000 -0300 +++ haskell-notmuch-web-0.2.0/debian/rules 2014-07-14 07:13:27.000000000 -0300 @@ -9,4 +9,5 @@ cp -av debian/tmp-inst-ghc/usr/bin/* debian/notmuch-web/usr/bin install -m 0755 -d debian/notmuch-web/usr/share/doc/notmuch-web install -m 0644 debian/tmp-inst-ghc/usr/share/notmuch-web/README.md debian/notmuch-web/usr/share/doc/notmuch-web - install -m 0644 debian/tmp-inst-ghc/usr/share/notmuch-web/config/* debian/notmuch-web/etc/notmuch-web + install -m 0755 -d debian/notmuch-web/usr/share/doc/notmuch-web/config + install -m 0644 debian/tmp-inst-ghc/usr/share/notmuch-web/config/* debian/notmuch-web/usr/share/doc/notmuch-web/config
