From b91e1001b6b80c36a7d64e586a937a87ed6e065a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Mat=C3=ADas=20Fonzo?= Date: Fri, 25 Dec 2020 21:09:07 -0300 Subject: [PATCH] qi: Bump to release 2.3 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Matías Fonzo --- qi/Makefile | 17 +++--- qi/NEWS | 12 +++++ qi/doc/{qi.texi => qi-content.texi} | 103 ++++++------------------------------ qi/doc/qi-header.texi | 83 +++++++++++++++++++++++++++++ qi/doc/qi.1 | 2 +- qi/doc/qi.html | 45 ++++++++-------- qi/doc/qi.info | 64 +++++++++++----------- recipes/tools/qi/recipe | 2 +- sources/SOURCELIST.txt | 2 +- sources/qi-2.2.tar.lz.sha256 | 1 - sources/qi-2.3.tar.lz.sha256 | 1 + 11 files changed, 178 insertions(+), 154 deletions(-) rename qi/doc/{qi.texi => qi-content.texi} (94%) create mode 100644 qi/doc/qi-header.texi delete mode 100644 sources/qi-2.2.tar.lz.sha256 create mode 100644 sources/qi-2.3.tar.lz.sha256 diff --git a/qi/Makefile b/qi/Makefile index 5f23740a..db92db0c 100644 --- a/qi/Makefile +++ b/qi/Makefile @@ -15,7 +15,7 @@ # limitations under the License. project = qi -version = 2.2 +version = 2.3 ## DO NOT MAKE CHANGES HERE. # @@ -102,12 +102,12 @@ doc : info man html info : doc/$(project).info -doc/$(project).info : doc/$(project).texi - cd doc && env LANG=C $(MAKEINFO) $(project).texi +doc/$(project).info : doc/$(project)-header.texi doc/$(project)-content.texi + cd doc && env LANG=C $(MAKEINFO) $(project)-header.texi -o $(project).info man : doc/qi.1 -doc/qi.1 : doc/qi.1.in +doc/qi.1 : doc/qi.1.in src/qi.in help2man ${HELP2MAN_OPTS} \ --name="a simple but well-integrated package manager" \ --info-page=qi \ @@ -116,9 +116,9 @@ doc/qi.1 : doc/qi.1.in html : doc/$(project).html -doc/$(project).html : doc/$(project).texi - cd doc && env LC_ALL=C $(MAKEINFO) --html --no-split \ - $(project).texi +doc/$(project).html : doc/$(project)-header.texi doc/$(project)-content.texi + cd doc && env LANG=C $(MAKEINFO) --html --no-split \ + $(project)-header.texi -o $(project).html dist : doc rm -f $(DISTNAME) @@ -137,7 +137,8 @@ dist : doc $(DISTNAME)/doc/qi.1.in \ $(DISTNAME)/doc/$(project).html \ $(DISTNAME)/doc/$(project).info \ - $(DISTNAME)/doc/$(project).texi \ + $(DISTNAME)/doc/$(project)-header.texi \ + $(DISTNAME)/doc/$(project)-content.texi \ $(DISTNAME)/doc/recipe1 \ $(DISTNAME)/doc/recipe2 \ $(DISTNAME)/doc/recipe3 \ diff --git a/qi/NEWS b/qi/NEWS index 8498f761..c5ba604b 100644 --- a/qi/NEWS +++ b/qi/NEWS @@ -1,3 +1,15 @@ +2020-12-25 Matias Fonzo + + * Version 2.3 released. + + * doc: The general documentation of Qi has been divided to allow its + inclusion from other .texi files. This does not affect the internal + functioning of Qi or the reading of the documentation for the user, + but rather it prepares for the incoming Dragora Handbook (Dragora is + the project from which Qi is currently developed). + + * Minor changes. + 2020-11-09 Matias Fonzo * Version 2.2 released. diff --git a/qi/doc/qi.texi b/qi/doc/qi-content.texi similarity index 94% rename from qi/doc/qi.texi rename to qi/doc/qi-content.texi index 4b62499c..526e25e3 100644 --- a/qi/doc/qi.texi +++ b/qi/doc/qi-content.texi @@ -1,80 +1,15 @@ -\input texinfo @c -*-texinfo-*- -@comment $Id@w{$} -@comment %**start of header -@setfilename qi.info -@settitle Qi user guide -@documentencoding ISO-8859-1 -@syncodeindex pg cp -@comment %**end of header - -@set VERSION 2.2 -@set UPDATED 09 Nov 2020 - -@copying -This user guide is for Qi (version @value{VERSION}, -@value{UPDATED}), which is a simple but well-integrated package manager. - -Copyright @copyright{} 2019-2020 Matias Andres Fonzo, Santiago del Estero, -Argentina. - -@quotation -Permission is granted to copy, distribute and/or modify this document -under the terms of the GNU Free Documentation License, Version 1.3 or -any later version published by the Free Software Foundation; with no -Invariant Sections, with no Front-Cover Texts, and with no Back-Cover -Texts. A copy of the license is included in the section entitled -``GNU Free Documentation License''. -@end quotation -@end copying - -@dircategory Package management -@direntry -* Qi: (qi). A user-friendly package manager. -@end direntry - -@titlepage -@finalout -@title Qi -@subtitle for version @value{VERSION}, @value{UPDATED} -@author Matias Fonzo (@email{selk@@dragora.org}) - -@page -@vskip 0pt plus 1filll -@insertcopying -@end titlepage - -@contents - -@ifnottex -@node Top -@top - -This user guide is for Qi (version @value{VERSION}, -@value{UPDATED}). -@end ifnottex - -@menu -* Introduction:: Description and features of qi -* Invoking qi:: Command-line options -* The qirc file:: Configuration file -* Packages:: Managing packages -* Recipes:: Building packages -* Order files:: Handling build order -* Creating packages:: Making Qi packages -* Examining packages:: Debugging purposes -* Exit status:: Exit codes -* Index:: -@end menu - -@sp 1 -Copyright (C) 2019-2020 Matias Fonzo. - -Qi's home page can be found at @uref{https://www.dragora.org}. -@w{Send bug reports or suggestions to @email{dragora-users@@nongnu.org}.} - -@node Introduction -@chapter Introduction -@cindex introduction +@c -*-texinfo-*- +@c qi-content.texi +@c This is part of the Qi user guide. +@c Copyright (C) 2019-2020 Matias Fonzo, . +@c See the file qi-header.texi for copying conditions. +@c +@c If something is modified here, be aware of the increase of VERSION in +@c qi-header.texi, this will produce the result of the manual: qi.info + +@node Introduction to Qi +@chapter Introduction to Qi +@cindex introduction to qi Qi is a simple but well-integrated package manager. It can create, install, remove, and upgrade software packages. Qi produces binary @@ -282,7 +217,7 @@ support not available, etc), 2 to indicate a command execution error; 3 for integrity check error on compressed files, 4 for empty, not regular, or expected files, 5 for empty or not defined variables, 6 when a package already exist, 10 for network manager errors. -For more details, see the @ref{Exit status} section. +For more details, see the @ref{Qi exit status} section. @node The qirc file @@ -1159,8 +1094,8 @@ Note: the creation of the custom directory is influenced by the value of the @env{TMPDIR} variable. -@node Exit status -@chapter Exit status +@node Qi exit status +@chapter Qi exit status @cindex exit codes All the exit codes are described in this chapter. @@ -1245,11 +1180,3 @@ Network manager error: This code is used if the network downloader tool fails for some reason. @end table - -@node Index -@unnumbered Index - -@printindex cp - -@bye - diff --git a/qi/doc/qi-header.texi b/qi/doc/qi-header.texi new file mode 100644 index 00000000..47e0631b --- /dev/null +++ b/qi/doc/qi-header.texi @@ -0,0 +1,83 @@ +\input texinfo @c -*-texinfo-*- +@comment $Id@w{$} +@comment %**start of header +@setfilename qi.info +@settitle Qi user guide +@documentencoding ISO-8859-1 +@syncodeindex pg cp +@comment %**end of header + +@set VERSION 2.3 +@set UPDATED 25 Dec 2020 + +@copying +This user guide is for Qi (version @value{VERSION}, +@value{UPDATED}), which is a simple but well-integrated package manager. + +Copyright @copyright{} 2019-2020 Matias Andres Fonzo, Santiago del Estero, +Argentina. + +@quotation +Permission is granted to copy, distribute and/or modify this document +under the terms of the GNU Free Documentation License, Version 1.3 or +any later version published by the Free Software Foundation; with no +Invariant Sections, with no Front-Cover Texts, and with no Back-Cover +Texts. A copy of the license is included in the section entitled +``GNU Free Documentation License''. +@end quotation +@end copying + +@dircategory Package management +@direntry +* Qi: (qi). A user-friendly package manager. +@end direntry + +@titlepage +@finalout +@title Qi +@subtitle for version @value{VERSION}, @value{UPDATED} +@author Matias Fonzo (@email{selk@@dragora.org}) + +@page +@vskip 0pt plus 1filll +@insertcopying +@end titlepage + +@contents + +@ifnottex +@node Top +@top + +This user guide is for Qi (version @value{VERSION}, +@value{UPDATED}). +@end ifnottex + +@menu +* Introduction to Qi:: Description and features of qi +* Invoking qi:: Command-line options +* The qirc file:: Configuration file +* Packages:: Managing packages +* Recipes:: Building packages +* Order files:: Handling build order +* Creating packages:: Making Qi packages +* Examining packages:: Debugging purposes +* Qi exit status:: Exit codes +* Index:: +@end menu + +@sp 1 +Copyright (C) 2019-2020 Matias Fonzo. + +Qi's home page can be found at @uref{https://www.dragora.org}. +@w{Send bug reports or suggestions to @email{dragora-users@@nongnu.org}.} + +@include qi-content.texi + +@node Index +@unnumbered Index + +@printindex cp + +@bye + diff --git a/qi/doc/qi.1 b/qi/doc/qi.1 index b5cf6c17..44449b5d 100644 --- a/qi/doc/qi.1 +++ b/qi/doc/qi.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.16. -.TH QI "1" "November 2020" "qi 2.2" "User Commands" +.TH QI "1" "December 2020" "qi 2.3" "User Commands" .SH NAME qi \- a simple but well-integrated package manager .SH SYNOPSIS diff --git a/qi/doc/qi.html b/qi/doc/qi.html index 079079f6..b4271820 100644 --- a/qi/doc/qi.html +++ b/qi/doc/qi.html @@ -1,7 +1,7 @@ -

