summaryrefslogtreecommitdiff
path: root/debian/changelog
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2022-12-04 17:39:50 -0700
committerSean Whitton <spwhitton@spwhitton.name>2022-12-04 17:39:50 -0700
commit359054a5b824911fa2abeaa936447c2a6a486637 (patch)
tree71519e4a1edb2d876409cb260a13c4de4960b8cd /debian/changelog
parent6c4bc152a4658a801b7bacc419d3919cb328112b (diff)
parent47b1c568a3f75eea243a8e608125bde96acce0e4 (diff)
downloademacs-359054a5b824911fa2abeaa936447c2a6a486637.tar.gz
Merge branch 'athena/unstable' into athena/bullseye-backports
Diffstat (limited to 'debian/changelog')
-rw-r--r--debian/changelog8
1 files changed, 8 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 7d52e4bc806..5c706322f4a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+emacs-snapshot (29.1~git20221203.1) unstable; urgency=medium
+
+ * Package git snapshot.
+ * d/merge-snapshot: don't hard code "origin/master" in merge messages.
+ We are presently merging from the emacs-29 branch.
+
+ -- Sean Whitton <spwhitton@spwhitton.name> Sun, 04 Dec 2022 17:38:14 -0700
+
emacs-snapshot (29.1~git20221126.1~bpo11+1~athena1) bullseye-backports; urgency=medium
* Rebuild for athena apt repository.