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

[Joachim Breitner]

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

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

commit cb9791837db88d3e6d97d4650e7ab4b6383a22f5
Merge: 47eed98 6f3432a
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Sat Dec 20 16:08:23 2014 +0100

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

 .../snap-loader-dynamic-0.10.0.2.cabal             | 70 ++++++++++++++++++++++
 packages.txt                                       |  9 ++-
 2 files changed, 76 insertions(+), 3 deletions(-)

diff --cc packages.txt
index b4751a6,874a158..5dc6b4e
--- a/packages.txt
+++ b/packages.txt
@@@ -183,14 -178,12 +183,14 @@@ djinn-lib 0.0.1.
  dlist 0.7.0.1
  dlist-instances 0.1
  dns 1.3.0
 -doctest 0.9.10
 +doctest 0.9.11.1
  download-curl 0.1.4
  dpkg 0.0.3
 +DRBG 0.5.2
  dual-tree 0.2.0.4
 +dynamic-state 0.1.1.0
  dyre 0.8.11
- ed25519 0.0.2.0
+ ed25519 0.0.2.0 obsolete
  EdisonAPI 1.2.2.1
  EdisonCore 1.2.2.1
  edit-distance 0.2.1.2
@@@ -256,22 -248,19 +256,22 @@@ graceful 0.1.1.
  graphviz 2999.17.0.1
  groups 0.4.0.0
  gsasl 0.3.5
 -gstreamer 0.12.1.2
 -gtk 0.12.5.6
 -gtk2hs-buildtools 0.12.5.2 binary
 -gtk3 0.12.5.6
 -gtkglext 0.12.1
 -gtksourceview2 0.12.3.1
 -gtk-traymanager 0.1.3
 -haddock 2.13.1
 -hakyll 4.5.4.0 group=new-binary
 -hamlet 1.1.9.2
 +gstreamer 0.12.1.2 obsolete
 +gtk 0.13.0.0
 +gtk2hs-buildtools 0.13.0.2 binary
 +gtk3 0.13.0.3
 +gtkglext 0.12.1 obsolete
 +gtksourceview2 0.13.0.0
 +gtksourceview3 0.13.1.1
 +gtk-traymanager 0.1.5
- haddock 2.14.3
++haddock 2.14.3.1
 +haddock-api 2.15.0
 +haddock-library 1.1.1
 +hakyll 4.5.4.0
 +hamlet 1.2.0 # needs to be obsoleted
  happstack 7.0.2
  happstack-authenticate 0.10.12
 -happstack-heist 7.2.3
 +happstack-heist 7.2.4
  happstack-hsp 7.3.2
  happstack-server 7.3.7
  happy 1.19.4 binary
@@@ -700,18 -684,16 +702,18 @@@ uuid 1.3.3 notes
  uulib 0.9.15
  vado 0.0.3
  vault 0.3.0.3
 -vector 0.10.0.1
 +vcsgui 0.1.0.0
 +vcswrapper 0.1.0
- vector 0.10.0.1
++vector 0.10.12.2
  vector-algorithms 0.6.0.3
 -vector-binary-instances 0.2.1.0 group=new-binary
 +vector-binary-instances 0.2.1.0
  vector-instances 3.3
  vector-space 0.8.6
 -vector-space-points 0.1.2.0
 +vector-space-points 0.2
  vector-th-unbox 0.2.1.0
  void 0.6.1
 -vte 0.12.1
 -vty 5.2.3 notest
 +vte 0.13.0.0
 +vty 5.2.5 notest
  wai 3.0.1.1
  wai-app-file-cgi 3.0.1
  wai-app-static 3.0.0.1
@@@ -758,25 -738,24 +760,26 @@@ xmonad-contrib 0.11.
  xss-sanitize 0.3.5.2
  yaml 0.8.9.1
  yaml-light 0.1.4
 -yesod 1.2.6.1
 -yesod-auth 1.3.4
 -yesod-auth-account 1.2.6
 -yesod-auth-hashdb 1.3.2
 -yesod-auth-oauth 1.2.0
 -yesod-bin 1.2.13 binary=yesod
 -yesod-core 1.2.19
 +yesod 1.4.0
 +yesod-auth 1.4.0.2
 +yesod-auth-account 1.4.0
++yesod-auth-hashdb 1.4.0
 +yesod-auth-oauth 1.4.0
 +yesod-bin 1.4.0.6 binary=yesod
 +yesod-core 1.4.3.1
  yesod-default 1.2.0
 -yesod-form 1.3.15
 -yesod-markdown 0.8.5 group=new-binary
 -yesod-newsfeed 1.2.1
 -yesod-persistent 1.2.3 notest
 +yesod-form 1.4.0
 +yesod-markdown 0.9.2 obsolete # no yesod-1.4 version yet
 +yesod-newsfeed 1.4.0
 +yesod-persistent 1.4.0 notest
  yesod-routes 1.2.0.7
 -yesod-static 1.2.4
 -yesod-test 1.2.3.2
 -yi 0.7.1 -fvty
 +yesod-static 1.4.0.2
 +yesod-test 1.4.0.3
 +yi 0.11.1 -fvty
 +yi-language 0.1.0.7
 +yi-rope 0.7.0.0
  zeromq4-haskell 0.6 notest
 -zip-archive 0.2.3.4 group=new-binary
 +zip-archive 0.2.3.4
  zlib 0.5.4.1
  zlib-bindings 0.1.1.5
  zlib-enum 0.2.3.1

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