[Pkg-haskell-commits] darcs: haskell-dav: new upstream release

[joeyh at debian.org]

Sat Dec  1 21:13:38 UTC 2012  joeyh at debian.org
  * new upstream release
  Ignore-this: d0df502c4aec6f9900568026f5cf02ce

    M ./changelog +6
    M ./patches/unstable-backport -8 +8

Sat Dec  1 21:13:38 UTC 2012  joeyh at debian.org
  * new upstream release
  Ignore-this: d0df502c4aec6f9900568026f5cf02ce
diff -rN -u old-haskell-dav//changelog new-haskell-dav//changelog
--- old-haskell-dav//changelog	2012-12-01 21:14:22.306721551 +0000
+++ new-haskell-dav//changelog	2012-12-01 21:14:22.310720499 +0000
@@ -1,3 +1,9 @@
+haskell-dav (0.3-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Joey Hess <joeyh at debian.org>  Sat, 01 Dec 2012 17:04:35 -0400
+
 haskell-dav (0.2-1) unstable; urgency=low
 
   * New upstream release
diff -rN -u old-haskell-dav//patches/unstable-backport new-haskell-dav//patches/unstable-backport
--- old-haskell-dav//patches/unstable-backport	2012-12-01 21:14:22.298767696 +0000
+++ new-haskell-dav//patches/unstable-backport	2012-12-01 21:14:22.310720499 +0000
@@ -84,22 +84,22 @@
      let hdrtoken = (lookup "Lock-Token" . responseHeaders) lockresp
 @@ -123,21 +122,21 @@ supportsLocking = liftA2 (&&) ("LOCK" `e
  
- getAllProps :: MonadResourceBase m => DAVState m XML.Document
- getAllProps = do
+ getPropsM :: MonadResourceBase m => DAVState m XML.Document
+ getPropsM = do
 -    let ahs = [(hContentType, "application/xml; charset=\"utf-8\"")]
 +    let ahs = [headerContentType "application/xml; charset=\"utf-8\""]
      propresp <- davRequest "PROPFIND" ahs (xmlBody propname)
      return $ (XML.parseLBS_ def . responseBody) propresp
  
- getContent :: MonadResourceBase m => DAVState m (Maybe B.ByteString, BL.ByteString)
- getContent = do
+ getContentM :: MonadResourceBase m => DAVState m (Maybe B.ByteString, BL.ByteString)
+ getContentM = do
      resp <- davRequest "GET" [] emptyBody
 -    let ct = lookup (hContentType) (responseHeaders resp)
 +    let ct = lookup (mk "Content-Type") (responseHeaders resp)
      return $ (ct, responseBody resp)
  
- putContent :: MonadResourceBase m => (Maybe B.ByteString, BL.ByteString) -> DAVState m ()
- putContent (ct, body) = do
+ putContentM :: MonadResourceBase m => (Maybe B.ByteString, BL.ByteString) -> DAVState m ()
+ putContentM (ct, body) = do
      d <- get
      let ahs' = fromMaybe [] (fmap (return . (,) (mk "If") . parenthesize) (d ^. lockToken))
 -    let ahs = ahs' ++ fromMaybe [] (fmap (return . (,) (hContentType)) ct)
@@ -108,8 +108,8 @@
      return ()
  
 @@ -163,7 +162,7 @@ parenthesize x = B.concat ["(", x, ")"]
- putProps :: MonadResourceBase m => XML.Document -> DAVState m ()
- putProps props = do
+ putPropsM :: MonadResourceBase m => XML.Document -> DAVState m ()
+ putPropsM props = do
      d <- get
 -    let ah' = (hContentType, "application/xml; charset=\"utf-8\"")
 +    let ah' = headerContentType "application/xml; charset=\"utf-8\""