+
- +

Next: , Previous: , Up: Top   [Contents][Index]

- -

1 Introduction

- + +

1 Introduction to Qi

+

Qi is a simple but well-integrated package manager. It can create, install, remove, and upgrade software packages. Qi produces binary @@ -173,7 +174,7 @@ to be found in any Unix-like system.

-Next: , Previous: , Up: Top   [Contents][Index]

+Next: , Previous: , Up: Top   [Contents][Index]

2 Invoking qi

@@ -386,7 +387,7 @@ support not available, etc), 2 to indicate a command execution error; 3 for integrity check error on compressed files, 4 for empty, not regular, or expected files, 5 for empty or not defined variables, 6 when a package already exist, 10 for network manager errors. -For more details, see the Exit status section. +For more details, see the Qi exit status section.

@@ -1233,7 +1234,7 @@ written into ‘/var/cache/qi/packages/’.

-Next: , Previous: , Up: Top   [Contents][Index]

+Next: , Previous: , Up: Top   [Contents][Index]

8 Examining packages

@@ -1264,13 +1265,13 @@ of the TMPDIR variable.

- +

Next: , Previous: , Up: Top   [Contents][Index]

- -

9 Exit status

+ +

9 Qi exit status

All the exit codes are described in this chapter. @@ -1368,7 +1369,7 @@ variables coming from a recipe or assigned arrays that are tested).

