Merge remote-tracking branch 'origin/master' into en-dash-ligature-avoidance.

1 files changed, 21 insertions, 21 deletions

diff --git a/pandoc.cabal b/pandoc.cabal
index a4b8ac61b..b99eb5420 100644
--- a/pandoc.cabal
+++ b/pandoc.cabal
@@ -1,5 +1,5 @@
 Name:            pandoc
-Version:         1.12.2
+Version:         1.12.3.3
 Cabal-Version:   >= 1.10
 Build-Type:      Custom
 License:         GPL
@@ -202,40 +202,41 @@ Library
                  syb >= 0.1 && < 0.5,
                  containers >= 0.1 && < 0.6,
                  unordered-containers >= 0.2 && < 0.3,
-                 array >= 0.3 && < 0.5,
+                 array >= 0.3 && < 0.6,
                  parsec >= 3.1 && < 3.2,
                  mtl >= 1.1 && < 2.2,
                  network >= 2 && < 2.5,
                  filepath >= 1.1 && < 1.4,
-                 process >= 1 && < 1.2,
+                 process >= 1 && < 1.3,
                  directory >= 1 && < 1.3,
                  bytestring >= 0.9 && < 0.11,
-                 text >= 0.11 && < 0.12,
-                 zip-archive >= 0.1.3.3 && < 0.2,
+                 text >= 0.11 && < 1.2,
+                 zip-archive >= 0.1.3.3 && < 0.3,
                  old-locale >= 1 && < 1.1,
                  time >= 1.2 && < 1.5,
                  HTTP >= 4000.0.5 && < 4000.3,
-                 texmath >= 0.6.5.2 && < 0.7,
+                 texmath >= 0.6.6 && < 0.7,
                  xml >= 1.3.12 && < 1.4,
                  random >= 1 && < 1.1,
                  extensible-exceptions >= 0.1 && < 0.2,
                  pandoc-types >= 1.12.3 && < 1.13,
-                 aeson >= 0.6 && < 0.7,
+                 aeson >= 0.6 && < 0.8,
                  tagsoup >= 0.12.5 && < 0.14,
                  base64-bytestring >= 0.1 && < 1.1,
                  zlib >= 0.5 && < 0.6,
-                 highlighting-kate >= 0.5.5 && < 0.6,
+                 highlighting-kate >= 0.5.6 && < 0.6,
                  data-default >= 0.4 && < 0.6,
-                 temporary >= 1.1 && < 1.2,
-                 blaze-html >= 0.5 && < 0.7,
-                 blaze-markup >= 0.5.1 && < 0.6,
-                 attoparsec >= 0.10 && < 0.11,
+                 temporary >= 1.1 && < 1.3,
+                 blaze-html >= 0.5 && < 0.8,
+                 blaze-markup >= 0.5.1 && < 0.7,
+                 attoparsec >= 0.10 && < 0.12,
                  yaml >= 0.8.3 && < 0.9,
                  vector >= 0.10 && < 0.11,
-                 hslua >= 0.3 && < 0.4
+                 hslua >= 0.3 && < 0.4,
+                 binary >= 0.5 && < 0.8
   Build-Tools:   alex, happy
   if flag(http-conduit)
-     Build-Depends: http-conduit >= 1.9 && < 1.10,
+     Build-Depends: http-conduit >= 1.9 && < 2.1,
                     http-types >= 0.8 && < 0.9
      cpp-options:   -DHTTP_CONDUIT
   if flag(embed_data_files)
@@ -316,12 +317,11 @@ Executable pandoc
                  directory >= 1 && < 1.3,
                  filepath >= 1.1 && < 1.4,
                  network >= 2 && < 2.5,
-                 text >= 0.11 && < 0.12,
+                 text >= 0.11 && < 1.2,
                  bytestring >= 0.9 && < 0.11,
                  extensible-exceptions >= 0.1 && < 0.2,
-                 highlighting-kate >= 0.5.5 && < 0.6,
-                 aeson >= 0.6 && < 0.7,
-                 text >= 0.11 && < 0.12,
+                 highlighting-kate >= 0.5.6 && < 0.6,
+                 aeson >= 0.6 && < 0.8,
                  yaml >= 0.8.3 && < 0.9,
                  containers >= 0.1 && < 0.6,
                  HTTP >= 4000.0.5 && < 4000.3
@@ -359,11 +359,11 @@ Test-Suite test-pandoc
                   pandoc,
                   pandoc-types >= 1.12.3 && < 1.13,
                   bytestring >= 0.9 && < 0.11,
-                  text >= 0.11 && < 0.12,
+                  text >= 0.11 && < 1.2,
                   directory >= 1 && < 1.3,
                   filepath >= 1.1 && < 1.4,
-                  process >= 1 && < 1.2,
-                  highlighting-kate >= 0.5.5 && < 0.6,
+                  process >= 1 && < 1.3,
+                  highlighting-kate >= 0.5.6 && < 0.6,
                   Diff >= 0.2 && < 0.4,
                   test-framework >= 0.3 && < 0.9,
                   test-framework-hunit >= 0.2 && < 0.4,