summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2021-01-21 18:55:57 -0700
committerSean Whitton <spwhitton@spwhitton.name>2021-01-21 18:55:57 -0700
commit41eec0ee3f3c7ab92b88f4c49e73cb92efe72bab (patch)
tree49ce16e2da9d22972de498a7132ebba9dfef1066 /debian
parent12913ae70887c9b7cd672686d529acf9433d63d3 (diff)
parentfdb813e529602914360fc2d0cf22e42e32e6905f (diff)
downloademacs-41eec0ee3f3c7ab92b88f4c49e73cb92efe72bab.tar.gz
Merge branch 'athena/unstable' into athena/buster-backports
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog11
1 files changed, 11 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index f0399e5470b..a531c669fcd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+emacs-snapshot (28~git20210119.1) unstable; urgency=medium
+
+ * Package git snapshot.
+ * Temporarily include org-checklist.el and ol-notmuch.el from Org-mode's
+ 9.4.4 release.
+ Debian's Org-mode package fails to bytecompile against Emacs 28 atm,
+ so rely on the version of Org bundled with Emacs, plus these two
+ contrib files.
+
+ -- Sean Whitton <spwhitton@spwhitton.name> Thu, 21 Jan 2021 18:44:32 -0700
+
emacs-snapshot (28~git20201101.1~bpo10+1~athena1) buster-backports; urgency=medium
* Rebuild for athena's apt repository.