[Pkg-haskell-commits] darcs: haskell-notmuch-web: Sponsored upload for David Bremner even though he's a DD.

[Clint Adams]

Mon Jul 14 15:13:21 UTC 2014  Clint Adams <clint at debian.org>
  * Sponsored upload for David Bremner even though he's a DD.

    M ./changelog +9
    R ./patches/config-in-etc
    M ./patches/series -1
    M ./rules -1 +2

Mon Jul 14 15:13:21 UTC 2014  Clint Adams <clint at debian.org>
  * Sponsored upload for David Bremner even though he's a DD.
diff -rN -u old-haskell-notmuch-web/changelog new-haskell-notmuch-web/changelog
--- old-haskell-notmuch-web/changelog	2014-07-14 15:13:32.750811912 +0000
+++ new-haskell-notmuch-web/changelog	2014-07-14 15:13:32.754811912 +0000
@@ -1,3 +1,12 @@
+haskell-notmuch-web (0.2.0-6) unstable; urgency=medium
+
+  * 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 <bremner at debian.org>  Mon, 14 Jul 2014 07:23:12 -0300
+
 haskell-notmuch-web (0.2.0-5) unstable; urgency=medium
 
   * Patch for newer conduit.
diff -rN -u old-haskell-notmuch-web/patches/config-in-etc new-haskell-notmuch-web/patches/config-in-etc
--- old-haskell-notmuch-web/patches/config-in-etc	2014-07-14 15:13:32.750811912 +0000
+++ new-haskell-notmuch-web/patches/config-in-etc	1970-01-01 00:00:00.000000000 +0000
@@ -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 -rN -u old-haskell-notmuch-web/patches/series new-haskell-notmuch-web/patches/series
--- old-haskell-notmuch-web/patches/series	2014-07-14 15:13:32.750811912 +0000
+++ new-haskell-notmuch-web/patches/series	2014-07-14 15:13:32.758811911 +0000
@@ -1,4 +1,3 @@
 testsuite-http-code
-config-in-etc
 no-attoparsec-conduit.diff
 newer-resourcet.diff
diff -rN -u old-haskell-notmuch-web/rules new-haskell-notmuch-web/rules
--- old-haskell-notmuch-web/rules	2014-07-14 15:13:32.750811912 +0000
+++ new-haskell-notmuch-web/rules	2014-07-14 15:13:32.758811911 +0000
@@ -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