From d615c996d480d527c468a72af8750b766da4ad02 Mon Sep 17 00:00:00 2001
From: Bodigrim <andrew.lelechenko@gmail.com>
Date: Mon, 9 Aug 2021 20:27:34 +0100
Subject: [PATCH] Update changelog

---
 changelog.md | 21 ++++++++++++++++-----
 text.cabal   |  8 ++------
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/changelog.md b/changelog.md
index 3c1d32bd..4792622c 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,10 +1,21 @@
 ### 1.3
 
-* Disable implicit fusion rules
-
-### 1.2.4.2
-
-* Support GHC-9.2
+* [Disable implicit fusion rules](https://github.com/haskell/text/pull/348)
+* [Add `Data.Text.Encoding.decodeUtf8Lenient`](https://github.com/haskell/text/pull/342)
+* [Remove `Data.Text.Internal.Unsafe.Shift`](https://github.com/haskell/text/pull/343)
+* [Remove `Data.Text.Internal.Functions`](https://github.com/haskell/text/pull/354)
+* [Bring type of `Data.Text.Unsafe.reverseIter` in line with `iter`](https://github.com/haskell/text/pull/355)
+
+### 1.2.5.0
+
+* [Support sized primitives from GHC 9.2](https://github.com/haskell/text/pull/305)
+* [Allow `template-haskell-2.18.0.0`](https://github.com/haskell/text/pull/320)
+* [Add `elem :: Char -> Text -> Bool` to `Data.Text` and `Data.Text.Lazy`](https://github.com/haskell/text/pull/274)
+* [Replace surrogate code points in `Data.Text.Internal.Builder.{singleton,fromString}`](https://github.com/haskell/text/pull/281)
+* [Use `unsafeWithForeignPtr` when available](https://github.com/haskell/text/pull/325)
+* [Use vectorized CPU instructions for decoding and encoding](https://github.com/haskell/text/pull/302)
+* [Regenerate case mapping in accordance to Unicode 13.0](https://github.com/haskell/text/pull/334)
+* [Fix UTF-8 decoding of lazy bytestrings](https://github.com/haskell/text/pull/333)
 
 ### 1.2.4.1
 
diff --git a/text.cabal b/text.cabal
index 389cfda6..2535129c 100644
--- a/text.cabal
+++ b/text.cabal
@@ -1,6 +1,6 @@
 cabal-version:  >= 1.10
 name:           text
-version:        1.2.4.2
+version:        1.2.5.0
 
 homepage:       https://github.com/haskell/text
 bug-reports:    https://github.com/haskell/text/issues
@@ -52,7 +52,7 @@ description:
 license:        BSD2
 license-file:   LICENSE
 author:         Bryan O'Sullivan <bos@serpentine.com>
-maintainer:     Bryan O'Sullivan <bos@serpentine.com>, Herbert Valerio Riedel <hvr@gnu.org>
+maintainer:     Haskell Text Team <andrew.lelechenko@gmail.com>, Core Libraries Committee
 copyright:      2009-2011 Bryan O'Sullivan, 2008-2009 Tom Harper
 category:       Data, Text
 build-type:     Simple
@@ -168,10 +168,6 @@ source-repository head
   type:     git
   location: https://github.com/haskell/text
 
-source-repository head
-  type:     mercurial
-  location: https://bitbucket.org/bos/text
-
 test-suite tests
   type:           exitcode-stdio-1.0
   ghc-options:
-- 
GitLab