diff -Nru haskell-mtl-2.1.1/Control/Monad/Error/Class.hs haskell-mtl-2.1.2/Control/Monad/Error/Class.hs --- haskell-mtl-2.1.1/Control/Monad/Error/Class.hs 2012-04-23 14:05:50.000000000 +0000 +++ haskell-mtl-2.1.2/Control/Monad/Error/Class.hs 2012-06-23 03:10:36.000000000 +0000 @@ -5,6 +5,7 @@ Copyright : (c) Michael Weber 2001, (c) Jeff Newbern 2003-2006, (c) Andriy Palamarchuk 2006 + (c) Edward Kmett 2012 License : BSD-style (see the file LICENSE) Maintainer : libraries@haskell.org @@ -52,10 +53,11 @@ import Control.Monad.Trans.Writer.Strict as StrictWriter import Control.Monad.Trans.Class (lift) -import Control.Exception (IOException) +import Control.Exception (IOException, catch, ioError) import Control.Monad import Control.Monad.Instances () import Data.Monoid +import Prelude (Either(..), (.), IO) {- | The strategy of combining computations that can throw exceptions diff -Nru haskell-mtl-2.1.1/debian/changelog haskell-mtl-2.1.2/debian/changelog --- haskell-mtl-2.1.1/debian/changelog 2013-06-07 09:37:08.000000000 +0000 +++ haskell-mtl-2.1.2/debian/changelog 2013-06-07 21:27:53.000000000 +0000 @@ -1,14 +1,39 @@ -haskell-mtl (2.1.1-1~ppa2) precise; urgency=low +haskell-mtl (2.1.2-4~ppa1) precise; urgency=low + * Backport from Debian unstable * Build-depend on ghc 7.6 - -- Francois Marier Fri, 07 Jun 2013 21:36:57 +1200 + -- Francois Marier Sat, 08 Jun 2013 09:27:33 +1200 -haskell-mtl (2.1.1-1~ppa1) precise; urgency=low +haskell-mtl (2.1.2-4) unstable; urgency=low - * Backport from Debian unstable + * Fix Vcs-Darcs url: http://darcs.debian.org/ instead of + http://darcs.debian.org/darcs/ + * Move Haskell blurb to the end of the description, reduces the impact + of #708703 + + -- Joachim Breitner Sat, 25 May 2013 23:52:32 +0200 + +haskell-mtl (2.1.2-3) unstable; urgency=low + + * Enable compat level 9 + * Use substvars for Haskell description blurbs + + -- Joachim Breitner Fri, 24 May 2013 12:51:28 +0200 + +haskell-mtl (2.1.2-2) experimental; urgency=low + + * Bump standards version, no change + + -- Joachim Breitner Sun, 14 Oct 2012 12:01:35 +0200 + +haskell-mtl (2.1.2-1) experimental; urgency=low + + * New upstream release + * Depend on haskell-devscripts (>= 0.8.13), to ensure it is built + against experimental - -- Francois Marier Sun, 21 Apr 2013 23:10:17 +1200 + -- Joachim Breitner Mon, 08 Oct 2012 23:26:05 +0200 haskell-mtl (2.1.1-1) unstable; urgency=low diff -Nru haskell-mtl-2.1.1/debian/compat haskell-mtl-2.1.2/debian/compat --- haskell-mtl-2.1.1/debian/compat 2012-05-25 07:41:17.000000000 +0000 +++ haskell-mtl-2.1.2/debian/compat 2013-05-24 07:54:23.000000000 +0000 @@ -1 +1 @@ -7 +9 diff -Nru haskell-mtl-2.1.1/debian/control haskell-mtl-2.1.2/debian/control --- haskell-mtl-2.1.1/debian/control 2013-06-07 09:37:21.000000000 +0000 +++ haskell-mtl-2.1.2/debian/control 2013-06-07 21:27:10.000000000 +0000 @@ -3,10 +3,10 @@ Priority: extra Maintainer: Debian Haskell Group Uploaders: Joachim Breitner -Standards-Version: 3.9.1 +Standards-Version: 3.9.4 Build-Depends: - debhelper (>= 7), - haskell-devscripts (>= 0.7), + debhelper (>= 9), + haskell-devscripts (>= 0.8.15), ghc (>= 7.6), ghc-doc, ghc-prof, @@ -16,7 +16,7 @@ libghc-transformers-doc, cdbs Homepage: http://hackage.haskell.org/package/mtl -Vcs-Darcs: http://darcs.debian.org/darcs/pkg-haskell/haskell-mtl +Vcs-Darcs: http://darcs.debian.org/pkg-haskell/haskell-mtl Vcs-Browser: http://darcs.debian.org/cgi-bin/darcsweb.cgi?r=pkg-haskell/haskell-mtl Package: libghc-mtl-dev @@ -28,14 +28,13 @@ Suggests: ${haskell:Suggests} Recommends: ${haskell:Recommends} Provides: ${haskell:Provides} -Description: Haskell monad transformer library for GHC - This package provides a library for the Haskell programming language. - See http://www.haskell.org/ for more information on Haskell. - . +Description: Haskell monad transformer library for GHC${haskell:ShortBlurb} MTL is a monad transformer library, inspired by the paper "Functional Programming with Overloading and Higher-Order Polymorphism", by Mark P Jones (), Advanced School of Functional Programming, 1995. + . + ${haskell:Blurb} Package: libghc-mtl-prof Architecture: any @@ -45,15 +44,13 @@ Suggests: ${haskell:Suggests} Recommends: ${haskell:Recommends} Provides: ${haskell:Provides} -Description: Haskell monad transformer library for GHC; profiling libraries - This package provides a library for the Haskell programming language, - compiled for profiling. - See http://www.haskell.org/ for more information on Haskell. - . +Description: Haskell monad transformer library for GHC${haskell:ShortBlurb} MTL is a monad transformer library, inspired by the paper "Functional Programming with Overloading and Higher-Order Polymorphism", by Mark P Jones (), Advanced School of Functional Programming, 1995. + . + ${haskell:Blurb} Package: libghc-mtl-doc Section: doc @@ -61,12 +58,10 @@ Depends: ${haskell:Depends}, ${misc:Depends} Suggests: ${haskell:Suggests} Recommends: ${haskell:Recommends} -Description: Haskell monad transformer library for GHC; documentation - This package provides the documentation for a library for the Haskell - programming language. - See http://www.haskell.org/ for more information on Haskell. - . +Description: Haskell monad transformer library for GHC${haskell:ShortBlurb} MTL is a monad transformer library, inspired by the paper "Functional Programming with Overloading and Higher-Order Polymorphism", by Mark P Jones (), Advanced School of Functional Programming, 1995. + . + ${haskell:Blurb} diff -Nru haskell-mtl-2.1.1/mtl.cabal haskell-mtl-2.1.2/mtl.cabal --- haskell-mtl-2.1.1/mtl.cabal 2012-04-23 14:05:50.000000000 +0000 +++ haskell-mtl-2.1.2/mtl.cabal 2012-06-23 03:10:36.000000000 +0000 @@ -1,5 +1,5 @@ name: mtl -version: 2.1.1 +version: 2.1.2 cabal-version: >= 1.6 license: BSD3 license-file: LICENSE @@ -7,6 +7,8 @@ maintainer: Edward Kmett category: Control synopsis: Monad classes, using functional dependencies +homepage: http://github.com/ekmett/mtl +bug-reports: http://github.com/ekmett/mtl/issues description: Monad classes using functional dependencies, with instances for various monad transformers, inspired by the paper