diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rwxr-xr-x | debian/merge-snapshot | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 981a91c3d2d..2699ac5ea72 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ emacs-snapshot (29.1~git20221203.2) UNRELEASED; urgency=medium * d/merge-snapshot: Find merge base with origin/emacs-29, not origin/master. + * d/merge-snapshot: Fix matching AC_INIT line in configure.ac. * d/emacs-snapshot.sh: Add comment regarding update-alternatives. -- Sean Whitton <spwhitton@spwhitton.name> Tue, 03 Jan 2023 11:10:46 -0700 diff --git a/debian/merge-snapshot b/debian/merge-snapshot index 5da65344e76..6e686307c8e 100755 --- a/debian/merge-snapshot +++ b/debian/merge-snapshot @@ -29,7 +29,7 @@ my $major_version; open my $fh, "<", catfile $git->dir, "configure.ac"; for (<$fh>) { $major_version = $1, last - if /AC_INIT\(\[GNU Emacs\], \[([0-9]+)\.0\.50\],/ + if /AC_INIT\(\[GNU Emacs\], \[([0-9]+)\.0\.[56]0\],/ } $major_version or die "couldn't extract devel major version number"; |