Sun Apr 20 14:45:56 UTC 2014 Clint Adams <clint at debian.org>
* New upstream version 0.4.3.1.
M ./changelog +7
M ./control -1 +6
R ./patches/0001-fix-build-on-armel.patch
A ./patches/doctest-pathfix.diff
M ./patches/no-transformers-compat.diff -3 +3
M ./patches/series -1 +1
M ./rules +2
Sun Apr 20 14:45:56 UTC 2014 Clint Adams <clint at debian.org>
* New upstream version 0.4.3.1.
diff -rN -u old-haskell-distributive/changelog new-haskell-distributive/changelog
--- old-haskell-distributive/changelog 2014-04-20 14:46:23.923987893 +0000
+++ new-haskell-distributive/changelog 2014-04-20 14:46:23.927987893 +0000
@@ -1,3 +1,10 @@
+haskell-distributive (0.4.3.1-1) unstable; urgency=medium
+
+ * New upstream version.
+ * Enable testsuite.
+
+ -- Clint Adams <clint at debian.org> Sun, 20 Apr 2014 10:31:33 -0400
+
haskell-distributive (0.3-3) unstable; urgency=low
* Adjust watch file to new hackage layout
diff -rN -u old-haskell-distributive/control new-haskell-distributive/control
--- old-haskell-distributive/control 2014-04-20 14:46:23.923987893 +0000
+++ new-haskell-distributive/control 2014-04-20 14:46:23.927987893 +0000
@@ -8,12 +8,17 @@
, haskell-devscripts (>= 0.8.15)
, ghc
, ghc-prof
+ , libghc-tagged-dev (>> 0.7)
+ , libghc-tagged-dev (<< 1)
+ , libghc-tagged-prof
, libghc-transformers-dev (>> 0.3)
, libghc-transformers-dev (<< 0.4)
, libghc-transformers-prof
+ , libghc-doctest-dev
Build-Depends-Indep: ghc-doc
+ , libghc-tagged-doc
, libghc-transformers-doc
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
Homepage: http://hackage.haskell.org/package/distributive
Vcs-Darcs: http://darcs.debian.org/pkg-haskell/haskell-distributive
Vcs-Browser: http://darcs.debian.org/cgi-bin/darcsweb.cgi?r=pkg-haskell/haskell-distributive
diff -rN -u old-haskell-distributive/patches/0001-fix-build-on-armel.patch new-haskell-distributive/patches/0001-fix-build-on-armel.patch
--- old-haskell-distributive/patches/0001-fix-build-on-armel.patch 2014-04-20 14:46:23.923987893 +0000
+++ new-haskell-distributive/patches/0001-fix-build-on-armel.patch 1970-01-01 00:00:00.000000000 +0000
@@ -1,48 +0,0 @@
-From ef79f8fbbff8501b99ff08addfef752176f61117 Mon Sep 17 00:00:00 2001
-From: Joey Hess <joey at kitenet.net>
-Date: Sat, 12 Oct 2013 22:26:45 -0400
-Subject: [PATCH] fix build on armel
-
----
- distributive.cabal | 1 +
- src/Data/Distributive.hs | 4 ++++
- 2 files changed, 5 insertions(+)
-
-diff --git a/distributive.cabal b/distributive.cabal
-index 316962a..562f99a 100644
---- a/distributive.cabal
-+++ b/distributive.cabal
-@@ -37,6 +37,7 @@ library
-
- hs-source-dirs: src
- exposed-modules: Data.Distributive
-+ extensions: CPP
-
- if flag(lib-Werror)
- ghc-options: -Werror
-diff --git a/src/Data/Distributive.hs b/src/Data/Distributive.hs
-index 6f5613d..171ec2f 100644
---- a/src/Data/Distributive.hs
-+++ b/src/Data/Distributive.hs
-@@ -15,6 +15,8 @@ module Data.Distributive
- , comapM
- ) where
-
-+{-# LANGUAGE CPP #-}
-+
- import Control.Applicative
- import Control.Applicative.Backwards
- import Control.Monad (liftM)
-@@ -26,7 +28,9 @@ import Data.Functor.Identity
- import Data.Functor.Product
- import Data.Functor.Reverse
-
-+#ifndef DEBIAN_NO_GHCI
- {-# ANN module "ignore Use section" #-}
-+#endif
-
- -- | This is the categorical dual of 'Traversable'. However, there appears
- -- to be little benefit to allow the distribution via an arbitrary comonad
---
-1.7.10.4
-
diff -rN -u old-haskell-distributive/patches/doctest-pathfix.diff new-haskell-distributive/patches/doctest-pathfix.diff
--- old-haskell-distributive/patches/doctest-pathfix.diff 1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-distributive/patches/doctest-pathfix.diff 2014-04-20 14:46:23.927987893 +0000
@@ -0,0 +1,14 @@
+--- a/tests/doctests.hs
++++ b/tests/doctests.hs
+@@ -11,9 +11,9 @@
+ main :: IO ()
+ main = getSources >>= \sources -> doctest $
+ "-isrc"
+- : "-idist/build/autogen"
++ : "-idist-ghc/build/autogen"
+ : "-optP-include"
+- : "-optPdist/build/autogen/cabal_macros.h"
++ : "-optPdist-ghc/build/autogen/cabal_macros.h"
+ : "-hide-all-packages"
+ : map ("-package="++) deps ++ sources
+
diff -rN -u old-haskell-distributive/patches/no-transformers-compat.diff new-haskell-distributive/patches/no-transformers-compat.diff
--- old-haskell-distributive/patches/no-transformers-compat.diff 2014-04-20 14:46:23.919987893 +0000
+++ new-haskell-distributive/patches/no-transformers-compat.diff 2014-04-20 14:46:23.927987893 +0000
@@ -1,12 +1,12 @@
--- a/distributive.cabal
+++ b/distributive.cabal
-@@ -33,8 +33,7 @@
- library
+@@ -34,8 +34,7 @@
build-depends:
base >= 4 && < 5,
+ tagged >= 0.7 && < 1,
- transformers >= 0.2 && < 0.4,
- transformers-compat >= 0.1 && < 0.2
+ transformers >= 0.3 && < 0.4
hs-source-dirs: src
- exposed-modules: Data.Distributive
+ exposed-modules:
diff -rN -u old-haskell-distributive/patches/series new-haskell-distributive/patches/series
--- old-haskell-distributive/patches/series 2014-04-20 14:46:23.919987893 +0000
+++ new-haskell-distributive/patches/series 2014-04-20 14:46:23.927987893 +0000
@@ -1,2 +1,2 @@
no-transformers-compat.diff
-0001-fix-build-on-armel.patch
+doctest-pathfix.diff
diff -rN -u old-haskell-distributive/rules new-haskell-distributive/rules
--- old-haskell-distributive/rules 2014-04-20 14:46:23.919987893 +0000
+++ new-haskell-distributive/rules 2014-04-20 14:46:23.927987893 +0000
@@ -1,4 +1,6 @@
#!/usr/bin/make -f
+DEB_ENABLE_TESTS = yes
+
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/hlibrary.mk