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

3 files changed, 19 insertions, 3 deletions

diff --git a/debian/changelog b/debian/changelog
index 377f5005e81..ea0a6401f41 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+emacs-snapshot (29.1~git20221126.1) unstable; urgency=medium
+
+  * Package git snapshot.
+  * Drop build-deps on imagemagick and libmagick++-6.q16-dev.
+  * (Explicitly) build-depend on libraries for optional features:
+    lib{cairo,harfbuzz,gmp,jansson,lcms2,sqlite3,tree-sitter,webp}-dev.
+  * d/merge-snapshot: check out the correct branch.
+
+ -- Sean Whitton <spwhitton@spwhitton.name>  Sat, 26 Nov 2022 17:21:41 -0700
+
 emacs-snapshot (29.1~git20221121.1~bpo11+1~athena1) bullseye-backports; urgency=medium
 
   * Rebuild for athena apt repository.
diff --git a/debian/control b/debian/control
index 563d5b1ce57..ffdaaed0510 100644
--- a/debian/control
+++ b/debian/control
@@ -10,26 +10,32 @@ Build-Depends:
  debhelper-compat (= 12),
  dh-exec,
  gnupg-agent,
- imagemagick,
  libacl1-dev,
  libasound2-dev,
+ libcairo-dev,
  libdbus-1-dev,
  libgccjit-10-dev,
  libgif-dev,
  libgnutls28-dev,
+ libgmp-dev,
  libgpm-dev,
  libgtk-3-dev,
+ libharfbuzz-dev,
+ libjansson-dev,
  libjpeg-dev,
+ liblcms2-dev,
  liblockfile-dev,
  libm17n-dev,
- libmagick++-6.q16-dev,
  libncurses5-dev,
  libotf-dev,
  libpng-dev,
  librsvg2-dev,
  libselinux1-dev,
+ libsqlite3-dev,
  libsystemd-dev,
  libtiff-dev,
+ libtree-sitter-dev,
+ libwebp-dev,
  libxaw7-dev,
  libxml2-dev,
  procps,
diff --git a/debian/merge-snapshot b/debian/merge-snapshot
index 8ee28d69a05..207d441407d 100755
--- a/debian/merge-snapshot
+++ b/debian/merge-snapshot
@@ -11,7 +11,7 @@ use Git::Wrapper;
 my $git = Git::Wrapper->new(getcwd);
 
 ($git->rev_parse({ abbrev_ref => 1 }, "HEAD"))[0] eq "athena/unstable"
-  or die "on wrong branch!";
+  or $git->checkout("athena/unstable");
 
 my ($to_merge) = $git->merge_base("melete", "origin/master");