summaryrefslogtreecommitdiff
path: root/debian/changelog
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2023-01-03 11:50:57 -0700
committerSean Whitton <spwhitton@spwhitton.name>2023-01-03 11:50:57 -0700
commit6c5027755a9a29100f3f33ded09a384aab04f372 (patch)
treeed9cb1b26e1a1737007cc5faea7fe723516dd036 /debian/changelog
parent046e85d42e9da9757027f876ca6ff3e27a32362e (diff)
parent5bf195aace31dacda96651a576c3afaa3fc3f346 (diff)
downloademacs-6c5027755a9a29100f3f33ded09a384aab04f372.tar.gz
Merge branch 'athena/unstable' into athena/bullseye-backports
Diffstat (limited to 'debian/changelog')
-rw-r--r--debian/changelog9
1 files changed, 9 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 74c0d011644..7bd9b470f8a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+emacs-snapshot (29.1~git20230103.1) unstable; urgency=medium
+
+ * Package git snapshot.
+ * 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:48:45 -0700
+
emacs-snapshot (29.1~git20221203.1~bpo11+1~athena1) bullseye-backports; urgency=medium
* Rebuild for athena apt repository.