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

2 files changed, 8 insertions, 1 deletions

diff --git a/debian/changelog b/debian/changelog
index 9f4b4f6a857..4d44dd85d7a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+emacs-snapshot (29.1~git20220912.1) unstable; urgency=medium
+
+  * Package git snapshot.
+  * d/merge-snapshot: use 29.1, not 29, as base version number.
+
+ -- Sean Whitton <spwhitton@spwhitton.name>  Mon, 12 Sep 2022 18:28:45 -0700
+
 emacs-snapshot (29~git20220905.1~bpo11+1~athena1) bullseye-backports; urgency=medium
 
   * Rebuild for athena apt repository.
diff --git a/debian/merge-snapshot b/debian/merge-snapshot
index 18acea9115e..fe003515ebd 100755
--- a/debian/merge-snapshot
+++ b/debian/merge-snapshot
@@ -31,7 +31,7 @@ $git->merge({
     $to_merge
 );
 
-system "dch", "-v29~git${new_date}.${new_rev}",
+system "dch", "-v29.1~git${new_date}.${new_rev}",
   $prev_distn eq "UNRELEASED" ? "" : "Package git snapshot.";
 $git->add("debian/changelog");
 $git->commit({ message => "changelog" });