[Pkg-haskell-commits] [package-plan] 01/03: Merge branch 'ghc-7.8'

[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 4ccbb656bc47d19db60470f0684d67836b4db12f
Merge: a1a7c01 5db5f95
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Mon Apr 27 13:36:26 2015 +0200

    Merge branch 'ghc-7.8'
    
    Conflicts:
    	packages.txt

 additional-cabals/haddock-2.14.3.1.cabal           | 252 ++++++
 packages.txt                                       | 875 +++++++++++----------
 .../1.5.0.1/no-blaze-builder-conduit               |  13 +
 patches/authenticate-oauth/1.5.0.1/series          |   1 +
 .../conduit-extra/1.1.7.1/no-bytestring-builder    |  14 +
 patches/conduit-extra/1.1.7.1/series               |   1 +
 patches/fast-logger/2.3.1/no-bytestring-builder    |  14 +
 patches/fast-logger/2.3.1/series                   |   1 +
 .../0.10.15/faster-pwstore.diff                    |  15 +
 patches/happstack-authenticate/0.10.15/series      |   1 +
 .../0.10.16/faster-pwstore.diff                    |  15 +
 patches/happstack-authenticate/0.10.16/series      |   1 +
 patches/hledger/0.23.3/no-shakespeare-text         |  34 +
 patches/hledger/0.23.3/series                      |   1 +
 patches/hledger/0.24/no-shakespeare-text           |  34 +
 patches/hledger/0.24/series                        |   1 +
 .../0.8.9.6/compat-with-exceptions-0.8.patch       |  17 +
 patches/iteratee/0.8.9.6/series                    |   1 +
 .../leksah-server/0.14.0.1/no-attoparsec-conduit   |  31 +
 patches/leksah-server/0.14.0.1/series              |   1 +
 patches/leksah/0.14.1.1/no-hamlet                  |  13 +
 patches/leksah/0.14.1.1/series                     |   1 +
 patches/process-conduit/1.1.0.0/newer-conduit.diff |  19 -
 patches/process-conduit/1.1.0.0/series             |   1 -
 patches/rss2irc/1.0.5/newer-http-conduit.diff      |  31 -
 patches/rss2irc/1.0.5/series                       |   1 -
 patches/rss2irc/1.0.6/newer-libraries.diff         |  15 -
 patches/rss2irc/1.0.6/series                       |   1 -
 patches/snap/0.13.2.9/newer-lens                   |  13 +
 patches/snap/0.13.2.9/rename-snap-binary           |  79 ++
 patches/snap/0.13.2.9/series                       |   2 +
 patches/taffybar/0.4.4/no-network-uri              |  13 +
 patches/taffybar/0.4.4/series                      |   1 +
 patches/tasty/0.10.1/regex-tdfa.diff               |  13 +
 patches/tasty/0.10.1/series                        |   1 +
 patches/tasty/0.10/patches/regex-tdfa.diff         |  13 +
 patches/tasty/0.10/patches/series                  |   1 +
 patches/tokyocabinet-haskell/0.0.5/ghc-7.4.1-fix   |  11 -
 patches/tokyocabinet-haskell/0.0.5/series          |   1 -
 patches/weighted-regexp/0.3.1.2/eq-constraints     |  69 --
 patches/weighted-regexp/0.3.1.2/series             |   1 -
 patches/yesod-markdown/0.8.5/newer-temporary       |  13 -
 patches/yesod-markdown/0.8.5/series                |   1 -
 test-packages.pl                                   |  64 +-
 44 files changed, 1107 insertions(+), 594 deletions(-)

diff --cc packages.txt
index 30049e0,3239e6e..cf2805f
--- a/packages.txt
+++ b/packages.txt
@@@ -48,13 -53,12 +53,13 @@@ blaze-html 0.7.0.
  blaze-markup 0.6.1.0
  blaze-svg 0.3.4
  blaze-textual 0.2.0.9 notest
 +BlogLiterately 0.7.1.7 group=new-binary
  bloomfilter 2.0.0.0
- bluetile 0.6 binary
- bmp 1.2.3.4
- Boolean 0.2.1
+ bluetile 0.6 binary obsolete
+ bmp 1.2.5.2
+ Boolean 0.2.3
  bool-extras 0.4.0
- boomerang 1.4.3
+ boomerang 1.4.5
  BoundedChan 1.0.3.0
  boxes 0.1.3
  brainfuck 0.1

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