From f1d16ffcd07bd393f82e07c68ced1d83034737fb Mon Sep 17 00:00:00 2001
From: Sebastian Graf <sgraf1337@gmail.com>
Date: Sat, 18 Jan 2025 17:11:54 +0100
Subject: [PATCH] Prepare 2.1.4 release

---
 ChangeLog.md        | 11 +++++++++++
 happy.cabal         |  4 ++--
 lib/happy-lib.cabal |  2 +-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/ChangeLog.md b/ChangeLog.md
index 1c8df825..740757c6 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,5 +1,16 @@
 # Revision history for Happy
 
+## 2.1.4
+
+Move `Paths_happy_lib` into `tabular` to prevent a Cabal bug concerning
+--libsubdir (#328). It is likely that this release fixes
+`cabal v1-install happy` as well, which was broken since happy-2.0 (#315).
+
+## 2.1.3
+
+Auto-resolve shift/reduce conflicts involving the catch token.
+This was to support on going work in GHC to utilise the catch token.
+
 ## 2.1.2
 
 Fix a breaking change (#325) introduced by the previous fix for #131.
diff --git a/happy.cabal b/happy.cabal
index e750a7b4..23be162f 100644
--- a/happy.cabal
+++ b/happy.cabal
@@ -1,5 +1,5 @@
 name: happy
-version: 2.1.3
+version: 2.1.4
 license: BSD2
 license-file: LICENSE
 copyright: (c) Andy Gill, Simon Marlow
@@ -139,7 +139,7 @@ executable happy
                  array,
                  containers >= 0.4.2,
                  mtl >= 2.2.1,
-                 happy-lib == 2.1.3
+                 happy-lib == 2.1.4
 
   default-language: Haskell98
   default-extensions: CPP, MagicHash, FlexibleContexts, NamedFieldPuns
diff --git a/lib/happy-lib.cabal b/lib/happy-lib.cabal
index 1c365b37..98f99b41 100644
--- a/lib/happy-lib.cabal
+++ b/lib/happy-lib.cabal
@@ -1,6 +1,6 @@
 cabal-version: 3.0
 name: happy-lib
-version: 2.1.3
+version: 2.1.4
 license: BSD-2-Clause
 copyright: (c) Andy Gill, Simon Marlow
 author: Andy Gill and Simon Marlow