From a3c22f54ef3340045a46bd5c48b82eb0619184c4 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Tue, 21 Mar 2023 16:20:39 -0700 Subject: d/merge-snapshot: Extract the major version only after merging --- debian/changelog | 1 + debian/merge-snapshot | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index ce957834b6f..3c24e9821d5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ emacs-snapshot (30.1~git20230320.1) UNRELEASED; urgency=medium * Package git snapshot. + * d/merge-snapshot: Extract the major version only after merging. -- Sean Whitton Tue, 21 Mar 2023 14:54:23 -0700 diff --git a/debian/merge-snapshot b/debian/merge-snapshot index d070420d283..78b71367d2a 100755 --- a/debian/merge-snapshot +++ b/debian/merge-snapshot @@ -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}", -- cgit v1.2.3