branch: externals/gpr-query commit 258710222a85130a46c4b7ed927c797265ca63f4 Author: Stephen Leake <stephen_le...@stephe-leake.org> Commit: Stephen Leake <stephen_le...@stephe-leake.org>
Resolve conflicts, finish merge --- .elpaignore | 7 +++++++ NEWS | 2 ++ README | 2 +- gpr-query.el | 2 +- gpr-query.texi | 10 +--------- notes.text | 49 +------------------------------------------------ 6 files changed, 13 insertions(+), 59 deletions(-) diff --git a/.elpaignore b/.elpaignore index ce56bc2095..d295b43551 100644 --- a/.elpaignore +++ b/.elpaignore @@ -1 +1,8 @@ alire.toml +Alire.make +ELPA.make +emacs_gpr_query_config_devel.gpr +emacs_gpr_query_config_release.gpr +gpr-query.prj +prj.el +notes.text diff --git a/NEWS b/NEWS index ffbe0eb981..bd06436b64 100644 --- a/NEWS +++ b/NEWS @@ -11,6 +11,8 @@ Please send gpr-query bug reports to bug-gnu-em...@gnu.org, with ** Fix Alire build +** ELPA packaging fix. + * gpr-query 1.0.2 5 Jan 2023 diff --git a/README b/README index 72eb0d377f..eec20eae4a 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -Emacs gpr-query version 1.0.2 +Emacs gpr-query version 1.0.3 gpr-query provides an emacs xref backend using the cross-reference information output by the AdaCore GNAT compiler. diff --git a/gpr-query.el b/gpr-query.el index 3d02a15c5c..89bbe8f3da 100644 --- a/gpr-query.el +++ b/gpr-query.el @@ -8,7 +8,7 @@ ;; Author: Stephen Leake <stephen_le...@member.fsf.org> ;; Maintainer: Stephen Leake <stephen_le...@member.fsf.org> ;; Version: 1.0.3 -;; package-requires: ((emacs "25.3") (wisi "4.2.2") (gnat-compiler "1.0.2")) +;; package-requires: ((emacs "25.3") (wisi "4.2.0") (gnat-compiler "1.0.1")) ;; This file is part of GNU Emacs. diff --git a/gpr-query.texi b/gpr-query.texi index c5205f69e8..92fcafaca7 100644 --- a/gpr-query.texi +++ b/gpr-query.texi @@ -23,21 +23,13 @@ developing GNU and promoting software freedom.'' * gpr-query: (gpr-query). Minor mode providing cross-reference information from the GNAT compiler. @end direntry -@titlepage -@sp 10 -@title gpr-query Version 1.0.2 -@page -@vskip 0pt plus 1filll -@insertcopying -@end titlepage - @contents @ifnottex @node Top, Overview, (dir), (dir) @top Top -gpr-query Version 1.0.2 +gpr-query Version 1.0.3 @end ifnottex @menu diff --git a/notes.text b/notes.text index da08dd3230..c7c3834743 100644 --- a/notes.text +++ b/notes.text @@ -13,61 +13,14 @@ o.e.gpr-query: release, in use current work release process -keep status in ~/projects.text - -check for ELPA patches by others - (dvc-state-one "/Projects/elpa/packages/gpr-query") - (dvc-pull "/Projects/elpa") - (dvc-sync-review "/Projects/elpa") - update - clean, quit sync - cd c:/Projects/elpa - git log -2 -- packages/gpr-query - if changes: - (dvc-log "/Projects/elpa/packages/<dir>/<file>") - apply changes to current - -check emacs buglist - https://debbugs.gnu.org/cgi/pkgreport.cgi?package=gpr-query - to update a bug: n...@debbugs.gnu.org - subject: from bug title, for people who rely on that. - if fixed in devel sources, add 'pending' tag: - cont...@debbugs.gnu.org - tags nnn + pending +See ada-mode notes; only gpr-query specific details listed here. tested in ada-mode; it uses the same test sources for multiple xref backends. -compare: - (ediff-directories "/Projects/elpa_release/gpr-query" "/Projects/elpa/packages/gpr-query" nil) - NEWS - copyright date - add release date - add new features - -ELPA.make all - -Check copyright on files in elpa - ../../GNUMakefile check/gpr-query - if any gpr-query files added to output, fix them (add or change to FSF) - bump version - Gnu ELPA requires single digits between dots in versions - - bump if _any_ changes other than autoloads, so ELPA package handler knows to update - bump third digit for bug fixes, minor features, no user-incompatible changes - bump second digit for major features, mostly backward-compatible - or if third digit gets to 10 - - bump first digit for really major elisp user-visible changes: - gpr-query.el - Version: - NEWS - if not done above - gpr-query.texi - @title @node top README