[Pkg-haskell-commits] darcs: haskell-lens: Merge Raúl latest changes

[Joachim Breitner]

Tue May 13 15:38:28 UTC 2014  Joachim Breitner <mail at joachim-breitner.de>
  * Merge Ra[_<U+00FA>_]l latest changes

    M ./changelog -2 +5
    M ./patches/series -2 +1

Tue May 13 15:38:28 UTC 2014  Joachim Breitner <mail at joachim-breitner.de>
  * Merge Raúl latest changes
diff -rN -u old-haskell-lens/changelog new-haskell-lens/changelog
--- old-haskell-lens/changelog	2014-05-13 21:36:51.823544114 +0000
+++ new-haskell-lens/changelog	2014-05-13 21:36:51.823544114 +0000
@@ -2,9 +2,12 @@
 
   [ Raúl Benencia ]
   * Fix bogus patch
-  * Disable Reflection on architectures without TH
+  * Backport testsuite failure fix
 
- -- Raúl Benencia <rul at kalgan.cc>  Tue, 13 May 2014 10:48:44 -0300
+  [ Joachim Breitner ]
+  * Redo the non-TH patches from scratch
+
+ -- Joachim Breitner <nomeata at debian.org>  Tue, 13 May 2014 17:29:04 +0200
 
 haskell-lens (4.1.2-1) unstable; urgency=medium
 
diff -rN -u old-haskell-lens/patches/series new-haskell-lens/patches/series
--- old-haskell-lens/patches/series	2014-05-13 21:36:51.823544114 +0000
+++ new-haskell-lens/patches/series	2014-05-13 21:36:51.827544118 +0000
@@ -3,5 +3,4 @@
 guard-ANNotations.patch
 fix-doctest-path.hs
 fudge-doctest-nonascii.diff
-no-transformers-compat.diff
-disable-reflection.patch
+backport-testsuite-failure-fix.patch