From 6a12888cade6a88bc29be7e7616f2f8471025dfd Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Fri, 25 Nov 2022 14:28:10 -0700 Subject: d/merge-snapshot: check out the correct branch --- debian/changelog | 6 ++++++ debian/merge-snapshot | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index c18b446d7b7..b2a6ce0a158 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +emacs-snapshot (29.1~git20221121.2) UNRELEASED; urgency=medium + + * d/merge-snapshot: check out the correct branch. + + -- Sean Whitton Fri, 25 Nov 2022 14:27:41 -0700 + emacs-snapshot (29.1~git20221121.1) unstable; urgency=medium * Package git snapshot. 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"); -- cgit v1.2.3 From 0a64525bfe3805c16d2b10007792a29120fa2f74 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Sat, 26 Nov 2022 15:47:55 -0700 Subject: changelog --- debian/changelog | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index b2a6ce0a158..09b19a3a673 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ -emacs-snapshot (29.1~git20221121.2) UNRELEASED; urgency=medium +emacs-snapshot (29.1~git20221126.1) UNRELEASED; urgency=medium + * Package git snapshot. * d/merge-snapshot: check out the correct branch. - -- Sean Whitton Fri, 25 Nov 2022 14:27:41 -0700 + -- Sean Whitton Sat, 26 Nov 2022 15:47:55 -0700 emacs-snapshot (29.1~git20221121.1) unstable; urgency=medium -- cgit v1.2.3 From 13d4a07691cc9640aa49206a42f991435737745a Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Sat, 26 Nov 2022 16:03:40 -0700 Subject: drop imagemagick build-deps, add build-deps for optional features --- debian/changelog | 3 +++ debian/control | 10 ++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 09b19a3a673..d21fb013c23 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,9 @@ emacs-snapshot (29.1~git20221126.1) UNRELEASED; 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 Sat, 26 Nov 2022 15:47:55 -0700 diff --git a/debian/control b/debian/control index 02380cc33f5..e7106938a29 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-12-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, -- cgit v1.2.3 From 6da538e8d30c42a403e929137bd10513b74a86b4 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Sat, 26 Nov 2022 17:21:43 -0700 Subject: Release rebuild to athena apt repository --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index d21fb013c23..d76ffc7bf1f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -emacs-snapshot (29.1~git20221126.1) UNRELEASED; urgency=medium +emacs-snapshot (29.1~git20221126.1) unstable; urgency=medium * Package git snapshot. * Drop build-deps on imagemagick and libmagick++-6.q16-dev. @@ -6,7 +6,7 @@ emacs-snapshot (29.1~git20221126.1) UNRELEASED; urgency=medium lib{cairo,harfbuzz,gmp,jansson,lcms2,sqlite3,tree-sitter,webp}-dev. * d/merge-snapshot: check out the correct branch. - -- Sean Whitton Sat, 26 Nov 2022 15:47:55 -0700 + -- Sean Whitton Sat, 26 Nov 2022 17:21:41 -0700 emacs-snapshot (29.1~git20221121.1) unstable; urgency=medium -- cgit v1.2.3