-Previous: , Up: Top   [Contents][Index]

+Previous: , Up: Top   [Contents][Index]

Index

@@ -1404,13 +1405,13 @@ Previous: , Up: <
E environment variables: Recipes -exit codes: Exit status +exit codes: Qi exit status
H handling build order: Order files
I -introduction: Introduction +introduction to qi: Introduction to Qi invocation: Invoking qi
M diff --git a/qi/doc/qi.info b/qi/doc/qi.info index 4e0f2638..06b3fd29 100644 --- a/qi/doc/qi.info +++ b/qi/doc/qi.info @@ -1,6 +1,6 @@ -This is qi.info, produced by makeinfo version 6.5 from qi.texi. +This is qi.info, produced by makeinfo version 6.5 from qi-header.texi. -This user guide is for Qi (version 2.2, 09 Nov 2020), which is a simple +This user guide is for Qi (version 2.3, 25 Dec 2020), which is a simple but well-integrated package manager. Copyright © 2019-2020 Matias Andres Fonzo, Santiago del Estero, @@ -18,16 +18,16 @@ START-INFO-DIR-ENTRY END-INFO-DIR-ENTRY  -File: qi.info, Node: Top, Next: Introduction, Up: (dir) +File: qi.info, Node: Top, Next: Introduction to Qi, Up: (dir) Qi user guide ************* -This user guide is for Qi (version 2.2, 09 Nov 2020). +This user guide is for Qi (version 2.3, 25 Dec 2020). * Menu: -* Introduction:: Description and features of qi +* Introduction to Qi:: Description and features of qi * Invoking qi:: Command-line options * The qirc file:: Configuration file * Packages:: Managing packages @@ -35,7 +35,7 @@ This user guide is for Qi (version 2.2, 09 Nov 2020). * Order files:: Handling build order * Creating packages:: Making Qi packages * Examining packages:: Debugging purposes -* Exit status:: Exit codes +* Qi exit status:: Exit codes * Index:: @@ -45,10 +45,10 @@ This user guide is for Qi (version 2.2, 09 Nov 2020). Send bug reports or suggestions to .  -File: qi.info, Node: Introduction, Next: Invoking qi, Prev: Top, Up: Top +File: qi.info, Node: Introduction to Qi, Next: Invoking qi, Prev: Top, Up: Top -1 Introduction -************** +1 Introduction to Qi +******************** Qi is a simple but well-integrated package manager. It can create, install, remove, and upgrade software packages. Qi produces binary @@ -70,7 +70,7 @@ dependencies for the magic: graft(1) and tarlz(1), the rest is expected to be found in any Unix-like system.  -File: qi.info, Node: Invoking qi, Next: The qirc file, Prev: Introduction, Up: Top +File: qi.info, Node: Invoking qi, Next: The qirc file, Prev: Introduction to Qi, Up: Top 2 Invoking qi ************* @@ -246,7 +246,7 @@ usage, support not available, etc), 2 to indicate a command execution error; 3 for integrity check error on compressed files, 4 for empty, not regular, or expected files, 5 for empty or not defined variables, 6 when a package already exist, 10 for network manager errors. For more -details, see the *note Exit status:: section. +details, see the *note Qi exit status:: section.  File: qi.info, Node: The qirc file, Next: Packages, Prev: Invoking qi, Up: Top @@ -968,7 +968,7 @@ written into '/var/cache/qi/packages/'. All packages produced are complemented by a checksum file (.sha256).  -File: qi.info, Node: Examining packages, Next: Exit status, Prev: Creating packages, Up: Top +File: qi.info, Node: Examining packages, Next: Qi exit status, Prev: Creating packages, Up: Top 8 Examining packages ******************** @@ -994,10 +994,10 @@ Note: the creation of the custom directory is influenced by the value of the 'TMPDIR' variable.  -File: qi.info, Node: Exit status, Next: Index, Prev: Examining packages, Up: Top +File: qi.info, Node: Qi exit status, Next: Index, Prev: Examining packages, Up: Top -9 Exit status -************* +9 Qi exit status +**************** All the exit codes are described in this chapter. @@ -1069,7 +1069,7 @@ All the exit codes are described in this chapter. reason.  -File: qi.info, Node: Index, Prev: Exit status, Up: Top +File: qi.info, Node: Index, Prev: Qi exit status, Up: Top Index ***** @@ -1079,9 +1079,9 @@ Index * configuration file: The qirc file. (line 6) * environment variables: Recipes. (line 281) -* exit codes: Exit status. (line 6) +* exit codes: Qi exit status. (line 6) * handling build order: Order files. (line 6) -* introduction: Introduction. (line 6) +* introduction to qi: Introduction to Qi. (line 6) * invocation: Invoking qi. (line 6) * managing packages: Packages. (line 6) * package blacklist: Packages. (line 189) @@ -1101,20 +1101,20 @@ Index  Tag Table: -Node: Top803 -Node: Introduction1584 -Node: Invoking qi2753 -Node: The qirc file6872 -Node: Packages7836 -Ref: Packages-Footnote-115512 -Ref: Packages-Footnote-215614 -Node: Recipes15727 -Ref: Recipes-Footnote-131244 -Node: Order files31389 -Node: Creating packages32710 -Node: Examining packages33698 -Node: Exit status34611 -Node: Index36472 +Node: Top810 +Node: Introduction to Qi1597 +Node: Invoking qi2784 +Node: The qirc file6912 +Node: Packages7876 +Ref: Packages-Footnote-115552 +Ref: Packages-Footnote-215654 +Node: Recipes15767 +Ref: Recipes-Footnote-131284 +Node: Order files31429 +Node: Creating packages32750 +Node: Examining packages33738 +Node: Qi exit status34654 +Node: Index36524  End Tag Table diff --git a/recipes/tools/qi/recipe b/recipes/tools/qi/recipe index 50b9f94c..18d89ad8 100644 --- a/recipes/tools/qi/recipe +++ b/recipes/tools/qi/recipe @@ -18,7 +18,7 @@ set -e program=qi -version=2.2 +version=2.3 arch=noarch release=1 diff --git a/sources/SOURCELIST.txt b/sources/SOURCELIST.txt index cb9526a5..f2efba08 100644 --- a/sources/SOURCELIST.txt +++ b/sources/SOURCELIST.txt @@ -247,7 +247,7 @@ http://rsync.dragora.org/current/sources/tint2-20190714_7831350.tar.lz http://rsync.dragora.org/current/sources/udevil-20150504_ce9f1c5.tar.lz http://rsync.dragora.org/current/sources/xdg-utils-20190413_0547886.tar.lz http://rsync.dragora.org/current/sources/xorg-xf86-video-intel-20190927_c6cb1b19.tar.lz -http://rsync.dragora.org/v3/sources/qi-2.2.tar.lz +http://rsync.dragora.org/v3/sources/qi-2.3.tar.lz http://rubygems.org/downloads/asciidoctor-2.0.10.gem http://savannah.c3sl.ufpr.br/libpipeline/libpipeline-1.5.1.tar.gz http://sethwklein.net/iana-etc-2.30.tar.bz2 diff --git a/sources/qi-2.2.tar.lz.sha256 b/sources/qi-2.2.tar.lz.sha256 deleted file mode 100644 index 0b820070..00000000 --- a/sources/qi-2.2.tar.lz.sha256 +++ /dev/null @@ -1 +0,0 @@ -3a54c3489e70a4c1da3ebe8cbd0dab0d9295b593985c75be20f620511ad8f62b qi-2.2.tar.lz diff --git a/sources/qi-2.3.tar.lz.sha256 b/sources/qi-2.3.tar.lz.sha256 new file mode 100644 index 00000000..c363b153 --- /dev/null +++ b/sources/qi-2.3.tar.lz.sha256 @@ -0,0 +1 @@ +132a7b5d8acf4fc9eefce4c4574207b0605ac1c43d2dfbd4f9ced5345663e261 qi-2.3.tar.lz -- 2.11.4.GIT