From 6afe85727d4ea9de398f86c02604ecc1fcb86abb Mon Sep 17 00:00:00 2001 From: =?utf8?q?Mat=C3=ADas=20Fonzo?= Date: Sat, 13 Aug 2022 17:08:52 -0300 Subject: [PATCH] qi: Bump to release candidate 2.10-rc5 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Matías Fonzo --- qi/Makefile | 2 +- qi/doc/qi-header.texi | 4 ++-- qi/doc/qi.1 | 2 +- qi/doc/qi.html | 4 ++-- qi/doc/qi.info | 2 +- qi/src/qi.in | 6 ++++++ recipes/tools/qi/recipe | 2 +- sources/SOURCELIST.txt | 2 +- sources/qi-2.10-rc4.tar.lz.sha256 | 1 - sources/qi-2.10-rc5.tar.lz.sha256 | 1 + stages/1/17-qi | 17 ++++------------- 11 files changed, 20 insertions(+), 23 deletions(-) delete mode 100644 sources/qi-2.10-rc4.tar.lz.sha256 create mode 100644 sources/qi-2.10-rc5.tar.lz.sha256 diff --git a/qi/Makefile b/qi/Makefile index c08b4f65..7e0d3a1c 100644 --- a/qi/Makefile +++ b/qi/Makefile @@ -15,7 +15,7 @@ # limitations under the License. project = qi -version = 2.10-rc4 +version = 2.10-rc5 ## DO NOT MAKE CHANGES HERE. # diff --git a/qi/doc/qi-header.texi b/qi/doc/qi-header.texi index 35b4e152..ad8bdce7 100644 --- a/qi/doc/qi-header.texi +++ b/qi/doc/qi-header.texi @@ -7,8 +7,8 @@ @syncodeindex pg cp @comment %**end of header -@set VERSION 2.10-rc4 -@set UPDATED 08 Aug 2022 +@set VERSION 2.10-rc5 +@set UPDATED 13 Aug 2022 @dircategory Package management @direntry diff --git a/qi/doc/qi.1 b/qi/doc/qi.1 index 93e1a1d2..bacf8898 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.49.2. -.TH QI "1" "August 2022" "qi 2.10-rc4" "User Commands" +.TH QI "1" "August 2022" "qi 2.10-rc5" "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 7a206acd..8fab7f96 100644 --- a/qi/doc/qi.html +++ b/qi/doc/qi.html @@ -58,8 +58,8 @@ Next: -

This user guide is for Qi (version 2.10-rc4, -08 Aug 2022). +

This user guide is for Qi (version 2.10-rc5, +13 Aug 2022).

• Introduction to Qi:  Description and features of qi diff --git a/qi/doc/qi.info b/qi/doc/qi.info index 65408a15..4ff90fab 100644 --- a/qi/doc/qi.info +++ b/qi/doc/qi.info @@ -11,7 +11,7 @@ File: qi.info, Node: Top, Next: Introduction to Qi, Up: (dir) Qi user guide ************* -This user guide is for Qi (version 2.10-rc4, 08 Aug 2022). +This user guide is for Qi (version 2.10-rc5, 13 Aug 2022). * Menu: diff --git a/qi/src/qi.in b/qi/src/qi.in index 97920194..bb62d934 100644 --- a/qi/src/qi.in +++ b/qi/src/qi.in @@ -942,6 +942,10 @@ mode_order() mode_upgrade() { + # Complain if the package cannot be well-read + + is_readable "$1" || exit 4 + # Complain if the package does not end in .tlz if ! fnmatch '*.tlz' "$1" @@ -950,6 +954,8 @@ mode_upgrade() exit 4 fi + # Make preparations to upgrade the package + echo "" echo "{^} Upgrading $1 ..." diff --git a/recipes/tools/qi/recipe b/recipes/tools/qi/recipe index 58a09102..990bb0be 100644 --- a/recipes/tools/qi/recipe +++ b/recipes/tools/qi/recipe @@ -18,7 +18,7 @@ set -e program=qi -version=2.10-rc4 +version=2.10-rc5 arch=noarch release=1 diff --git a/sources/SOURCELIST.txt b/sources/SOURCELIST.txt index 86337d25..7837cd2a 100644 --- a/sources/SOURCELIST.txt +++ b/sources/SOURCELIST.txt @@ -134,7 +134,7 @@ https://dragora.mirror.garr.it/current/sources/libuargp-20210611_1f92296.tar.lz https://dragora.mirror.garr.it/current/sources/lpppd-20210106_7454257.tar.lz https://dragora.mirror.garr.it/current/sources/musl-compat-20210503_77a1509.tar.lz https://dragora.mirror.garr.it/current/sources/perp-2.07.tar.gz -https://dragora.mirror.garr.it/current/sources/qi-2.10-rc4.tar.lz +https://dragora.mirror.garr.it/current/sources/qi-2.10-rc5.tar.lz https://dragora.mirror.garr.it/current/sources/shared-mime-info-20210729_3c064c8.tar.lz https://dragora.mirror.garr.it/current/sources/spacefm-20180304_e6f2918.tar.lz https://dragora.mirror.garr.it/current/sources/tdeaccessibility-20220503_d05857f.tar.lz diff --git a/sources/qi-2.10-rc4.tar.lz.sha256 b/sources/qi-2.10-rc4.tar.lz.sha256 deleted file mode 100644 index d7875b05..00000000 --- a/sources/qi-2.10-rc4.tar.lz.sha256 +++ /dev/null @@ -1 +0,0 @@ -46103c5ef657ec13a6d83f9e1ab3955ce5c576fca93b52efdf04db3f0b582809 qi-2.10-rc4.tar.lz diff --git a/sources/qi-2.10-rc5.tar.lz.sha256 b/sources/qi-2.10-rc5.tar.lz.sha256 new file mode 100644 index 00000000..41724166 --- /dev/null +++ b/sources/qi-2.10-rc5.tar.lz.sha256 @@ -0,0 +1 @@ +8f3c365fd58978a6c0a952c28b8434839d7c759ee9948ee607b36c694e78a89d qi-2.10-rc5.tar.lz diff --git a/stages/1/17-qi b/stages/1/17-qi index 5b95b16d..b91587c7 100755 --- a/stages/1/17-qi +++ b/stages/1/17-qi @@ -21,29 +21,20 @@ cd -- "${worktree}/qi" make -j1 clean ./configure \ - --prefix=/tools \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ --packagedir=/usr/pkg \ --targetdir=/ \ --arch=$package_arch -make -j1 install +make -j1 DESTDIR=/tools install # Clean up the source repository rm -f config.mak make -j1 clean -# Make "usr/pkg" directory and output -# directory for packages available -mkdir -p -- "${rootdir}/usr/pkg" "${rootdir}/var/cache/qi/packages" - -# Adjust prefixes in config for final system installation -sed -i \ - -e 's|/tools|/usr|g' \ - -e 's|/usr/etc|/etc|' \ - -e 's|/usr/var|/var|' \ - /tools/etc/qirc - # Set default compiler options for Dragora case $arch in i586) -- 2.11.4.GIT