diff -Nru haskell-active-0.1.0.4/CHANGES haskell-active-0.1.0.9/CHANGES --- haskell-active-0.1.0.4/CHANGES 2013-03-19 18:03:02.000000000 +0000 +++ haskell-active-0.1.0.9/CHANGES 2013-11-02 17:00:54.000000000 +0000 @@ -1,3 +1,23 @@ +0.1.0.9 (2 November 2013) +------------------------- + + * allow array-0.5 + +0.1.0.7 (27 September 2013) +--------------------------- + + * allow semigroups-0.11 + +0.1.0.6 (16 July 2013) +---------------------- + + * bump upper bound to allow semigroupoids-3.1 + +0.1.0.5 (16 July 2013) +---------------------- + + * bump upper bound to allow base-4.7 + 0.1.0.4 (19 March 2013) ----------------------- diff -Nru haskell-active-0.1.0.4/active.cabal haskell-active-0.1.0.9/active.cabal --- haskell-active-0.1.0.4/active.cabal 2013-03-19 18:03:02.000000000 +0000 +++ haskell-active-0.1.0.9/active.cabal 2013-11-02 17:00:54.000000000 +0000 @@ -1,5 +1,5 @@ name: active -version: 0.1.0.4 +version: 0.1.0.9 synopsis: Abstractions for animation description: "Active" abstraction for animated things with finite start and end times. license: BSD3 @@ -19,10 +19,10 @@ library exposed-modules: Data.Active - build-depends: base >= 4.0 && < 4.7, - array >= 0.3 && < 0.5, - semigroups >= 0.1 && < 0.10, - semigroupoids >= 1.2 && < 3.1, + build-depends: base >= 4.0 && < 4.8, + array >= 0.3 && < 0.6, + semigroups >= 0.1 && < 0.12, + semigroupoids >= 1.2 && < 4.1, vector-space >= 0.8 && < 0.9, newtype >= 0.2 && < 0.3 hs-source-dirs: src @@ -31,10 +31,10 @@ test-suite active-tests type: exitcode-stdio-1.0 main-is: active-tests.hs - build-depends: base >= 4.0 && < 4.7, - array >= 0.3 && < 0.5, - semigroups >= 0.1 && < 0.10, - semigroupoids >= 1.2 && < 3.1, + build-depends: base >= 4.0 && < 4.8, + array >= 0.3 && < 0.6, + semigroups >= 0.1 && < 0.12, + semigroupoids >= 1.2 && < 4.1, vector-space >= 0.8 && < 0.9, newtype >= 0.2 && < 0.3, diff -Nru haskell-active-0.1.0.4/debian/changelog haskell-active-0.1.0.9/debian/changelog --- haskell-active-0.1.0.4/debian/changelog 2013-06-12 11:29:12.000000000 +0000 +++ haskell-active-0.1.0.9/debian/changelog 2013-12-28 10:35:27.000000000 +0000 @@ -1,14 +1,30 @@ -haskell-active (0.1.0.4-1build2) saucy; urgency=low +haskell-active (0.1.0.9-1build3) trusty; urgency=medium * Rebuild for new GHC ABIs. - -- Colin Watson Wed, 12 Jun 2013 12:29:12 +0100 + -- Colin Watson Sat, 28 Dec 2013 10:35:27 +0000 -haskell-active (0.1.0.4-1build1) saucy; urgency=low +haskell-active (0.1.0.9-1build2) trusty; urgency=medium * Rebuild for new GHC ABIs. - -- Colin Watson Tue, 11 Jun 2013 15:15:37 +0100 + -- Colin Watson Tue, 24 Dec 2013 02:14:28 +0000 + +haskell-active (0.1.0.9-1build1) trusty; urgency=low + + * Rebuild for new GHC ABIs. + + -- Colin Watson Fri, 29 Nov 2013 13:34:40 +0000 + +haskell-active (0.1.0.9-1) unstable; urgency=low + + [ Joachim Breitner ] + * Adjust watch file to new hackage layout + + [ Clint Adams ] + * New upstream version. + + -- Clint Adams Sat, 09 Nov 2013 11:18:13 -0500 haskell-active (0.1.0.4-1) unstable; urgency=low diff -Nru haskell-active-0.1.0.4/debian/control haskell-active-0.1.0.9/debian/control --- haskell-active-0.1.0.4/debian/control 2013-05-28 09:27:44.000000000 +0000 +++ haskell-active-0.1.0.9/debian/control 2013-11-09 16:19:47.000000000 +0000 @@ -9,10 +9,10 @@ , ghc , ghc-prof , libghc-semigroups-dev (>= 0.1) - , libghc-semigroups-dev (<< 0.10) + , libghc-semigroups-dev (<< 0.12) , libghc-semigroups-prof , libghc-semigroupoids-dev (>= 1.2) - , libghc-semigroupoids-dev (<< 3.1) + , libghc-semigroupoids-dev (<< 4.1) , libghc-semigroupoids-prof , libghc-vector-space-dev (>= 0.8) , libghc-vector-space-dev (<< 0.9) diff -Nru haskell-active-0.1.0.4/debian/watch haskell-active-0.1.0.9/debian/watch --- haskell-active-0.1.0.4/debian/watch 2012-10-13 11:18:03.000000000 +0000 +++ haskell-active-0.1.0.9/debian/watch 2013-11-09 16:17:52.000000000 +0000 @@ -1,5 +1,2 @@ version=3 -opts="downloadurlmangle=s|archive/([\w\d_-]+)/([\d\.]+)/|archive/$1/$2/$1-$2.tar.gz|,\ -filenamemangle=s|(.*)/$|active-$1.tar.gz|" \ - http://hackage.haskell.org/packages/archive/active \ - ([\d\.]*\d)/ +http://hackage.haskell.org/package/active/distro-monitor .*-([0-9\.]+).(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) diff -Nru haskell-active-0.1.0.4/src/Data/Active.hs haskell-active-0.1.0.9/src/Data/Active.hs --- haskell-active-0.1.0.4/src/Data/Active.hs 2013-03-19 18:03:02.000000000 +0000 +++ haskell-active-0.1.0.9/src/Data/Active.hs 2013-11-02 17:00:54.000000000 +0000 @@ -144,6 +144,7 @@ import Data.Monoid (First(..)) import Data.VectorSpace hiding ((<.>)) +import qualified Data.VectorSpace as VS import Data.AffineSpace ------------------------------------------------------------ @@ -157,7 +158,7 @@ -- other numeric types. newtype Time = Time { unTime :: Rational } deriving ( Eq, Ord, Show, Read, Enum, Num, Fractional, Real, RealFrac - , AdditiveGroup, InnerSpace + , AdditiveGroup ) instance Newtype Time Rational where @@ -168,6 +169,9 @@ type Scalar Time = Rational s *^ (Time t) = Time (s * t) +instance InnerSpace Time where + (Time a) <.> (Time b) = a * b + -- | Convert any value of a 'Real' type (including @Int@, @Integer@, -- @Rational@, @Float@, and @Double@) to a 'Time'. toTime :: Real a => a -> Time