[Pkg-haskell-commits] [package-plan] 02/03: Merge remote-tracking branch 'origin/master' into quickcheck-2.7

[Joachim Breitner]

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

nomeata pushed a commit to branch quickcheck-2.7
in repository package-plan.

commit 9e653309e80e81d0c490a8bc9a494f9712e4b9b4
Merge: 340a7dc f597f0e
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Sat Jul 26 13:55:31 2014 +0200

    Merge remote-tracking branch 'origin/master' into quickcheck-2.7
    
    Conflicts:
    	packages.txt

 additional-cabals/setlocale-1.0.0.cabal            | 25 ++++++++
 packages.txt                                       | 67 +++++++++-------------
 patches/HGL/3.2.0.2/00-cabal-rules.patch           | 16 ++++++
 patches/HGL/3.2.0.2/01-new-exceptions.patch        | 33 +++++++++++
 patches/HGL/3.2.0.2/02-exceptions.patch            | 65 +++++++++++++++++++++
 patches/HGL/3.2.0.2/03-channel.patch               | 46 +++++++++++++++
 patches/HGL/3.2.0.2/series                         |  4 ++
 .../http-conduit/2.1.2.3/no-network-conduit.diff   | 10 ++++
 patches/http-conduit/2.1.2.3/series                |  1 +
 test-packages.pl                                   | 16 +++++-
 10 files changed, 243 insertions(+), 40 deletions(-)

diff --cc packages.txt
index 5b9fae4,3b19d0b..779a5d8
--- a/packages.txt
+++ b/packages.txt
@@@ -1,9 -1,9 +1,9 @@@
  acid-state 0.12.2
  active 0.1.0.16
- adjunctions 4.0.3
+ adjunctions 4.1.0.1
  aeson 0.7.0.3
  aeson-pretty 0.7.1
 -Agda 2.3.2.2
 +Agda 2.4.0.1
  alex 3.1.3 binary
  ALUT 2.2.0.0
  AMI 0.1
@@@ -39,13 -36,12 +36,12 @@@ bindings-nettle 0.1.
  bindings-sane 0.0.1
  bitarray 0.0.1
  blaze-builder 0.3.3.2
- blaze-builder-conduit 1.1.0 obsolete
  blaze-builder-enumerator 0.2.0.5
 -blaze-html 0.6.1.2
 -blaze-markup 0.5.1.6
 -blaze-svg 0.3.3.0
 +blaze-html 0.7.0.2
 +blaze-markup 0.6.1.0
 +blaze-svg 0.3.4
  blaze-textual 0.2.0.9 notest
- bloomfilter 1.2.6.10
+ bloomfilter 2.0.0.0
  bluetile 0.6 binary
  bmp 1.2.3.4
  Boolean 0.2.1

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