[package-plan] 01/01: Merge remote-tracking branch 'origin/master' into LTS-5
Clint Adams
clint at moszumanska.debian.org
Thu May 26 14:51:35 UTC 2016
This is an automated email from the git hooks/post-receive script.
clint pushed a commit to branch LTS-5
in repository package-plan.
commit 2d237aefa17955d09ee852bceea650c2d9cf0c8b
Merge: 0ba5556 b05fc52
Author: Clint Adams <clint at debian.org>
Date: Thu May 26 10:49:18 2016 -0400
Merge remote-tracking branch 'origin/master' into LTS-5
additional-cabals/text-show-2.1.2.cabal | 344 +++++++++++++++++++++
packages.txt | 13 +-
patches/aeson-compat/0.3.3.0/no-nats | 18 ++
patches/aeson-compat/0.3.3.0/series | 1 +
.../conduit-extra/1.1.13.1/no-bytestring-builder | 18 ++
patches/conduit-extra/1.1.13.1/series | 1 +
.../conduit-extra/1.1.9.2/no-bytestring-builder | 12 +
patches/conduit-extra/1.1.9.2/series | 1 +
patches/http2/1.5.3/no-bytestring-builder | 50 +++
patches/http2/1.5.3/series | 1 +
patches/io-streams/1.3.5.0/no-bytestring-builder | 18 ++
patches/io-streams/1.3.5.0/series | 1 +
.../0.5.1.2/no-bytestring-builder | 10 +
patches/postgresql-simple/0.5.1.2/series | 1 +
patches/text-show/2.1.2/no-bytestring-builder | 18 ++
patches/text-show/2.1.2/no-nats | 36 +++
patches/text-show/2.1.2/series | 2 +
patches/wai/3.2.0/no-bytestring-builder | 12 +
patches/wai/3.2.0/series | 1 +
patches/wai/3.2.1.1/no-bytestring-builder | 10 +
patches/wai/3.2.1.1/series | 1 +
patches/warp/3.2.3/no-bytestring-builder | 22 ++
patches/warp/3.2.3/series | 1 +
patches/wl-pprint-extras/3.5.0.5/no-nats | 13 +
patches/wl-pprint-extras/3.5.0.5/series | 1 +
patches/wl-pprint-terminfo/3.7.1.3/no-nats | 14 +
patches/wl-pprint-terminfo/3.7.1.3/series | 1 +
27 files changed, 614 insertions(+), 7 deletions(-)
diff --cc packages.txt
index 16be799,49d1343..3fbba8d
--- a/packages.txt
+++ b/packages.txt
@@@ -2,10 -2,10 +2,10 @@@ abstract-deque 0.
abstract-par 0.3.3
acid-state 0.14.0 key
active 0.2.0.8
-adjunctions 4.2.2
-aeson 0.10.0.0
-aeson-compat 0.3.0.0
-aeson-extra 0.3.0.0
+adjunctions 4.3
+aeson 0.11.1.4 ahead
- aeson-compat 0.3.2.0
++aeson-compat 0.3.3.0 ahead
+aeson-extra 0.3.1.1
aeson-pretty 0.7.2
aeson-qq 0.8.1
Agda 2.4.2.5 key
@@@ -20,11 -20,11 +20,11 @@@ asn1-data 0.7.
asn1-encoding 0.9.3
asn1-parse 0.9.4
asn1-types 0.3.2
-async 2.0.2
+async 2.1.0
attoparsec 0.13.0.1
- attoparsec-conduit 1.1.0 ignore
+ attoparsec-conduit 1.1.0 avoid
attoparsec-enumerator 0.3.4
-authenticate 1.3.2.11
+authenticate 1.3.3
authenticate-oauth 1.5.1.1
auto-update 0.1.3
aws 0.13.0 notest
@@@ -332,12 -330,11 +332,11 @@@ hledger-interest 1.4.4 binary ke
hledger-lib 0.27
hledger-ui 0.27.3 binary
hledger-web 0.27 binary
-hlint 1.9.26
+hlint 1.9.31
hmatrix 0.17.0.1
- hoauth 0.3.5 obsolete
-hoauth2 0.5.3 ahead
+hoauth2 0.5.3
hoogle 4.2.43 notest
-hOpenPGP 2.4.4 key ahead
+hOpenPGP 2.4.4 key
hopenpgp-tools 0.18 binary ahead
hostname 1.0
hothasktags 0.3.6 binary key
@@@ -488,10 -485,10 +487,10 @@@ mueval 0.9.1.1.2 key # we should keep t
multipart 0.1.2
MusicBrainz 0.2.4
mutable-containers 0.3.2
-mwc-random 0.13.3.2 notest
+mwc-random 0.13.4.0 notest
- nats 1.1 ignore # empty, should be patched out. Using ignore, not obsolete, so that we don't have to pull all the packages into the package plan
+ nats 1.1 avoid
ncurses 0.2.15 key
-nettle 0.2.0 ahead
+nettle 0.2.0
netwire 5.0.0 key
network 2.6.2.1
network-conduit 1.1.0 avoid
@@@ -736,24 -732,24 +735,24 @@@ utf8-string 1.0.1.
utility-ht 0.0.11 key # dependency of mediawiki2latex
uuagc 0.9.42.3 binary key
uuagc-cabal 1.0.4.0
-uuid 1.3.11
-uuid-types 1.0.2
+uuid 1.3.12
+uuid-types 1.0.3
uulib 0.9.20
-vault 0.3.0.5
+vault 0.3.0.6
vector 0.11.0.0 notest # Testing disabled during transition to 7.10
vector-algorithms 0.7.0.1 # Ahead due to vector
-vector-binary-instances 0.2.1.0
+vector-binary-instances 0.2.3.1
vector-instances 3.3.1
-vector-space 0.10.2
+vector-space 0.10.3
vector-space-points 0.2.1.1
-vector-th-unbox 0.2.1.3
+vector-th-unbox 0.2.1.5
void 0.7.1
vty 5.4.0 notest
- wai 3.2.0.1
-wai 3.2.0 ahead
++wai 3.2.1.1 ahead
wai-app-file-cgi 3.1.0
-wai-app-static 3.1.4.1
+wai-app-static 3.1.5
wai-conduit 3.0.0.3
-wai-extra 3.0.14
+wai-extra 3.0.15
wai-handler-launch 3.0.0.5
wai-logger 2.2.5 notest
wai-websockets 3.0.0.8
diff --cc patches/aeson-compat/0.3.3.0/no-nats
index 0000000,0000000..d2f1e4e
new file mode 100644
--- /dev/null
+++ b/patches/aeson-compat/0.3.3.0/no-nats
@@@ -1,0 -1,0 +1,18 @@@
++--- a/aeson-compat.cabal 2016-05-26 10:34:48.952890195 -0400
+++++ b/aeson-compat.cabal 2016-05-26 10:37:23.541044726 -0400
++@@ -38,7 +38,6 @@
++ , containers >=0.5 && <0.6
++ , exceptions >=0.8 && <0.9
++ , hashable >=1.2 && <1.3
++- , nats >=1 && <1.2
++ , scientific >=0.3 && <0.4
++ , text >=1.2 && <1.3
++ , time >=1.4.2 && <1.7
++@@ -68,7 +67,6 @@
++ , containers >=0.5 && <0.6
++ , exceptions >=0.8 && <0.9
++ , hashable >=1.2 && <1.3
++- , nats >=1 && <1.2
++ , scientific >=0.3 && <0.4
++ , text >=1.2 && <1.3
++ , time >=1.4.2 && <1.7
diff --cc patches/aeson-compat/0.3.3.0/series
index 0000000,0000000..ddd7d5b
new file mode 100644
--- /dev/null
+++ b/patches/aeson-compat/0.3.3.0/series
@@@ -1,0 -1,0 +1,1 @@@
++no-nats
diff --cc patches/conduit-extra/1.1.13.1/no-bytestring-builder
index 0000000,0000000..e5b2c5e
new file mode 100644
--- /dev/null
+++ b/patches/conduit-extra/1.1.13.1/no-bytestring-builder
@@@ -1,0 -1,0 +1,18 @@@
++--- conduit-extra.cabal.orig 2016-05-26 10:42:27.753409505 -0400
+++++ conduit-extra.cabal 2016-05-26 10:42:41.585429390 -0400
++@@ -73,7 +73,6 @@
++ , async
++ , attoparsec
++ , blaze-builder
++- , bytestring-builder
++ , bytestring
++ , exceptions
++ , process
++@@ -107,7 +106,6 @@
++ , conduit-extra
++ , criterion
++ , bytestring
++- , bytestring-builder
++ , transformers
++ main-is: blaze.hs
++ ghc-options: -Wall -O2 -rtsopts
diff --cc patches/conduit-extra/1.1.13.1/series
index 0000000,0000000..d61cbb2
new file mode 100644
--- /dev/null
+++ b/patches/conduit-extra/1.1.13.1/series
@@@ -1,0 -1,0 +1,1 @@@
++no-bytestring-builder
diff --cc patches/wai/3.2.1.1/no-bytestring-builder
index 0000000,0000000..311afe1
new file mode 100644
--- /dev/null
+++ b/patches/wai/3.2.1.1/no-bytestring-builder
@@@ -1,0 -1,0 +1,10 @@@
++--- a/wai.cabal 2016-05-26 10:46:45.677777030 -0400
+++++ b/wai.cabal 2016-05-26 10:46:59.237796164 -0400
++@@ -21,7 +21,6 @@
++ Library
++ Build-Depends: base >= 4 && < 5
++ , bytestring >= 0.10
++- , bytestring-builder >= 0.10.4.0 && < 0.11
++ , blaze-builder >= 0.2.1.4 && < 0.5
++ , network >= 2.2.1.5
++ , http-types >= 0.7
diff --cc patches/wai/3.2.1.1/series
index 0000000,0000000..d61cbb2
new file mode 100644
--- /dev/null
+++ b/patches/wai/3.2.1.1/series
@@@ -1,0 -1,0 +1,1 @@@
++no-bytestring-builder
--
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