[elpa] externals/gpr-query 9619300ce2 2/2: Resolve conflicts, finish merge

[Stephen Leake]

branch: externals/gpr-query
commit 9619300ce22062e2677b0536e7b69dca182f316e
Merge: d50f92fe46 bae92cd621
Author: Stephen Leake <stephen_leake@stephe-leake.org>
Commit: Stephen Leake <stephen_leake@stephe-leake.org>

    Resolve conflicts, finish merge
---
 .elpaignore    |  7 +++++++
 .gitignore     |  2 ++
 ELPA.make      |  5 ++++-
 NEWS           |  2 ++
 gpr-query.texi |  8 --------
 install.sh     |  6 +-----
 notes.text     | 34 +---------------------------------
 7 files changed, 17 insertions(+), 47 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/.gitignore b/.gitignore
index 4eac78d3ce..2f96d82e64 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,5 @@ bin/
 config/
 *.elc
 obj/
+gpr-query.html
+gpr-query.info
diff --git a/ELPA.make b/ELPA.make
index ab49dfabe8..fc651b1f8b 100644
--- a/ELPA.make
+++ b/ELPA.make
@@ -6,7 +6,7 @@
 
 all : build byte-compile autoloads docs
 
-docs : gpr-query.info
+docs : gpr-query.info gpr-query.html
 
 build : config/emacs_gpr_query_config.gpr force
        gprbuild -p -j8 emacs_gpr_query.gpr
@@ -38,6 +38,9 @@ autoloads : force
 %.info : %.texi
        makeinfo $< -o $@
 
+%.html : %.texi
+       makeinfo --html --no-split $< -o $@
+
 clean : force
        rm -rf gpr-query.info obj gpr_query$(EXE_EXT)
 
diff --git a/NEWS b/NEWS
index c012ed1d03..6e7c7fc87e 100644
--- a/NEWS
+++ b/NEWS
@@ -16,6 +16,8 @@ Please send gpr-query bug reports to bug-gnu-emacs@gnu.org, 
with
 
 ** Fix Alire build
 
+** ELPA packaging fix.
+
 * gpr-query 1.0.2
 5 Jan 2023
 
diff --git a/gpr-query.texi b/gpr-query.texi
index f7e6a68638..0f5f23d873 100644
--- a/gpr-query.texi
+++ b/gpr-query.texi
@@ -23,14 +23,6 @@ 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.4
-@page
-@vskip 0pt plus 1filll
-@insertcopying
-@end titlepage
-
 @contents
 
 @ifnottex
diff --git a/install.sh b/install.sh
index b6d6c25113..f12b5a1f0f 100755
--- a/install.sh
+++ b/install.sh
@@ -4,10 +4,6 @@
 # See build.sh for build (must be run before install).
 
 # $1 : optional <install dir>
-#
-# If you don't have write permission in the GNAT installation
-# directory, you need to use --prefix=<dir>, or run with root
-# privileges.
 
 if [ x$1 = x ]; then
     PREFIX=$HOME/.local        
@@ -19,7 +15,7 @@ fi
 echo "installing gpr-query executables to" $PREFIX/bin
 
 if type alr; then
-    cp emacs_gpr_query/bin/* $PREFIX/bin
+    cp emacs_gpr_query*/bin/* $PREFIX/bin
 
 elif type gprbuild; then
     cp bin/* $PREFIX/bin
diff --git a/notes.text b/notes.text
index 1032e52798..d265c98158 100644
--- a/notes.text
+++ b/notes.text
@@ -13,27 +13,7 @@ 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: nnn@debbugs.gnu.org
-        subject: from bug title, for people who rely on that.
-    if fixed in devel sources, add 'pending' tag:
-        control@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.
 
@@ -51,24 +31,12 @@ Check copyright on files in elpa
     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:
         package-requires:
 
     NEWS
-        if not done above
-
     gpr-query.texi
-        @title
         @node top
 
     README