[Pkg-haskell-commits] [package-plan] 01/02: Merge branch 'LTS-2.15'

[Joachim Breitner]

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

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

commit 1d0965d7f821e6152a728d47eb25673639e63eed
Merge: 83b8099 8467e2f
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Mon Jun 29 10:35:45 2015 +0200

    Merge branch 'LTS-2.15'
    
    Conflicts:
    	packages.txt

 packages.txt                                       | 354 +++++++++++----------
 .../0.2.1.0/no-bytestring-builder                  |  13 +
 patches/blaze-builder-enumerator/0.2.1.0/series    |   1 +
 patches/conduit-extra/1.1.9/no-bytestring-builder  |  14 +
 patches/conduit-extra/1.1.9/series                 |   1 +
 .../2.1.4/faster-pwstore.diff                      |  15 +
 patches/happstack-authenticate/2.1.4/series        |   1 +
 patches/hledger-web/0.25.1/no-network-conduit.diff |  20 ++
 patches/hledger-web/0.25.1/series                  |   2 +
 patches/hledger/0.24.1/no-shakespeare-text         |  34 ++
 patches/hledger/0.24.1/series                      |   1 +
 patches/hledger/0.25.1/no-shakespeare-text         |  42 +++
 patches/hledger/0.25.1/series                      |   1 +
 patches/xmonad/0.11.1/relax-utf8-string-dep        |  13 +
 patches/xmonad/0.11.1/series                       |   1 +
 test-packages.pl                                   |   2 +-
 upgrade-to-lts.pl                                  |  35 ++
 17 files changed, 378 insertions(+), 172 deletions(-)

diff --cc packages.txt
index e73f142,75c5f97..6fbb914
--- a/packages.txt
+++ b/packages.txt
@@@ -369,14 -372,14 +372,14 @@@ hsx2hs 0.13.3.
  hsx-jmacro 7.3.6
  hsyslog 2.0
  html 1.0.1.2
- html-conduit 1.1.1.1
+ html-conduit 1.1.1.2
  HTTP 4000.2.19 notest
 -http-client 0.4.13 ahead # ahead by accident?
 +http-client 0.4.13 ahead # ahead by accident
  http-client-tls 0.2.2 notest
- http-conduit 2.1.4.7
- http-date 0.0.2 notest
- http-reverse-proxy 0.4.0.1 notest
- http-types 0.8.5
+ http-conduit 2.1.5
+ http-date 0.0.6.1 notest
+ http-reverse-proxy 0.4.2 notest
+ http-types 0.8.6
  HUnit 1.2.5.2
  hxt 9.3.1.15
  hxt-cache 9.1.0

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