[Pkg-haskell-commits] darcs: haskell-network-protocol-xmpp: New upstream version 0.4.2.

[Clint Adams]

Fri May 18 02:57:28 UTC 2012  Clint Adams <clint at debian.org>
  * New upstream version 0.4.2.
  Ignore-this: d5aef68a2834eb4a6a7fa46e63de35a

    M ./changelog +6
    M ./control -1
    R ./patches/binding-shadows-existing-binding.diff
    R ./patches/qualified-name-in-binding-position.diff
    R ./patches/series

Fri May 18 02:57:28 UTC 2012  Clint Adams <clint at debian.org>
  * New upstream version 0.4.2.
  Ignore-this: d5aef68a2834eb4a6a7fa46e63de35a
diff -rN -u old-haskell-network-protocol-xmpp//changelog new-haskell-network-protocol-xmpp//changelog
--- old-haskell-network-protocol-xmpp//changelog	2012-05-18 02:57:17.932963727 +0000
+++ new-haskell-network-protocol-xmpp//changelog	2012-05-18 02:57:17.932963727 +0000
@@ -1,3 +1,9 @@
+haskell-network-protocol-xmpp (0.4.2-1) unstable; urgency=low
+
+  * New upstream version.
+
+ -- Clint Adams <clint at debian.org>  Thu, 17 May 2012 22:51:36 -0400
+
 haskell-network-protocol-xmpp (0.4-1) unstable; urgency=low
 
   * Initial release.
diff -rN -u old-haskell-network-protocol-xmpp//control new-haskell-network-protocol-xmpp//control
--- old-haskell-network-protocol-xmpp//control	2012-05-18 02:57:17.932963727 +0000
+++ new-haskell-network-protocol-xmpp//control	2012-05-18 02:57:17.932963727 +0000
@@ -30,7 +30,6 @@
  , libghc-text-dev (<< 0.12)
  , libghc-text-prof
  , libghc-transformers-dev (>> 0.2)
- , libghc-transformers-dev (<< 0.3)
  , libghc-transformers-prof
  , libghc-xml-types-dev (>> 0.3)
  , libghc-xml-types-dev (<< 0.4)
diff -rN -u old-haskell-network-protocol-xmpp//patches/binding-shadows-existing-binding.diff new-haskell-network-protocol-xmpp//patches/binding-shadows-existing-binding.diff
--- old-haskell-network-protocol-xmpp//patches/binding-shadows-existing-binding.diff	2012-05-18 02:57:17.932963727 +0000
+++ new-haskell-network-protocol-xmpp//patches/binding-shadows-existing-binding.diff	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
---- a/Network/Protocol/XMPP/Stanza.hs
-+++ b/Network/Protocol/XMPP/Stanza.hs
-@@ -252,7 +252,7 @@
- parseIQ :: X.Element -> Maybe IQ
- parseIQ elemt = do
- 	typeStr <- X.attributeText "type" elemt
--	iqType <- case typeStr of
-+	iqT <- case typeStr of
- 		"get"    -> Just IQGet
- 		"set"    -> Just IQSet
- 		"result" -> Just IQResult
-@@ -266,7 +266,7 @@
- 	let payload = case X.elementChildren elemt of
- 		[] -> Nothing
- 		child:_ -> Just child
--	return (IQ iqType msgTo msgFrom msgID msgLang payload)
-+	return (IQ iqT msgTo msgFrom msgID msgLang payload)
- 
- xmlJID :: X.Name -> X.Element -> Maybe (Maybe JID)
- xmlJID name elemt = case X.attributeText name elemt of
diff -rN -u old-haskell-network-protocol-xmpp//patches/qualified-name-in-binding-position.diff new-haskell-network-protocol-xmpp//patches/qualified-name-in-binding-position.diff
--- old-haskell-network-protocol-xmpp//patches/qualified-name-in-binding-position.diff	2012-05-18 02:57:17.932963727 +0000
+++ new-haskell-network-protocol-xmpp//patches/qualified-name-in-binding-position.diff	1970-01-01 00:00:00.000000000 +0000
@@ -1,31 +0,0 @@
---- a/Network/Protocol/XMPP/ErrorT.hs
-+++ b/Network/Protocol/XMPP/ErrorT.hs
-@@ -43,7 +43,7 @@
- 			Right r -> runErrorT (k r)
- 
- instance Monad m => E.MonadError (ErrorT e m) where
--	type E.ErrorType (ErrorT e m) = e
-+	type ErrorType (ErrorT e m) = e
- 	throwError = ErrorT . return . Left
- 	catchError m h = ErrorT $ do
- 		x <- runErrorT m
-@@ -55,7 +55,7 @@
- 	lift = ErrorT . liftM Right
- 
- instance R.MonadReader m => R.MonadReader (ErrorT e m) where
--	type R.EnvType (ErrorT e m) = R.EnvType m
-+	type EnvType (ErrorT e m) = R.EnvType m
- 	ask = lift R.ask
- 	local = mapErrorT . R.local
- 
---- a/Network/Protocol/XMPP/Monad.hs
-+++ b/Network/Protocol/XMPP/Monad.hs
-@@ -96,7 +96,7 @@
- 	liftIO = XMPP . liftIO
- 
- instance E.MonadError XMPP where
--	type E.ErrorType XMPP = Error
-+	type ErrorType XMPP = Error
- 	throwError = XMPP . E.throwError
- 	catchError m h = XMPP (E.catchError (unXMPP m) (unXMPP . h))
- 
diff -rN -u old-haskell-network-protocol-xmpp//patches/series new-haskell-network-protocol-xmpp//patches/series
--- old-haskell-network-protocol-xmpp//patches/series	2012-05-18 02:57:17.929021316 +0000
+++ new-haskell-network-protocol-xmpp//patches/series	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-qualified-name-in-binding-position.diff
-binding-shadows-existing-binding.diff