diff -Nru haskell-diagrams-core-1.4.1/CHANGELOG.md haskell-diagrams-core-1.4.1.1/CHANGELOG.md --- haskell-diagrams-core-1.4.1/CHANGELOG.md 2018-04-10 19:58:47.000000000 +0000 +++ haskell-diagrams-core-1.4.1.1/CHANGELOG.md 2018-06-18 02:10:34.000000000 +0000 @@ -1,3 +1,7 @@ +## [v1.4.1.1](https://github.com/diagrams/diagrams-core/tree/v1.4.1.1) (2018-06-17) + +* Add some `ConstraintKinds` pragmas to allow compilation on GHC 7.8 and 7.6 + ## [v1.4.1](https://github.com/diagrams/diagrams-core/tree/v1.4.1) (2018-04-10) * Allow `base-4.11` diff -Nru haskell-diagrams-core-1.4.1/debian/changelog haskell-diagrams-core-1.4.1.1/debian/changelog --- haskell-diagrams-core-1.4.1/debian/changelog 2018-07-04 14:15:25.000000000 +0000 +++ haskell-diagrams-core-1.4.1.1/debian/changelog 2018-10-01 10:33:24.000000000 +0000 @@ -1,8 +1,19 @@ -haskell-diagrams-core (1.4.1-1build1) cosmic; urgency=medium +haskell-diagrams-core (1.4.1.1-2) unstable; urgency=medium - * Rebuild against new GHC ABI. + * Remove build dependency on libghc-mtl-dev (provided by ghc-8.4.3) - -- Gianfranco Costamagna Wed, 04 Jul 2018 16:15:25 +0200 + -- Ilias Tsitsimpis Mon, 01 Oct 2018 13:33:24 +0300 + +haskell-diagrams-core (1.4.1.1-1) unstable; urgency=medium + + [ Clint Adams ] + * Set Rules-Requires-Root to no. + + [ Ilias Tsitsimpis ] + * Bump debhelper compat level to 10 + * New upstream release + + -- Ilias Tsitsimpis Sat, 29 Sep 2018 14:49:24 +0300 haskell-diagrams-core (1.4.1-1) unstable; urgency=medium diff -Nru haskell-diagrams-core-1.4.1/debian/compat haskell-diagrams-core-1.4.1.1/debian/compat --- haskell-diagrams-core-1.4.1/debian/compat 2018-04-17 00:01:45.000000000 +0000 +++ haskell-diagrams-core-1.4.1.1/debian/compat 2018-09-29 11:49:24.000000000 +0000 @@ -1 +1 @@ -9 +10 diff -Nru haskell-diagrams-core-1.4.1/debian/control haskell-diagrams-core-1.4.1.1/debian/control --- haskell-diagrams-core-1.4.1/debian/control 2018-04-17 00:01:45.000000000 +0000 +++ haskell-diagrams-core-1.4.1.1/debian/control 2018-10-01 10:33:24.000000000 +0000 @@ -4,10 +4,11 @@ Joachim Breitner , Priority: optional Section: haskell +Rules-Requires-Root: no Build-Depends: cdbs, - debhelper (>= 9), - ghc (>= 8), + debhelper (>= 10), + ghc (>= 8.4.3), ghc-prof, haskell-devscripts (>= 0.13), libghc-adjunctions-dev (<< 5.0), @@ -25,11 +26,9 @@ libghc-linear-dev (<< 1.21), libghc-linear-dev (>= 1.11.3), libghc-linear-prof, - libghc-monoid-extras-dev (<< 0.5), libghc-monoid-extras-dev (>= 0.3), + libghc-monoid-extras-dev (<< 0.6), libghc-monoid-extras-prof, - libghc-mtl-dev, - libghc-mtl-prof, libghc-profunctors-dev (>= 5.0), libghc-profunctors-dev (<< 6.0), libghc-profunctors-prof, @@ -48,14 +47,13 @@ libghc-lens-doc, libghc-linear-doc, libghc-monoid-extras-doc, - libghc-mtl-doc, libghc-profunctors-doc, libghc-semigroups-doc, libghc-unordered-containers-doc, Standards-Version: 4.1.4 Homepage: http://projects.haskell.org/diagrams Vcs-Browser: https://salsa.debian.org/haskell-team/DHG_packages/tree/master/p/haskell-diagrams-core -Vcs-Git: https://salsa.debian.org/haskell-team/DHG_packages.git +Vcs-Git: https://salsa.debian.org/haskell-team/DHG_packages.git [p/haskell-diagrams-core] Package: libghc-diagrams-core-dev Architecture: any diff -Nru haskell-diagrams-core-1.4.1/diagrams-core.cabal haskell-diagrams-core-1.4.1.1/diagrams-core.cabal --- haskell-diagrams-core-1.4.1/diagrams-core.cabal 2018-04-10 19:58:47.000000000 +0000 +++ haskell-diagrams-core-1.4.1.1/diagrams-core.cabal 2018-06-18 02:10:34.000000000 +0000 @@ -1,5 +1,5 @@ Name: diagrams-core -Version: 1.4.1 +Version: 1.4.1.1 Synopsis: Core libraries for diagrams EDSL Description: The core modules underlying diagrams, an embedded domain-specific language @@ -12,7 +12,7 @@ Bug-reports: https://github.com/diagrams/diagrams-core/issues Category: Graphics Build-type: Simple -Cabal-version: >=1.18 +Cabal-version: 1.18 Extra-source-files: CHANGELOG.md, README.markdown, diagrams/*.svg extra-doc-files: diagrams/*.svg Tested-with: GHC == 7.8.4, GHC == 7.10.2, GHC == 8.0.1, GHC == 8.2.2, GHC == 8.4.1 @@ -40,7 +40,7 @@ containers >= 0.4.2 && < 0.6, unordered-containers >= 0.2 && < 0.3, semigroups >= 0.8.4 && < 0.19, - monoid-extras >= 0.3 && < 0.5, + monoid-extras >= 0.3 && < 0.6, dual-tree >= 0.2 && < 0.3, lens >= 4.0 && < 4.17, linear >= 1.11.3 && < 1.21, diff -Nru haskell-diagrams-core-1.4.1/src/Diagrams/Core/Compile.hs haskell-diagrams-core-1.4.1.1/src/Diagrams/Core/Compile.hs --- haskell-diagrams-core-1.4.1/src/Diagrams/Core/Compile.hs 2018-04-10 19:58:47.000000000 +0000 +++ haskell-diagrams-core-1.4.1.1/src/Diagrams/Core/Compile.hs 2018-06-18 02:10:34.000000000 +0000 @@ -1,8 +1,10 @@ +{-# LANGUAGE ConstraintKinds #-} {-# LANGUAGE CPP #-} {-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE MonoLocalBinds #-} {-# LANGUAGE MultiParamTypeClasses #-} {-# LANGUAGE ScopedTypeVariables #-} +{-# LANGUAGE TypeFamilies #-} {-# LANGUAGE TypeOperators #-} ----------------------------------------------------------------------------- diff -Nru haskell-diagrams-core-1.4.1/src/Diagrams/Core/Envelope.hs haskell-diagrams-core-1.4.1.1/src/Diagrams/Core/Envelope.hs --- haskell-diagrams-core-1.4.1/src/Diagrams/Core/Envelope.hs 2018-04-10 19:58:47.000000000 +0000 +++ haskell-diagrams-core-1.4.1.1/src/Diagrams/Core/Envelope.hs 2018-06-18 02:10:34.000000000 +0000 @@ -1,4 +1,5 @@ {-# LANGUAGE CPP #-} +{-# LANGUAGE ConstraintKinds #-} {-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE FlexibleInstances #-} {-# LANGUAGE GeneralizedNewtypeDeriving #-} @@ -255,10 +256,9 @@ -- | When dealing with envelopes we often want scalars to be an -- ordered field (i.e. support all four arithmetic operations and be --- totally ordered) so we introduce this class as a convenient +-- totally ordered) so we introduce this constraint as a convenient -- shorthand. -class (Floating s, Ord s) => OrderedField s -instance (Floating s, Ord s) => OrderedField s +type OrderedField s = (Floating s, Ord s) -- | @Enveloped@ abstracts over things which have an envelope. class (Metric (V a), OrderedField (N a)) => Enveloped a where diff -Nru haskell-diagrams-core-1.4.1/src/Diagrams/Core/HasOrigin.hs haskell-diagrams-core-1.4.1.1/src/Diagrams/Core/HasOrigin.hs --- haskell-diagrams-core-1.4.1/src/Diagrams/Core/HasOrigin.hs 2018-04-10 19:58:47.000000000 +0000 +++ haskell-diagrams-core-1.4.1.1/src/Diagrams/Core/HasOrigin.hs 2018-06-18 02:10:34.000000000 +0000 @@ -1,3 +1,4 @@ +{-# LANGUAGE ConstraintKinds #-} {-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE FlexibleInstances #-} {-# LANGUAGE MultiParamTypeClasses #-} diff -Nru haskell-diagrams-core-1.4.1/src/Diagrams/Core/Juxtapose.hs haskell-diagrams-core-1.4.1.1/src/Diagrams/Core/Juxtapose.hs --- haskell-diagrams-core-1.4.1/src/Diagrams/Core/Juxtapose.hs 2018-04-10 19:58:47.000000000 +0000 +++ haskell-diagrams-core-1.4.1.1/src/Diagrams/Core/Juxtapose.hs 2018-06-18 02:10:34.000000000 +0000 @@ -1,3 +1,4 @@ +{-# LANGUAGE ConstraintKinds #-} {-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE FlexibleInstances #-} {-# LANGUAGE MultiParamTypeClasses #-} diff -Nru haskell-diagrams-core-1.4.1/src/Diagrams/Core/Trace.hs haskell-diagrams-core-1.4.1.1/src/Diagrams/Core/Trace.hs --- haskell-diagrams-core-1.4.1/src/Diagrams/Core/Trace.hs 2018-04-10 19:58:47.000000000 +0000 +++ haskell-diagrams-core-1.4.1.1/src/Diagrams/Core/Trace.hs 2018-06-18 02:10:34.000000000 +0000 @@ -1,3 +1,4 @@ +{-# LANGUAGE ConstraintKinds #-} {-# LANGUAGE CPP #-} {-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE FlexibleInstances #-} diff -Nru haskell-diagrams-core-1.4.1/src/Diagrams/Core/Transform.hs haskell-diagrams-core-1.4.1.1/src/Diagrams/Core/Transform.hs --- haskell-diagrams-core-1.4.1/src/Diagrams/Core/Transform.hs 2018-04-10 19:58:47.000000000 +0000 +++ haskell-diagrams-core-1.4.1.1/src/Diagrams/Core/Transform.hs 2018-06-18 02:10:34.000000000 +0000 @@ -1,3 +1,4 @@ +{-# LANGUAGE ConstraintKinds #-} {-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE FlexibleInstances #-} {-# LANGUAGE GeneralizedNewtypeDeriving #-} @@ -308,14 +309,12 @@ -- The Transformable class ------------------------------- ------------------------------------------------------------ --- | 'HasLinearMap' is a poor man's class constraint synonym, just to +-- | 'HasLinearMap' is a constraint synonym, just to -- help shorten some of the ridiculously long constraint sets. -class (HasBasis v, Traversable v) => HasLinearMap v -instance (HasBasis v, Traversable v) => HasLinearMap v +type HasLinearMap v = (HasBasis v, Traversable v) -- | An 'Additive' vector space whose representation is made up of basis elements. -class (Additive v, Representable v, Rep v ~ E v) => HasBasis v -instance (Additive v, Representable v, Rep v ~ E v) => HasBasis v +type HasBasis v = (Additive v, Representable v, Rep v ~ E v) -- | Type class for things @t@ which can be transformed. class Transformable t where diff -Nru haskell-diagrams-core-1.4.1/src/Diagrams/Core/Types.hs haskell-diagrams-core-1.4.1.1/src/Diagrams/Core/Types.hs --- haskell-diagrams-core-1.4.1/src/Diagrams/Core/Types.hs 2018-04-10 19:58:47.000000000 +0000 +++ haskell-diagrams-core-1.4.1.1/src/Diagrams/Core/Types.hs 2018-06-18 02:10:34.000000000 +0000 @@ -1,3 +1,4 @@ +{-# LANGUAGE ConstraintKinds #-} {-# LANGUAGE CPP #-} {-# LANGUAGE DeriveDataTypeable #-} {-# LANGUAGE DeriveFunctor #-} @@ -168,11 +169,10 @@ -- XXX TODO: add lots of actual diagrams to illustrate the -- documentation! Haddock supports \<\\>. --- | Class of numbers that are 'RealFloat' and 'Typeable'. This class is used to --- shorten type constraints. -class (Typeable n, RealFloat n) => TypeableFloat n -instance (Typeable n, RealFloat n) => TypeableFloat n --- use class instead of type constraint so users don't need constraint kinds pragma +-- | Constraint for numeric types that are 'RealFloat' and 'Typeable', +-- which often occur together. This is used to shorten shorten type +-- constraint contexts. +type TypeableFloat n = (Typeable n, RealFloat n) ------------------------------------------------------------ -- Diagrams ---------------------------------------------- diff -Nru haskell-diagrams-core-1.4.1/src/Diagrams/Core/V.hs haskell-diagrams-core-1.4.1.1/src/Diagrams/Core/V.hs --- haskell-diagrams-core-1.4.1/src/Diagrams/Core/V.hs 2018-04-10 19:58:47.000000000 +0000 +++ haskell-diagrams-core-1.4.1.1/src/Diagrams/Core/V.hs 2018-06-18 02:10:34.000000000 +0000 @@ -1,3 +1,4 @@ +{-# LANGUAGE ConstraintKinds #-} {-# LANGUAGE FlexibleInstances #-} {-# LANGUAGE MultiParamTypeClasses #-} {-# LANGUAGE TypeFamilies #-} @@ -77,11 +78,9 @@ -- | @InSpace v n a@ means the type @a@ belongs to the vector space @v n@, -- where @v@ is 'Additive' and @n@ is a 'Num'. -class (V a ~ v, N a ~ n, Additive v, Num n) => InSpace v n a -instance (V a ~ v, N a ~ n, Additive v, Num n) => InSpace v n a +type InSpace v n a = (V a ~ v, N a ~ n, Additive v, Num n) -- | @SameSpace a b@ means the types @a@ and @b@ belong to the same -- vector space @v n@. -class (V a ~ V b, N a ~ N b) => SameSpace a b -instance (V a ~ V b, N a ~ N b) => SameSpace a b +type SameSpace a b = (V a ~ V b, N a ~ N b)