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

3 files changed, 10 insertions, 2 deletions

diff --git a/debian/changelog b/debian/changelog
index 6265d556b20..ceba679f29c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+emacs-snapshot (30.1~git20240510.1) unstable; urgency=medium
+
+  * Package git snapshot.
+  * Drop libjansson-dev build-dep.
+  * d/merge-snapshot: Use Sys::Hostname instead of hardcoding "melete".
+
+ -- Sean Whitton <spwhitton@spwhitton.name>  Thu, 16 May 2024 10:17:26 +0100
+
 emacs-snapshot (30.1~git20240330.1~bpo12+1~athena1) bookworm-backports; urgency=medium
 
   * Rebuild for athena apt repository.
diff --git a/debian/control b/debian/control
index e7106938a29..133217423b8 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,6 @@ Build-Depends:
  libgpm-dev,
  libgtk-3-dev,
  libharfbuzz-dev,
- libjansson-dev,
  libjpeg-dev,
  liblcms2-dev,
  liblockfile-dev,
diff --git a/debian/merge-snapshot b/debian/merge-snapshot
index 78b71367d2a..f8a5427167b 100755
--- a/debian/merge-snapshot
+++ b/debian/merge-snapshot
@@ -7,13 +7,14 @@ use warnings;
 use Cwd;
 use File::Spec::Functions "catfile";
 use Git::Wrapper;
+use Sys::Hostname;
 
 my $git = Git::Wrapper->new(getcwd);
 
 ($git->rev_parse({ abbrev_ref => 1 }, "HEAD"))[0] eq "athena/unstable"
   or $git->checkout("athena/unstable");
 
-my ($to_merge) = $git->merge_base("melete", "origin/master");
+my ($to_merge) = $git->merge_base(hostname, "origin/master");
 
 chomp(my $prev_version = `dpkg-parsechangelog -SVersion`);
 chomp(my $prev_distn   = `dpkg-parsechangelog -SDistribution`);