[Pkg-haskell-commits] [package-plan] 02/03: Merge branch 'ghc-7.8' into LTS-2.0

[Joachim Breitner]

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

nomeata pushed a commit to branch LTS-2.0
in repository package-plan.

commit d8251cab16380d986cd48958c4386c22ece9a427
Merge: 9861240 0a85814
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Thu Apr 2 20:18:12 2015 +0200

    Merge branch 'ghc-7.8' into LTS-2.0
    
    Conflicts:
    	packages.txt

 packages.txt                                              |  2 ++
 .../happstack-authenticate/0.10.16/faster-pwstore.diff    | 15 +++++++++++++++
 patches/happstack-authenticate/0.10.16/series             |  1 +
 3 files changed, 18 insertions(+)

diff --cc packages.txt
index 2e446a6,3d1b112..027d4d8
--- a/packages.txt
+++ b/packages.txt
@@@ -35,7 -35,8 +35,8 @@@ base-compat 0.6.
  base-unicode-symbols 0.2.2.4
  basic-prelude 0.3.11.1
  bencode 0.5.0.1
 -bifunctors 4.1.1.1
 +bifunctors 4.2.1
+ binary 0.7.2.1 ignore
  binary-communicator 1.0.2.1 obsolete
  binary-conduit 1.2.3 notest
  binary-shared 0.8.3
@@@ -566,11 -562,11 +567,12 @@@ publicsuffixlist 0.
  punycode 2.0 notest
  pureMD5 2.1.2.1
  pwstore-fast 2.4.4
+ pwstore-purehaskell 0 avoid # always patch packages to use pwstore-fast
  QuickCheck 2.7.6
 -quickcheck-instances 0.3.8
 -quickcheck-io 0.1.0
 -random 1.0.1.1
 +quickcheck-instances 0.3.11
 +quickcheck-io 0.1.1
 +quickcheck-unicode 1.0.0.1
 +random 1.1
  random-shuffle 0.0.4
  Ranged-sets 0.3.0
  ranges 0.2.4

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