From bd07f0a095869b91a590d8a564f716a6a136818a Mon Sep 17 00:00:00 2001
From: Herbert Valerio Riedel <hvr@gnu.org>
Date: Tue, 31 Mar 2020 22:14:21 +0200
Subject: [PATCH] Sync changelogs w/ 3.2 branch
---
Cabal/ChangeLog.md | 20 +++++++++++---------
cabal-install/changelog | 2 +-
2 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/Cabal/ChangeLog.md b/Cabal/ChangeLog.md
index b3e0f3d27f..c4f08c9f3f 100644
--- a/Cabal/ChangeLog.md
+++ b/Cabal/ChangeLog.md
@@ -1,22 +1,24 @@
-# 3.0.2.0
- * Disallow spaces around colon `:` in Dependency (`build-depends` syntax
+# 3.0.2.0 [Herbert Valerio Riedel](mailto:hvr@gnu.org) April 2020
+ * Disallow spaces around colon `:` in Dependency `build-depends` syntax
+ ([#6538](https://github.com/haskell/cabal/pull/6538)).
* Make `configure` accept any `pkg-config --modversion` output
+ ([#6541](https://github.com/haskell/cabal/pull/6541)).
-# 3.0.1.0 TBW
- * Add GHC-8.8 flags to normaliseGhcFlags
- ([#6379](https://github.com/haskell/cabal/pull/6379))
+# 3.0.1.0 [Herbert Valerio Riedel](mailto:hvr@gnu.org) April 2020
+ * Add GHC-8.8 flags to `normaliseGhcFlags`
+ ([#6379](https://github.com/haskell/cabal/pull/6379)).
* Typo fixes
- ([#6372](https://github.com/haskell/cabal/pull/6372))
+ ([#6372](https://github.com/haskell/cabal/pull/6372)).
* Limit version number parts to contain at most 9 digits
- ([#6386](https://github.com/haskell/cabal/pull/6386)
+ ([#6386](https://github.com/haskell/cabal/pull/6386)).
* Fix boundless sublibrary depedency parse failure
- ([#5846](https://github.com/haskell/cabal/issues/5846))
+ ([#5846](https://github.com/haskell/cabal/issues/5846)).
* `cabal check` verifies `cpp-options` more pedantically, allowing only
options starting with `-D` and `-U`.
* Don’t rebuild world when new ghc flags that affect how error
messages are presented is specified.
* Fix dropExeExtension behaviour on Windows
- ([#6287](https://github.com/haskell/cabal/pull/6287)
+ ([#6287](https://github.com/haskell/cabal/pull/6287)).
# 3.0.0.0 [Mikhail Glushenkov](mailto:mikhail.glushenkov@gmail.com) August 2019
* The 3.0 migration guide gives advice on adapting Custom setup
diff --git a/cabal-install/changelog b/cabal-install/changelog
index 9050cbdaea..13fbb2e402 100644
--- a/cabal-install/changelog
+++ b/cabal-install/changelog
@@ -1,6 +1,6 @@
-*-change-log-*-
-3.0.1.0 TBW December 2019
+3.0.1.0 Herbert Valerio Riedel <hvr@gnu.org> April 2020
* Create store incoming directory
([#4130](https://github.com/haskell/cabal/issues/4130))
* `fetchRepoTarball` output is not marked
--
GitLab