haskell-network-protocol-xmpp: New upstream version 0.4.2.

5 files changed, 6 insertions, 53 deletions

diff --git a/p/haskell-network-protocol-xmpp/debian/changelog b/p/haskell-network-protocol-xmpp/debian/changelog
index ce6a758fb..a245e67d8 100644
--- a/p/haskell-network-protocol-xmpp/debian/changelog
+++ b/p/haskell-network-protocol-xmpp/debian/changelog
@@ -1,3 +1,9 @@
+haskell-network-protocol-xmpp (0.4.2-1) unstable; urgency=low
+
+  * New upstream version.
+
+ -- Clint Adams <clint@debian.org>  Thu, 17 May 2012 22:51:36 -0400
+
 haskell-network-protocol-xmpp (0.4-1) unstable; urgency=low
 
   * Initial release.
diff --git a/p/haskell-network-protocol-xmpp/debian/control b/p/haskell-network-protocol-xmpp/debian/control
index 3c22680f7..f0662f0d7 100644
--- a/p/haskell-network-protocol-xmpp/debian/control
+++ b/p/haskell-network-protocol-xmpp/debian/control
@@ -30,7 +30,6 @@ Build-Depends: debhelper (>= 7.0)
  , 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 --git a/p/haskell-network-protocol-xmpp/debian/patches/binding-shadows-existing-binding.diff b/p/haskell-network-protocol-xmpp/debian/patches/binding-shadows-existing-binding.diff
deleted file mode 100644
index 3da2851e0..000000000
--- a/p/haskell-network-protocol-xmpp/debian/patches/binding-shadows-existing-binding.diff
+++ /dev/null
@@ -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 --git a/p/haskell-network-protocol-xmpp/debian/patches/qualified-name-in-binding-position.diff b/p/haskell-network-protocol-xmpp/debian/patches/qualified-name-in-binding-position.diff
deleted file mode 100644
index 21a6e9bac..000000000
--- a/p/haskell-network-protocol-xmpp/debian/patches/qualified-name-in-binding-position.diff
+++ /dev/null
@@ -1,30 +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 --git a/p/haskell-network-protocol-xmpp/debian/patches/series b/p/haskell-network-protocol-xmpp/debian/patches/series
deleted file mode 100644
index ffb51c439..000000000
--- a/p/haskell-network-protocol-xmpp/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-qualified-name-in-binding-position.diff
-binding-shadows-existing-binding.diff