[Pkg-haskell-commits] darcs: haskell-lens: Enable test suite on architectures with threaded runtime.

[Clint Adams]

Sun Oct  7 14:15:18 UTC 2012  Clint Adams <clint at debian.org>
  * Enable test suite on architectures with threaded runtime.
  Ignore-this: e17e39c6fe91f5c24cbbd9d0c2ff3301

    M ./changelog +6
    M ./control +3
    A ./patches/
    A ./patches/newer-doctest.diff
    A ./patches/series
    M ./rules -1 +1

Sun Oct  7 14:15:18 UTC 2012  Clint Adams <clint at debian.org>
  * Enable test suite on architectures with threaded runtime.
  Ignore-this: e17e39c6fe91f5c24cbbd9d0c2ff3301
diff -rN -u old-haskell-lens//changelog new-haskell-lens//changelog
--- old-haskell-lens//changelog	2012-10-07 14:15:28.491218527 +0000
+++ new-haskell-lens//changelog	2012-10-07 14:15:28.495218230 +0000
@@ -1,3 +1,9 @@
+haskell-lens (2.4.0.2-2) unstable; urgency=low
+
+  * Enable test suite on architectures with threaded runtime.
+
+ -- Clint Adams <clint at debian.org>  Mon, 24 Sep 2012 21:21:31 -0400
+
 haskell-lens (2.4.0.2-1) unstable; urgency=low
 
   * Initial release.
diff -rN -u old-haskell-lens//control new-haskell-lens//control
--- old-haskell-lens//control	2012-10-07 14:15:28.491218527 +0000
+++ new-haskell-lens//control	2012-10-07 14:15:28.495218230 +0000
@@ -21,6 +21,9 @@
              , libghc-transformers-dev (>> 0.3)
              , libghc-transformers-dev (<< 0.4)
              , libghc-transformers-prof
+             , libghc-quickcheck2-dev
+             , libghc-doctest-dev (>> 0.9.1)
+             , libghc-doctest-dev (<< 0.10.1)
 Build-Depends-Indep: ghc-doc
                    , libghc-mtl-doc
                    , libghc-parallel-doc
diff -rN -u old-haskell-lens//patches/newer-doctest.diff new-haskell-lens//patches/newer-doctest.diff
--- old-haskell-lens//patches/newer-doctest.diff	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-lens//patches/newer-doctest.diff	2012-10-07 14:15:28.495218230 +0000
@@ -0,0 +1,22 @@
+--- a/lens.cabal
++++ b/lens.cabal
+@@ -186,7 +186,7 @@
+   build-depends:
+     base == 4.*,
+     directory >= 1.0 && < 1.2,
+-    doctest >= 0.8 && <= 0.9,
++    doctest >= 0.9.1 && <= 0.10,
+     filepath >= 1.3 && < 1.4
+   ghc-options: -Wall -Werror -threaded
+   hs-source-dirs: tests
+--- a/tests/doctests.hs
++++ b/tests/doctests.hs
+@@ -12,7 +12,7 @@
+     "-isrc"
+   : "-idist/build/autogen"
+   : "-optP-include"
+-  : "-optPdist/build/autogen/cabal_macros.h"
++  : "-optPdist-ghc/build/autogen/cabal_macros.h"
+   : sources
+ 
+ getSources :: IO [FilePath]
diff -rN -u old-haskell-lens//patches/series new-haskell-lens//patches/series
--- old-haskell-lens//patches/series	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-lens//patches/series	2012-10-07 14:15:28.495218230 +0000
@@ -0,0 +1 @@
+newer-doctest.diff
diff -rN -u old-haskell-lens//rules new-haskell-lens//rules
--- old-haskell-lens//rules	2012-10-07 14:15:28.491218527 +0000
+++ new-haskell-lens//rules	2012-10-07 14:15:28.499217931 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-#DEB_ENABLE_TESTS = yes
+DEB_ENABLE_TESTS = $(shell test -e /usr/lib/ghc/libHSrts_thr.a && echo yes)
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/hlibrary.mk