[package-plan] 01/01: Merge branch 'master' into st3

Joachim Breitner nomeata at moszumanska.debian.org
Sat Aug 15 09:03:42 UTC 2015


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

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

commit 1bbe5c921a6eb7d8c71ebafa3786e09c85911037
Merge: 113cf38 b694236
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Sat Aug 15 11:02:43 2015 +0200

    Merge branch 'master' into st3
    
    I had to remove Hsmtlib (see mail to the list). Also, downgraded vector
    to the version in stackage, no reason to be ahead, it seems.

 additional-cabals/Hsmtlib-0.2.0.6.cabal | 76 +++++++++++++++++++++++++++++++++
 packages.txt                            | 26 ++++++++++-
 patches/Hsmtlib/0.2.0.6/allow-base      | 13 ++++++
 patches/Hsmtlib/0.2.0.6/series          |  1 +
 4 files changed, 114 insertions(+), 2 deletions(-)

diff --cc packages.txt
index 820d3ef,40b309a..f5bc1e6
--- a/packages.txt
+++ b/packages.txt
@@@ -46,9 -45,10 +46,10 @@@ blaze-html 0.8.1.
  blaze-markup 0.7.0.2
  blaze-svg 0.3.4.1
  blaze-textual 0.2.1.0 notest
 -BlogLiterately 0.7.1.11 key
 -bloomfilter 2.0.0.0
 +BlogLiterately 0.8.1.1 key
 +bloomfilter 2.0.1.0
  bmp 1.2.5.2
+ BNFC 2.6.0.3 binary=bnfc
  Boolean 0.2.3
  bool-extras 0.4.0
  boomerang 1.4.5
@@@ -162,18 -162,18 +163,19 @@@ dbus 0.10.10 notes
  debian 3.87.2 -f-listlike
  Decimal 0.4.2
  deepseq-generics 0.1.1.2
 -dependent-map 0.1.1.2
 +dependent-map 0.1.1.3
  dependent-sum 0.2.1.0
 -dependent-sum-template 0.0.0.1
 +dependent-sum-template 0.0.0.4
  derive 2.5.22
  descriptive 0.9.4 # dep of structured-haskell-mode, by Thomas Koch
 -diagrams 1.2 binary=libghc-diagrams-dev ignore # hand-created meta package, does not yet pull in diagrams-contrib
 -diagrams-cairo 1.2.0.7
 -diagrams-core 1.2.0.6
 -diagrams-gtk 1.0.1.3
 -diagrams-lib 1.2.0.9
 -diagrams-svg 1.1.0.5
 +diagrams 1.3 binary=libghc-diagrams-dev ignore # hand-created meta package, does not yet pull in diagrams-contrib
 +diagrams-cairo 1.3.0.3
 +diagrams-core 1.3.0.2
 +diagrams-gtk 1.3
 +diagrams-lib 1.3.0.3
 +diagrams-solve 0.1
 +diagrams-svg 1.3.1.4
+ dice 0.1
  Diff 0.3.2
  digest 0.0.1.2
  dimensional 0.13.0.2
@@@ -226,17 -224,17 +228,18 @@@ filelock 0.1.0.
  filemanip 0.3.6.3
  filestore 0.6.0.6
  fingertree 0.1.1.0
+ flexible-defaults 0.0.1.1
  fmlist 0.9
 -foldl 1.1.0 ahead # by accident
 -free 4.11
 +foldl 1.1.1 # by accident
 +free 4.12.1
  frown 0.6.1 binary ignore # not on hackage
 -fsnotify 0.1.0.3 notest
 +fsnotify 0.2.1 notest
  ftphs 1.0.9.1
  gd 3000.7.3
 -generic-deriving 1.7.0 ahead
 -geniplate 0.6.0.4
 -ghc-events 0.4.3.0
 +generic-deriving 1.8.0
 +geniplate 0.6.0.5
 +geniplate-mirror 0.7.1
 +ghc-events 0.4.4.0
  ghc-mod 5.2.1.2 binary
  ghc-mtl 1.2.1.0
  ghc-paths 0.1.0.9
