[package-plan] 01/03: Merge remote-tracking branch 'origin/experimental'

Clint Adams clint at moszumanska.debian.org
Fri Dec 4 01:27:48 UTC 2015


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

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

commit a661d4deda84bdeb5ded19cf71099ed4cbbe2bed
Merge: e255947 90969a7
Author: Clint Adams <clint at debian.org>
Date:   Thu Dec 3 20:10:06 2015 -0500

    Merge remote-tracking branch 'origin/experimental'

 additional-cabals/Hsmtlib-0.2.0.6.cabal            |  76 --
 additional-cabals/fast-logger-2.4.0.cabal          |  45 ++
 additional-cabals/yesod-init-test-0.cabal          |   4 +-
 lts.config                                         | 855 ++++++++++++++-------
 packages.txt                                       | 374 ++++-----
 patches/Chart/1.5.1/allow-vector-11                |  12 +
 patches/Chart/1.5.1/series                         |   1 +
 patches/Hsmtlib/0.2.0.6/allow-base                 |  13 -
 patches/Hsmtlib/0.2.0.6/series                     |   1 -
 patches/ListLike/4.2.0/allow-vector-11             |  12 +
 patches/ListLike/4.2.0/series                      |   1 +
 patches/algebra/4.2/algebra-allow-semigroupoids-5  |  12 +
 patches/algebra/4.2/series                         |   1 +
 patches/asn1-data/0.7.1/asn1-data-cabal-ghc-7.10   |  12 +
 patches/asn1-data/0.7.1/asn1-ghc-7.10-support      |  16 +
 patches/asn1-data/0.7.1/series                     |   2 +
 patches/darcs/2.10.1/allow-vector-11               |  12 +
 patches/darcs/2.10.1/series                        |   1 +
 patches/dataenc/0.14.0.7/series                    |   1 +
 .../dataenc/0.14.0.7/update-build-deps-ghc-7.10.1  |  12 +
 patches/dbus/0.10.10/allow-vector-11               |  12 +
 patches/dbus/0.10.10/series                        |   1 +
 patches/fast-logger/2.4.0/no-bytestring-builder    |  14 +
 patches/fast-logger/2.4.0/series                   |   1 +
 patches/geniplate/0.6.0.5/geniplate-cabal-ghc-7.10 |  21 +
 patches/geniplate/0.6.0.5/series                   |   1 +
 .../2.1.4/faster-pwstore.diff                      |   3 +-
 patches/happstack-hsp/7.3.5/allow-syb-5            |  10 +
 patches/happstack-hsp/7.3.5/series                 |   1 +
 patches/http2/1.0.4/no-bytestring-builder          |  52 ++
 patches/http2/1.0.4/series                         |   1 +
 patches/io-streams/1.3.2.0/no-bytestring-builder   |  20 +
 patches/io-streams/1.3.2.0/series                  |   1 +
 patches/repa/3.4.0.1/allow-vector-11               |  12 +
 patches/repa/3.4.0.1/series                        |   1 +
 patches/safecopy/0.8.5/allow-vector-11             |  12 +
 patches/safecopy/0.8.5/series                      |   1 +
 splitpatch.sh                                      |  30 +
 test-packages.pl                                   |   4 +-
 update-suggestions                                 | Bin 0 -> 3611159 bytes
 40 files changed, 1103 insertions(+), 558 deletions(-)

diff --cc packages.txt
index 72cfb35,facf984..842be8e
--- a/packages.txt
+++ b/packages.txt
@@@ -67,11 -68,11 +68,11 @@@ bytestring-progress 1.0.
  bytestring-show 0.3.5.6
  bzlib 0.5.0.5
  c2hs 0.25.2 binary notest
- Cabal 1.22.1.1 ghcpkg group=new-cabal
- cabal-debian 4.31 binary -f-local-debian key
+ Cabal 1.22.4.0 ghcpkg notest
+ cabal-debian 4.31 binary -f-local-debian key ahead
  cabal-file-th 0.2.3
  cabal-helper 0.5.1.0
- cabal-install 1.22.0.1 binary group=new-cabal ahead
 -cabal-install 1.22.6.0 binary notest # Disabled testing because of quickcheck limits during ghc 7.10 transition
++cabal-install 1.22.6.0 binary
  cairo 0.13.1.0
  case-insensitive 1.2.0.4
  cassava 0.4.3.1
@@@ -103,16 -104,16 +104,16 @@@ cmark 0.4.0.1 key # future dependency o
  cmdargs 0.10.13
  colour 2.3.3
  comonad 4.2.7.2
- concrete-typerep 0.1.0.2
 -concrete-typerep 0.1.0.2 obsolete # During 7.10
 -concurrent-output 1.6.0
++concrete-typerep 0.1.0.2 obsolete
 +concurrent-output 1.7.1
  cond 0.4.1.1
  conduit 1.2.5
- conduit-combinators 0.3.1
+ conduit-combinators 1.0.3
  conduit-extra 1.1.9.1
- ConfigFile 1.1.2
+ ConfigFile 1.1.4
  configurator 0.3.0.0
  config-value 0.4
- connection 0.2.4
+ connection 0.2.5
  constraints 0.4.1.3
  contravariant 1.3.2
  control-monad-free 0.6.1
@@@ -242,12 -247,12 +247,12 @@@ ghc-mtl 1.2.1.
  ghc-paths 0.1.0.9
  ghc-syb-utils 0.2.3
  gio 0.13.1.0
 -git-annex 5.20151019 binary key ahead
 +git-annex 5.20151116 binary key ahead -f-ConcurrentOutput
  github 0.13.2
  github-backup 1.20150807 binary key
- gitit 0.10.7 key
- gitlib 3.1.0.1
- gitrev 1.0.0
+ gitit 0.11.1.1 key
+ gitlib 3.1.0.2
+ gitrev 1.1.0
  glib 0.13.2.1
  Glob 0.7.5
  gloss 1.9.3.1 key
@@@ -709,16 -729,16 +729,16 @@@ word8 0.1.
  word-trie 0.3.0
  X11 1.6.1.2
  X11-xft 0.3.1
- x509 1.5.1
- x509-store 1.5.0
- x509-system 1.5.0
- x509-util 1.5.0 binary key
- x509-validation 1.5.2
+ x509 1.6.0
+ x509-store 1.6.0
+ x509-system 1.6.0
+ x509-util 1.5.2 binary key obsolete
+ x509-validation 1.6.0
  xcb-types 0.7.1
 -xcffib 0.3.6 binary=python-xcffib key
 +xcffib 0.4.0 binary=python-xcffib key
  xdg-basedir 0.2.2
  xml 1.3.14
- xml-conduit 1.2.6
+ xml-conduit 1.3.1
  xml-hamlet 0.4.0.11
  xmlhtml 0.2.3.4
  xml-types 0.3.6

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



More information about the Pkg-haskell-commits mailing list