[Pkg-haskell-commits] [package-plan] 03/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 290ee217f2559ad0fec680c690a43cb0402bc070
Merge: 2e45d42 a136efc
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Sun Apr 5 20:24:08 2015 +0200

    Merge branch 'ghc-7.8' into LTS-2.0
    
    I might have accidentially bumped beyond LTS-2.0. *shrug*

 packages.txt                             | 25 +++++++++++++------------
 patches/config-value/0.4/older-libs.diff | 19 +++++++++++++++++++
 patches/config-value/0.4/series          |  1 +
 3 files changed, 33 insertions(+), 12 deletions(-)

diff --cc packages.txt
index e8ac014,7705fea..ce0bd23
--- a/packages.txt
+++ b/packages.txt
@@@ -1,8 -1,8 +1,8 @@@
  abstract-deque 0.3
  abstract-par 0.3.3
  acid-state 0.12.2
- active 0.1.0.18
+ active 0.1.0.19
 -adjunctions 4.1.0.1
 +adjunctions 4.2
  aeson 0.8.0.2
  aeson-pretty 0.7.2
  aeson-qq 0.7.4
@@@ -116,16 -116,16 +116,17 @@@ conduit 1.2.
  conduit-combinators 0.3.0.6
  conduit-extra 1.1.7.1
  ConfigFile 1.1.2
 -configurator 0.2.0.2
 +configurator 0.3.0.0
+ config-value 0.4
 -connection 0.2.3
 -contravariant 0.6.1.1
 -control-monad-free 0.5.3
 +connection 0.2.4
 +constraints 0.4.1.3
 +contravariant 1.3.1
 +control-monad-free 0.6.1
  control-monad-loop 0.1
  convertible 1.1.0.0
 -cookie 0.4.1.2
 -cpphs 1.18.5
 -cprng-aes 0.5.2
 +cookie 0.4.1.4
 +cpphs 1.19
 +cprng-aes 0.6.1
  cpu 0.1.2
  criterion 1.1.0.0
  Crypto 4.2.5.1
@@@ -195,10 -195,10 +196,10 @@@ dlist 0.7.1.
  dlist-instances 0.1
  dns 1.3.0
  doctest 0.9.13 notest
 -download-curl 0.1.4
 +download-curl 0.1.4 obsolete # needs old feed
  dpkg 0.0.3
  DRBG 0.5.4
- dual-tree 0.2.0.5
+ dual-tree 0.2.0.6
  dynamic-state 0.1.1.0
  dyre 0.8.11
  easy-file 0.2.0

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