Update 'bootstrap.sh'.
Revert "Replace hardcoded "" with use of getPkgEnvDir"

This reverts commit 57bce8d85b4d01f6821ec5580e8d0d3d9fa25e82.
Don't strip libraries on OS X.

Fixes #1630.
Trim a module's export list.
'runConfigureScript': quote the gcc path.

See #1634.
Fix boostrap.sh build (network configure)

cabal.git 7f9c23d fails when configuring network:
checking whether the C compiler works... no

To fix that, update network version to 2.4.2.2.

See #1634.
Merge pull request #1637 from tuncer/bootstrap-network-configure

Fix boostrap.sh build (network configure)
Unbreak the build on Windows.
Revert "'runConfigureScript': quote the gcc path."

This reverts commit 7f9c23d836b7257950c8d49f18897c1a83777875.
New license-files field.

Based closely on the patches by Mathieu Boespflug <mboes@cs.mcgill.ca>

This field is intended to be used instead of (or in addition to) the
normal 'license-file' field by packages that have multiple files for
their license material. This is useful when eg the license is
supplemented by additional permissions and/or conditions. Notably,
the LGPL is structured in this way: it amends the GPL with additional
permissions, therefore one should distribute both the GPL in COPYING
and the LGPL in COPYING.LESSER.

So we keep both the license-file and license-files fields (rather than
deprecating one) and packages can use either or a mixture.
Merge pull request #1642 from dcoutts/mboes-master

New license-files field.
Remove ambiguous import of 'catch'

Running 'cabal install Cabal/ cabal-install/' from the latest git version resulted in:

Distribution/Client/Compat/Process.hs:41:5:
    Ambiguous occurrence `catch'
    It could refer to either `Prelude.catch',
                             imported from `Prelude' at Distribution/Client/Compat/Process.hs:16:8-41
                             (and originally defined in `System.IO.Error')
                          or `Control.Exception.catch',
                             imported from `Control.Exception' at Distribution/Client/Compat/Process.hs:20:37-41
                             (and originally defined in `Control.Exception.Base')


This pull requests fixes that.
Merge pull request #1644 from djv/patch-4

Remove ambiguous import of 'catch'
Unbreak the build on GHC 7.6.3.

See #1644.
Remove a redundant equation.

'display IOS' already evaluates to "ios".
Add some more OS aliases.

Fixes #1641. Based on a patch by Karel Gardas.

The 'Compat' classification strictness type is confusing and should IMO be
merged with 'Permissive'.
Update bootstrap.sh: text 1.1.0.0, parsec 3.1.5
Merge pull request #1645 from tuncer/bootstrap-parsec-text

Update bootstrap.sh: text 1.1.0.0, parsec 3.1.5
add Eq instance for CDialect
Merge pull request #1650 from JohnLato/master

add Eq instance for CDialect