From 8ee14fb9ec3e14addf84ef2039a09ddb9998e05a Mon Sep 17 00:00:00 2001
From: "David E. Wheeler" <david@justatheory.com>
Date: Sun, 4 Feb 2024 13:27:49 -0500
Subject: [PATCH] Increment to v1.4.2-dev

And fix an issue in the bundling
---
 Changes                    |  2 ++
 README.md                  |  2 +-
 dist.ini                   |  2 +-
 dist/sqitch.spec           |  2 +-
 inc/Module/Build/Sqitch.pm |  2 +-
 po/App-Sqitch.pot          |  2 +-
 xt/release.md              | 11 ++++++-----
 7 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/Changes b/Changes
index 140e54c8..80ead0d0 100644
--- a/Changes
+++ b/Changes
@@ -1,5 +1,7 @@
 Revision history for Perl extension App::Sqitch
 
+1.4.2
+
 1.4.1  2024-02-04T16:35:32Z
      - Removed the quoting of the role and warehouse identifiers that was
        added to the Snowflake engine in v1.4.0. Turns out Snowflake allows a
diff --git a/README.md b/README.md
index 612c76b5..db6640df 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-App/Sqitch version v1.4.1
+App/Sqitch version v1.4.2-dev
 =========================
 
 | Release           | Coverage          | Database                              ||
diff --git a/dist.ini b/dist.ini
index e1aca19f..c9c549df 100644
--- a/dist.ini
+++ b/dist.ini
@@ -2,7 +2,7 @@ name = App-Sqitch
 license = MIT
 copyright_holder = "iovation Inc., David E. Wheeler"
 copyright_year = 2012-2024
-version = v1.4.1
+version = v1.4.2
 
 [GatherDir]
 exclude_filename = dist/cpanfile
diff --git a/dist/sqitch.spec b/dist/sqitch.spec
index 9be90f1e..1c14dd7a 100644
--- a/dist/sqitch.spec
+++ b/dist/sqitch.spec
@@ -1,5 +1,5 @@
 Name:           sqitch
-Version:        1.4.1
+Version:        1.4.2-dev
 Release:        1%{?dist}
 Summary:        Sensible database change management
 License:        MIT
diff --git a/inc/Module/Build/Sqitch.pm b/inc/Module/Build/Sqitch.pm
index 47fc1e8e..27d93aa6 100644
--- a/inc/Module/Build/Sqitch.pm
+++ b/inc/Module/Build/Sqitch.pm
@@ -318,7 +318,7 @@ sub _set_findbin {
     local $^I = '';
     local @ARGV = ($file);
     while (<>) {
-        s{^BEGIN}{use FindBin;\nuse lib "\$FindBin::RealBin/../lib/perl5";\nBEGIN};
+        s{^use App::Sqitch}{use FindBin;\nuse lib "\$FindBin::RealBin/../lib/perl5";\nuse App::Sqitch};
         print;
     }
 }
diff --git a/po/App-Sqitch.pot b/po/App-Sqitch.pot
index 084b93cc..8d4039a7 100644
--- a/po/App-Sqitch.pot
+++ b/po/App-Sqitch.pot
@@ -6,7 +6,7 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: App-Sqitch v1.4.1\n"
+"Project-Id-Version: App-Sqitch v1.4.2-dev\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-02-04 10:23-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
diff --git a/xt/release.md b/xt/release.md
index d8a50a44..11143e6e 100644
--- a/xt/release.md
+++ b/xt/release.md
@@ -8,6 +8,7 @@ assumption is that they're set to the old and new versions, respectively, e.g.,
 ``` sh
 export OLD_VERSION=1.3.1
 export VERSION=1.4.0
+export NEXT_VERSION=1.4.2
 ```
 
 Preparation
@@ -131,7 +132,7 @@ then make the updates.
 
     ``` sh
     git checkout main
-    perl -i -pe "s/^(VERSION)=.+/\$1=$VERSION/" build
+    perl -i -pe "s/^(VERSION)=.+/\$1=$VERSION/" .envrc
     ```
 
 *   Commit and push the changes:
@@ -219,10 +220,10 @@ example, if you've just released `v1.4.0`, change the version to `v1.4.1-dev`.
 ``` sh
 git checkout develop
 git merge main
-perl -i -pe 's/^(version\s*=).+/$1 v1.4.1-dev/' dist.ini
-perl -i -pe 's{(App/Sqitch version).+}{$1 v1.4.1-dev}' README.md
-perl -i -pe 's/(Project-Id-Version: App-Sqitch)[^\\n]+/$1 v1.4.1-dev/' po/App-Sqitch.pot
-perl -i -pe 's/(Version:\s*).+/${1}1.4.1-dev/' dist/sqitch.spec
+perl -i -pe "s/^(version\s*=).+/\$1 v$NEXT_VERSION/" dist.ini
+perl -i -pe "s{(App/Sqitch version).+}{\$1 v$NEXT_VERSION-dev}" README.md
+perl -i -pe "s/(Project-Id-Version: App-Sqitch)[^\\\\]+/\$1 v$NEXT_VERSION-dev/" po/App-Sqitch.pot
+perl -i -pe "s/(Version:\s*).+/\${1}$NEXT_VERSION-dev/" dist/sqitch.spec
 ```
 
 Also add a line for the new version (without the pre-release part) to the top of