@@@ -321,21 -319,21 +325,22 @@@ hothasktags 0.3.3 binary ke
  hourglass 0.2.9
  hS3 0.5.9 obsolete
  hs-bibutils 5.5
 -hscolour 1.22
 -hsemail 1.7.2
 +hscolour 1.23
 +hsemail 1.7.7
  HSH 2.1.0 key # dependency of twidge
  hslogger 1.2.9
 -hslua 0.3.13
 -Hsmtlib 0.2.0.6
 +hslua 0.4.0
 +HsOpenSSL 0.11.1.1
  hsp 0.10.0
 -hspec 2.1.7 notest
 -hspec-core 2.1.7 notest
 -hspec-discover 2.1.7 notest binary
 -hspec-expectations 0.6.1.1 notest
 +hspec 2.1.10 notest
 +hspec-contrib 0.3.0
 +hspec-core 2.1.10 notest
 +hspec-discover 2.1.10 notest binary
 +hspec-expectations 0.7.1 notest
  hspec-meta 2.1.7 avoid
+ hstatsd 0.1
  HStringTemplate 0.8.3
 -hsx2hs 0.13.3.1
 +hsx2hs 0.13.3.2
  hsx-jmacro 7.3.6
  hsyslog 2.0
  html 1.0.1.2
@@@ -399,13 -402,11 +413,14 @@@ lhs2tex 1.19 binary ke
  libxml-sax 0.7.5
  lifted-async 0.7.0.1
  lifted-base 0.2.3.6 notest
 +linear 1.19.1.3
  ListLike 4.2.0
 -logging-facade 0.0.0
 -logict 0.6.0.2
+ log-domain 0.10.2
 +logging-facade 0.1.0
 +logict 0.6.0.2
  lrucache 1.2.0.0
 +lucid 2.9.2
 +lucid-svg 0.5.0.0
  magic 1.1
  map-syntax 0.2
  markdown 0.1.13.2
@@@ -525,13 -523,16 +541,16 @@@ punycode 2.0 notes
  pureMD5 2.1.2.1
  pwstore-fast 2.4.4
  pwstore-purehaskell 0 avoid # always patch packages to use pwstore-fast
 -QuickCheck 2.7.6
 +QuickCheck 2.8.1
  quickcheck-instances 0.3.11
  quickcheck-io 0.1.1
+ QuickCheck-safe 0.1.0.1
  quickcheck-unicode 1.0.0.1
  random 1.1
+ random-fu 0.2.6.2
  random-shuffle 0.0.4
+ random-source 0.3.0.6
 -reactive-banana 0.7.1.3 key
 +reactive-banana 0.8.1.2 key
  ReadArgs 1.2.2 notest
  recaptcha 0.1.0.3
  reducers 3.10.3.2
@@@ -549,12 -550,12 +568,13 @@@ regex-posix 0.95.
  regexpr 0.5.4
  regex-tdfa 1.2.0
  regex-tdfa-rc 1.1.8.3 avoid
 -repa 3.3.1.2
 +repa 3.4.0.1
  resource-pool 0.2.3.2
  resourcet 1.1.6
 +retry 0.6 notest # tests disabled during 7.10 transition
  RSA 2.1.0.1
  rss2irc 1.0.6 binary obsolete
+ rvar 0.2.0.2
  safe 0.3.9
  safecopy 0.8.5
  SafeSemaphore 0.10.1
@@@ -591,7 -593,8 +612,8 @@@ snap-server 0.9.5.
  sockaddr 0.0.0
  socks 0.5.4
  split 0.2.2
 -stack 0.1.2.0 binary=haskell-stack key
 +stack 0.1.3.0 binary=haskell-stack key
+ stateref 0.3
  statestack 0.2.0.4
  StateVar 1.1.0.1
  static-hash 0.0.1
@@@ -671,11 -674,11 +693,11 @@@ uuid 1.3.11 notes
  uuid-types 1.0.2
  uulib 0.9.16
  vault 0.3.0.4
- vector 0.11.0.0 ahead notest # Testing disabled during transition to 7.10, ahead for transition also
 -vector 0.10.12.3
 -vector-algorithms 0.6.0.4
++vector 0.10.12.3 notest # Testing disabled during transition to 7.10
 +vector-algorithms 0.7.0.1 ahead # Ahead due to vector ahead
  vector-binary-instances 0.2.1.0
 -vector-instances 3.3.0.1
 -vector-space 0.9
 +vector-instances 3.3.1
 +vector-space 0.10.2
  vector-space-points 0.2.1.1
  vector-th-unbox 0.2.1.2
  void 0.7

-- 
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