Merge branch 'athena/unstable' into athena/bullseye-backports

2 files changed, 14 insertions, 7 deletions

diff --git a/debian/changelog b/debian/changelog
index 7d44c88f8ef..c300d188745 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+emacs-snapshot (30.1~git20230320.1) unstable; urgency=medium
+
+  * Package git snapshot.
+  * d/merge-snapshot: Extract the major version only after merging.
+
+ -- Sean Whitton <spwhitton@spwhitton.name>  Tue, 21 Mar 2023 16:20:58 -0700
+
 emacs-snapshot (29.1~git20230123.1~bpo11+1~athena1) bullseye-backports; urgency=medium
 
   * Rebuild for athena apt repository.
diff --git a/debian/merge-snapshot b/debian/merge-snapshot
index 6e686307c8e..78b71367d2a 100755
--- a/debian/merge-snapshot
+++ b/debian/merge-snapshot
@@ -13,7 +13,7 @@ my $git = Git::Wrapper->new(getcwd);
 ($git->rev_parse({ abbrev_ref => 1 }, "HEAD"))[0] eq "athena/unstable"
   or $git->checkout("athena/unstable");
 
-my ($to_merge) = $git->merge_base("melete", "origin/emacs-29");
+my ($to_merge) = $git->merge_base("melete", "origin/master");
 
 chomp(my $prev_version = `dpkg-parsechangelog -SVersion`);
 chomp(my $prev_distn   = `dpkg-parsechangelog -SDistribution`);
@@ -25,6 +25,12 @@ $new_date =~ /\A([0-9]{4})-([0-9]{2})-([0-9]{2})/
 $new_date = $1 . $2 . $3;
 my $new_rev = $prev_date eq $new_date ? $prev_rev + 1 : 1;
 
+$git->merge({
+        message => "Merge upstream Git snapshot into athena/unstable"
+    },
+    $to_merge
+);
+
 my $major_version;
 open my $fh, "<", catfile $git->dir, "configure.ac";
 for (<$fh>) {
@@ -33,12 +39,6 @@ for (<$fh>) {
 }
 $major_version or die "couldn't extract devel major version number";
 
-$git->merge({
-        message => "Merge upstream Git snapshot into athena/unstable"
-    },
-    $to_merge
-);
-
 # We use .1 not .0.50 because that's what's conventional
 # with Debian "~gitYYYYMMDD.N" git snapshot version numbers.
 system "dch", "-v${major_version}.1~git${new_date}.${new_rev}",