[Pkg-haskell-commits] darcs: haskell-tasty-golden: * Merge Colins changes

[Joachim Breitner]

Sun Aug  3 19:09:44 UTC 2014  Joachim Breitner <mail at joachim-breitner.de>
  * * Merge Colins changes 

    M ./changelog +19
    R ./patches/no-unicode-in-description
    M ./patches/series -1

Sun Aug  3 19:09:44 UTC 2014  Joachim Breitner <mail at joachim-breitner.de>
  * * Merge Colins changes 
diff -rN -u old-haskell-tasty-golden/changelog new-haskell-tasty-golden/changelog
--- old-haskell-tasty-golden/changelog	2014-08-03 19:12:41.059551471 +0000
+++ new-haskell-tasty-golden/changelog	2014-08-03 19:12:41.063551470 +0000
@@ -1,3 +1,22 @@
+haskell-tasty-golden (2.2.2.4-2) UNRELEASED; urgency=medium
+
+  * Merge Colins changes 
+
+ -- Joachim Breitner <nomeata at debian.org>  Sun, 03 Aug 2014 21:09:15 +0200
+
+haskell-tasty-golden (2.2.2.4-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Joachim Breitner <nomeata at debian.org>  Sun, 03 Aug 2014 20:58:42 +0200
+
+haskell-tasty-golden (2.2.0.2-2) unstable; urgency=medium
+
+  * Set LC_ALL=C.UTF-8 when building documentation, fixing a build failure
+    in the C locale.
+
+ -- Colin Watson <cjwatson at debian.org>  Tue, 06 May 2014 10:07:43 +0100
+
 haskell-tasty-golden (2.2.0.2-1) unstable; urgency=low
 
   * Initial release.
diff -rN -u old-haskell-tasty-golden/patches/no-unicode-in-description new-haskell-tasty-golden/patches/no-unicode-in-description
--- old-haskell-tasty-golden/patches/no-unicode-in-description	2014-08-03 19:12:41.059551471 +0000
+++ new-haskell-tasty-golden/patches/no-unicode-in-description	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-Index: tasty-golden-2.2.2.4/tasty-golden.cabal
-===================================================================
---- tasty-golden-2.2.2.4.orig/tasty-golden.cabal	2014-08-03 19:37:03.255279185 +0200
-+++ tasty-golden-2.2.2.4/tasty-golden.cabal	2014-08-03 20:58:35.067115530 +0200
-@@ -2,11 +2,11 @@
- version:             2.2.2.4
- synopsis:            Golden tests support for tasty
- description:
--  This package provides support for «golden testing».
--
-+  This package provides support for golden testing.
-+  .
-   A golden test is an IO action that writes its result to a file.
-   To pass the test, this output file should be identical to the corresponding
--  «golden» file, which contains the correct result for the test.
-+  golden file, which contains the correct result for the test.
- 
- license:             MIT
- license-file:        LICENSE
diff -rN -u old-haskell-tasty-golden/patches/series new-haskell-tasty-golden/patches/series
--- old-haskell-tasty-golden/patches/series	2014-08-03 19:12:41.059551471 +0000
+++ new-haskell-tasty-golden/patches/series	2014-08-03 19:12:41.063551470 +0000
@@ -1,2 +1 @@
 use-temporary
-no-unicode-in-description