[Pkg-haskell-commits] [package-plan] 02/06: Merge branch 'master' into new-leksah

[Joachim Breitner]

This is an automated email from the git hooks/post-receive script.

nomeata pushed a commit to branch new-leksah
in repository package-plan.

commit 30dd73f76233196759244f9bed7c1a5111423b10
Merge: c3b7a6c de98d6b
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Fri Sep 12 15:55:37 2014 +0200

    Merge branch 'master' into new-leksah
    
    Conflicts:
    	packages.txt

 README.md                                          |   1 -
 packages.txt                                       |  26 +-
 patches/tasty/0.10/regex-tdfa.diff                 |  11 +
 patches/tasty/0.10/series                          |   1 +
 .../0.7.1/Yi.Syntax.Tree-quickcheck-2.7-patch.diff |  60 +++
 patches/yi/0.7.1/man-page.diff                     |  73 +++
 patches/yi/0.7.1/series                            |   4 +
 patches/yi/0.7.1/vty-5.1-compat                    | 329 ++++++++++++++
 patches/yi/0.7.1/xpm-icons.diff                    | 501 +++++++++++++++++++++
 test-packages.pl                                   |  21 +-
 10 files changed, 1007 insertions(+), 20 deletions(-)

diff --cc packages.txt
index 51bf448,483a383..810e596
--- a/packages.txt
+++ b/packages.txt
@@@ -161,10 -161,10 +161,10 @@@ dependent-sum 0.2.1.
  dependent-sum-template 0.0.0.1
  derive 2.5.16
  diagrams 1.2 binary=libghc-diagrams-dev ignore # hand-created meta package, does not yet pull in diagrams-contrib
- diagrams-cairo 1.2
+ diagrams-cairo 1.2.0.2
  diagrams-core 1.2.0.2
- diagrams-gtk 1.0.1.2 ignore
- diagrams-lib 1.2.0.1
 -diagrams-gtk 1.0.1.2
++diagrams-gtk 1.0.1.3
+ diagrams-lib 1.2.0.3
  diagrams-svg 1.1
  Diff 0.3.0
  digest 0.0.1.2

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-haskell/package-plan.git