haskell-adjunctions: New upstream version 4.0.3.

4 files changed, 25 insertions, 41 deletions

diff --git a/p/haskell-adjunctions/debian/changelog b/p/haskell-adjunctions/debian/changelog
index cfd4d2304..880508733 100644
--- a/p/haskell-adjunctions/debian/changelog
+++ b/p/haskell-adjunctions/debian/changelog
@@ -1,3 +1,9 @@
+haskell-adjunctions (4.0.3-1) unstable; urgency=medium
+
+  * New upstream version.
+
+ -- Clint Adams <clint@debian.org>  Tue, 22 Apr 2014 14:26:15 -0400
+
 haskell-adjunctions (3.2.1.1-1) unstable; urgency=low
 
   [ Joachim Breitner ]
diff --git a/p/haskell-adjunctions/debian/control b/p/haskell-adjunctions/debian/control
index 6cb5254d1..fd50332a0 100644
--- a/p/haskell-adjunctions/debian/control
+++ b/p/haskell-adjunctions/debian/control
@@ -3,27 +3,32 @@ Section: haskell
 Priority: extra
 Maintainer: Debian Haskell Group <pkg-haskell-maintainers@lists.alioth.debian.org>
 Uploaders: Iulian Udrea <iulian@linux.com>
-DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 9),
-               cdbs,
-               haskell-devscripts (>= 0.8.15),
-               ghc,
-               ghc-prof,
-               libghc-comonad-dev (>= 3),
+Build-Depends: debhelper (>= 9)
+  , cdbs
+  , haskell-devscripts (>= 0.8.15)
+  , ghc
+  , ghc-prof,
+               libghc-comonad-dev (>= 4),
                libghc-comonad-dev (<< 5),
                libghc-comonad-prof,
-               libghc-contravariant-dev (>= 0.2.0.1),
+               libghc-contravariant-dev (>= 0.4.1),
                libghc-contravariant-dev (<< 1),
                libghc-contravariant-prof,
-               libghc-distributive-dev (>= 0.2.2),
+               libghc-distributive-dev (>= 0.4),
                libghc-distributive-dev (<< 1),
                libghc-distributive-prof,
                libghc-mtl-dev (>= 2.0.1),
                libghc-mtl-dev (<< 2.2),
                libghc-mtl-prof,
-               libghc-semigroupoids-dev (>= 3),
+               libghc-semigroupoids-dev (>= 4),
                libghc-semigroupoids-dev (<< 5),
                libghc-semigroupoids-prof,
+               libghc-semigroups-dev (>= 0.11),
+               libghc-semigroups-dev (<< 1),
+               libghc-semigroups-prof,
+               libghc-tagged-dev (>= 0.7),
+               libghc-tagged-dev (<< 1),
+               libghc-tagged-prof,
                libghc-transformers-dev (>= 0.2),
                libghc-transformers-dev (<< 0.4),
                libghc-transformers-prof,
@@ -36,7 +41,7 @@ Build-Depends: debhelper (>= 9),
                libghc-representable-functors-dev (>= 3.1),
                libghc-representable-functors-dev (<< 4),
                libghc-representable-functors-prof,
-               libghc-free-dev (>= 3),
+               libghc-free-dev (>= 4),
                libghc-free-dev (<< 5),
                libghc-free-prof
 Build-Depends-Indep: ghc-doc,
@@ -45,12 +50,14 @@ Build-Depends-Indep: ghc-doc,
                      libghc-distributive-doc,
                      libghc-mtl-doc,
                      libghc-semigroupoids-doc,
+                     libghc-semigroups-doc,
+                     libghc-tagged-doc,
                      libghc-transformers-doc,
                      libghc-keys-doc,
                      libghc-void-doc,
                      libghc-representable-functors-doc,
                      libghc-free-doc
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 Homepage: http://hackage.haskell.org/package/adjunctions
 Vcs-Darcs: http://darcs.debian.org/pkg-haskell/haskell-adjunctions
 Vcs-Browser: http://darcs.debian.org/cgi-bin/darcsweb.cgi?r=pkg-haskell/haskell-adjunctions
diff --git a/p/haskell-adjunctions/debian/patches/new-comonad-semigroupoids-free.patch b/p/haskell-adjunctions/debian/patches/new-comonad-semigroupoids-free.patch
deleted file mode 100644
index d5eb953fd..000000000
--- a/p/haskell-adjunctions/debian/patches/new-comonad-semigroupoids-free.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Description: Allow new comonad, semigroupoids, and free
-Author: Colin Watson <cjwatson@debian.org>
-Forwarded: no
-Last-Update: 2013-12-29
-
-Index: b/adjunctions.cabal
-===================================================================
---- a/adjunctions.cabal
-+++ b/adjunctions.cabal
-@@ -45,15 +45,14 @@
-     transformers           >= 0.2     && < 0.4,
-     mtl                    >= 2.0.1   && < 2.2,
-     containers             >= 0.3     && < 0.6,
--    comonad                >= 3       && < 4,
-+    comonad                >= 4       && < 5,
-     contravariant          >= 0.2.0.1 && < 1,
-     distributive           >= 0.2.2   && < 1,
--    semigroupoids          >= 3       && < 4,
-+    semigroupoids          >= 3       && < 5,
-     void                   >= 0.5.5.1 && < 1,
-     keys                   >= 3       && < 4,
--    comonad-transformers   >= 3       && < 4,
-     representable-functors >= 3.1     && < 4,
--    free                   >= 3       && < 4
-+    free                   >= 3       && < 5
-
-   exposed-modules:
-     Data.Functor.Adjunction
diff --git a/p/haskell-adjunctions/debian/patches/series b/p/haskell-adjunctions/debian/patches/series
deleted file mode 100644
index 7dc144504..000000000
--- a/p/haskell-adjunctions/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-new-comonad-semigroupoids-free.patch