[commit: ghc] master: Synchronise ghci-package version with ghc-package (01299ca)

[git at git.haskell.org]

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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/01299ca83996710ec1572c952917157b1c2d139e/ghc

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

commit 01299ca83996710ec1572c952917157b1c2d139e
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Sun Dec 27 09:03:44 2015 +0100

    Synchronise ghci-package version with ghc-package
    
    In order to simplify the task, the version munging logic has
    been radically simplified:
    
    Previously, in cases where the version contained dates as version components,
    the build-system would munge the version of the stage1 ghc package before
    registering the `ghc` package.
    
    However, this hack was already questionable at the time of its introduction
    (c.f. 7b45c46cbabe1288ea87bd9b94c57e010ed17e60).
    Simplifying the build-systems by avoiding such hacks may also help the
    shaking-up-ghc effort.
    
    So now we simply munge directly via the `.cabal` files, which gives a simpler
    picture, as now every stage is munged the same. Munging is only active when
    the first patch-level version component is a date. So stable snapshots and release
    candidates are unaffacted (as those have the date in the second patch-level
    version component)
    
    Reviewers: simonmar, bgamari, austin, thomie, ezyang
    
    Reviewed By: bgamari, thomie, ezyang
    
    Differential Revision: https://phabricator.haskell.org/D1673


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

01299ca83996710ec1572c952917157b1c2d139e
 .gitignore                                         |  2 +
 aclocal.m4                                         | 16 ++++++-
 boot                                               |  6 ++-
 compiler/ghc.cabal.in                              | 18 ++++----
 compiler/ghc.mk                                    | 53 ----------------------
 configure.ac                                       |  2 +-
 ghc.mk                                             |  1 +
 ghc/ghc-bin.cabal.in                               |  8 ++--
 ghc/ghc.mk                                         |  9 ----
 iserv/iserv-bin.cabal                              |  2 +-
 .../ghc-boot/{ghc-boot.cabal => ghc-boot.cabal.in} |  6 ++-
 libraries/ghci/{ghci.cabal => ghci.cabal.in}       | 29 ++++++------
 libraries/template-haskell/template-haskell.cabal  |  2 +-
 rules/build-package-data.mk                        |  2 -
 rules/foreachLibrary.mk                            |  1 +
 testsuite/tests/th/all.T                           |  5 +-
 16 files changed, 64 insertions(+), 98 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 01299ca83996710ec1572c952917157b1c2d139e