From d6040c47e4e5769807d236f30ea995abfa4d4505 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Tue, 3 Jan 2023 11:11:31 -0700 Subject: d/merge-snapshot: Find merge base with emacs-29 not master --- 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 7e281f3ce78..44e62c15f43 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +emacs-snapshot (29.1~git20221203.2) UNRELEASED; urgency=medium + + * d/merge-snapshot: Find merge base with origin/emacs-29, not origin/master. + + -- Sean Whitton Tue, 03 Jan 2023 11:10:46 -0700 + emacs-snapshot (29.1~git20221203.1) unstable; urgency=medium * Package git snapshot. diff --git a/debian/merge-snapshot b/debian/merge-snapshot index 83629af517c..5da65344e76 100755 --- a/debian/merge-snapshot +++ b/debian/merge-snapshot @@ -13,7 +13,7 @@ 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("melete", "origin/emacs-29"); chomp(my $prev_version = `dpkg-parsechangelog -SVersion`); chomp(my $prev_distn = `dpkg-parsechangelog -SDistribution`); -- cgit v1.2.3 From a965ed3b6664b075a034b2997487893e39dada80 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Tue, 3 Jan 2023 11:14:13 -0700 Subject: d/emacs-snapshot.sh: Add comment regarding update-alternatives --- debian/changelog | 1 + debian/emacs-snapshot.sh | 5 +++++ 2 files changed, 6 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 44e62c15f43..981a91c3d2d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ emacs-snapshot (29.1~git20221203.2) UNRELEASED; urgency=medium * d/merge-snapshot: Find merge base with origin/emacs-29, not origin/master. + * d/emacs-snapshot.sh: Add comment regarding update-alternatives. -- Sean Whitton Tue, 03 Jan 2023 11:10:46 -0700 diff --git a/debian/emacs-snapshot.sh b/debian/emacs-snapshot.sh index 12c67a4a44a..7893d16aa12 100644 --- a/debian/emacs-snapshot.sh +++ b/debian/emacs-snapshot.sh @@ -1,3 +1,8 @@ +# We install this script rather than using update-alternatives because +# whatever is providing /usr/bin/emacs is used to bytecompile files +# for Debian's packaged builds of Emacs, and there could be +# incompatibilities if emacs-snapshot builds were invoked to do that. + if [ "`id -u`" -ne 0 ]; then PATH=/opt/emacs-snapshot/bin:$PATH fi -- cgit v1.2.3 From a9938b214cb881ba9769cb6923d016580fe17c51 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Tue, 3 Jan 2023 11:15:34 -0700 Subject: d/merge-snapshot: Fix matching AC_INIT line in configure.ac --- debian/changelog | 1 + debian/merge-snapshot | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 981a91c3d2d..2699ac5ea72 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ emacs-snapshot (29.1~git20221203.2) UNRELEASED; urgency=medium * d/merge-snapshot: Find merge base with origin/emacs-29, not origin/master. + * d/merge-snapshot: Fix matching AC_INIT line in configure.ac. * d/emacs-snapshot.sh: Add comment regarding update-alternatives. -- Sean Whitton Tue, 03 Jan 2023 11:10:46 -0700 diff --git a/debian/merge-snapshot b/debian/merge-snapshot index 5da65344e76..6e686307c8e 100755 --- a/debian/merge-snapshot +++ b/debian/merge-snapshot @@ -29,7 +29,7 @@ my $major_version; open my $fh, "<", catfile $git->dir, "configure.ac"; for (<$fh>) { $major_version = $1, last - if /AC_INIT\(\[GNU Emacs\], \[([0-9]+)\.0\.50\],/ + if /AC_INIT\(\[GNU Emacs\], \[([0-9]+)\.0\.[56]0\],/ } $major_version or die "couldn't extract devel major version number"; -- cgit v1.2.3 From 44f66ccb93a9401e2be30003af95a5ad8afa6ab8 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Tue, 3 Jan 2023 11:15:41 -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 2699ac5ea72..dbc1f1a9d30 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,11 @@ -emacs-snapshot (29.1~git20221203.2) UNRELEASED; urgency=medium +emacs-snapshot (29.1~git20230103.1) UNRELEASED; urgency=medium + * Package git snapshot. * d/merge-snapshot: Find merge base with origin/emacs-29, not origin/master. * d/merge-snapshot: Fix matching AC_INIT line in configure.ac. * d/emacs-snapshot.sh: Add comment regarding update-alternatives. - -- Sean Whitton Tue, 03 Jan 2023 11:10:46 -0700 + -- Sean Whitton Tue, 03 Jan 2023 11:15:41 -0700 emacs-snapshot (29.1~git20221203.1) unstable; urgency=medium -- cgit v1.2.3 From 5bf195aace31dacda96651a576c3afaa3fc3f346 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Tue, 3 Jan 2023 11:48:47 -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 dbc1f1a9d30..d4c86155569 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -emacs-snapshot (29.1~git20230103.1) UNRELEASED; urgency=medium +emacs-snapshot (29.1~git20230103.1) unstable; urgency=medium * Package git snapshot. * d/merge-snapshot: Find merge base with origin/emacs-29, not origin/master. * d/merge-snapshot: Fix matching AC_INIT line in configure.ac. * d/emacs-snapshot.sh: Add comment regarding update-alternatives. - -- Sean Whitton Tue, 03 Jan 2023 11:15:41 -0700 + -- Sean Whitton Tue, 03 Jan 2023 11:48:45 -0700 emacs-snapshot (29.1~git20221203.1) unstable; urgency=medium -- cgit v1.2.3