[commit: ghc] ghc-8.2: configure.ac: Bump version to 8.2.0 (2e3dec1)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : ghc-8.2
Link       : http://ghc.haskell.org/trac/ghc/changeset/2e3dec1663796b403c55f68f1f336d37cc1a8652/ghc

>---------------------------------------------------------------

commit 2e3dec1663796b403c55f68f1f336d37cc1a8652
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Thu Mar 9 10:45:41 2017 -0500

    configure.ac: Bump version to 8.2.0
    
    Updates haddock submodule.


>---------------------------------------------------------------

2e3dec1663796b403c55f68f1f336d37cc1a8652
 configure.ac                                          | 2 +-
 iserv/iserv-bin.cabal                                 | 2 +-
 libraries/template-haskell/Language/Haskell/TH/Lib.hs | 2 +-
 libraries/template-haskell/template-haskell.cabal     | 2 +-
 utils/haddock                                         | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index 9864f32..496cd05 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@ dnl
 # see what flags are available. (Better yet, read the documentation!)
 #
 
-AC_INIT([The Glorious Glasgow Haskell Compilation System], [8.1], [glasgow-haskell-bugs at haskell.org], [ghc-AC_PACKAGE_VERSION])
+AC_INIT([The Glorious Glasgow Haskell Compilation System], [8.2.0], [glasgow-haskell-bugs at haskell.org], [ghc-AC_PACKAGE_VERSION])
 
 # Set this to YES for a released version, otherwise NO
 : ${RELEASE=NO}
diff --git a/iserv/iserv-bin.cabal b/iserv/iserv-bin.cabal
index eb33277..399b3d0 100644
--- a/iserv/iserv-bin.cabal
+++ b/iserv/iserv-bin.cabal
@@ -24,7 +24,7 @@ Executable iserv
                    bytestring >= 0.10 && < 0.11,
                    containers >= 0.5 && < 0.6,
                    deepseq    >= 1.4 && < 1.5,
-                   ghci       == 8.1
+                   ghci       == 8.2.*
 
     if os(windows)
         Cpp-Options: -DWINDOWS
diff --git a/libraries/template-haskell/Language/Haskell/TH/Lib.hs b/libraries/template-haskell/Language/Haskell/TH/Lib.hs
index a3cbc8e..860ccc3 100644
--- a/libraries/template-haskell/Language/Haskell/TH/Lib.hs
+++ b/libraries/template-haskell/Language/Haskell/TH/Lib.hs
@@ -608,7 +608,7 @@ closedTypeFamilyD tc tvs result injectivity eqns =
 --   3. remove the FamFlavour data type from Syntax module
 --   4. make sure that all references to FamFlavour are gone from DsMeta,
 --      Convert, TcSplice (follows from 3)
-#if __GLASGOW_HASKELL__ >= 802
+#if __GLASGOW_HASKELL__ >= 804
 #error Remove deprecated familyNoKindD, familyKindD, closedTypeFamilyNoKindD and closedTypeFamilyKindD
 #endif
 
diff --git a/libraries/template-haskell/template-haskell.cabal b/libraries/template-haskell/template-haskell.cabal
index 71e5e02..ea1a750 100644
--- a/libraries/template-haskell/template-haskell.cabal
+++ b/libraries/template-haskell/template-haskell.cabal
@@ -50,7 +50,7 @@ Library
 
     build-depends:
         base        >= 4.8 && < 4.11,
-        ghc-boot-th == 8.1,
+        ghc-boot-th == 8.2.*,
         pretty      == 1.1.*
 
     -- We need to set the unit ID to template-haskell (without a
diff --git a/utils/haddock b/utils/haddock
index dbbdabf..db13d5f 160000
--- a/utils/haddock
+++ b/utils/haddock
@@ -1 +1 @@
-Subproject commit dbbdabfd3842f70c78d4c64e10f75f47fe5c0f5d
+Subproject commit db13d5f56d8e693b44bafc793d7b3bfac1c25b91