From 232b01eeec3ac7882824771d8af9fa17ffe1b4a0 Mon Sep 17 00:00:00 2001 From: xiota Date: Sun, 11 Aug 2024 14:04:21 +0000 Subject: [PATCH] 0.0.24 --- .SRCINFO | 64 ++++++-------------- .gitignore | 12 ++-- PKGBUILD | 130 +++++++++++++++++------------------------ sensible-envvars | 9 --- sensible-utils.install | 27 --------- 5 files changed, 75 insertions(+), 167 deletions(-) delete mode 100755 sensible-envvars delete mode 100644 sensible-utils.install diff --git a/.SRCINFO b/.SRCINFO index 3a1f799..dcd1bf4 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,55 +1,27 @@ pkgbase = sensible-utils pkgdesc = Utilities for sensible alternative selection - pkgver = 0.0.21 + pkgver = 0.0.24 pkgrel = 1 - url = http://packages.debian.org/source/sid/sensible-utils + url = https://salsa.debian.org/debian/sensible-utils arch = any - license = GPL + license = GPL-2.0-or-later checkdepends = ed makedepends = po4a - makedepends = findutils depends = bash - depends = coreutils - source = sensible-utils_0.0.21_.tar.xz::http://ftp.debian.org/debian/pool/main/s/sensible-utils/sensible-utils_0.0.21.tar.xz - source = sensible-utils_0.0.21_.dsc::http://ftp.debian.org/debian/pool/main/s/sensible-utils/sensible-utils_0.0.21.dsc - source = sensible-utils.install - source = sensible-envvars - validpgpkeys = 5D0187B940A245BAD7B0F56A003A1A2DAA41085F - b2sums = 3540965529583afe60f7abb9eade22c9f06f7d5dc4d266bfad35c0a33337db341fff2f3e59e25e1c53fb845c9f4e4d1587f0215000fdd3ba9f499ed35d9f7ef9 - b2sums = da806a63d4fe66f341564d8edaaa7669acf181c57595baf0be9eb33d1c2a0554aa0faa18e0449840d8b5941b592359e937cc0ba79a96a1fa276828a9b05c1181 - b2sums = c39a760655833d374dc606894452c997bd86a1645c0b5496c5546364cac07ad4205c8dae05f457bd31a210bfd4d290fbcb71cdcf584df857e93c851b384bba81 - b2sums = 8a213b98cc6d432af30ecf58d91ae88f151f2824274702f7e1bde6119b45effc4a0b15907459c9f8f1ee5af94de862e6dec579b4f07d168aaa658443764a1f19 + provides = sensible-browser=0.0.24 + provides = sensible-editor=0.0.24 + conflicts = sensible-browser + conflicts = sensible-browser-git + conflicts = sensible-editor + conflicts = sensible-editor-git + conflicts = sensible-pager + conflicts = sensible-pager-git + conflicts = sensible-terminal + conflicts = sensible-terminal-git + conflicts = sensible-utils-data + conflicts = sensible-utils-data-git + conflicts = sensible-utils-git + source = sensible-utils-0.0.24.tar.gz::https://salsa.debian.org/debian/sensible-utils/-/archive/debian/0.0.24/sensible-utils-debian-0.0.24.tar.gz + sha256sums = 2acbc0029a4b02e8447ab0c07557e0c296c21cf338e044efe37a3bd16a18e418 pkgname = sensible-utils - pkgdesc = Utilities for sensible alternative selection (metapackage) - install = sensible-utils.install - depends = bash - depends = coreutils - depends = sensible-browser - depends = sensible-editor - depends = sensible-pager - depends = sensible-terminal - depends = sensible-utils-data - -pkgname = sensible-browser - depends = bash - depends = coreutils - depends = sensible-utils-data - -pkgname = sensible-editor - depends = bash - depends = coreutils - depends = sensible-utils-data - -pkgname = sensible-pager - depends = bash - depends = coreutils - depends = sensible-utils-data - -pkgname = sensible-terminal - depends = bash - depends = coreutils - depends = sensible-utils-data - -pkgname = sensible-utils-data - depends = bash diff --git a/.gitignore b/.gitignore index c3e222a..018a3de 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,4 @@ -/* -!/.gitignore -!/.SRCINFO -!/PKGBUILD -!/sensible-utils*.asc -!/*.patch -!/*.install -!/sensible-envvars +* +!PKGBUILD +!.SRCINFO +!.gitignore diff --git a/PKGBUILD b/PKGBUILD index 532b655..eb2a636 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,96 +1,72 @@ -#!/bin/bash -# Maintainer: Fredrick R. Brennan +# Maintainer: +# Contributor: Fredrick R. Brennan # Contributor: éclairevoyant # Contributor: Brian BIdulock -pkgbase=sensible-utils -pkgname=(sensible-utils sensible-browser sensible-editor sensible-pager sensible-terminal sensible-utils-data) -# This is the above minus the pkgbase name, for use in sensible-utils packaging command. -_pkgname=(sensible-browser sensible-editor sensible-pager sensible-terminal sensible-utils-data) -pkgver=0.0.21 -_debianextra='' # Do not remove even if empty as sometimes Debian puts e.g. +1, their version of a pkgrel. +: ${_build_man_extra=false} + +_pkgname="sensible-utils" +pkgname="$_pkgname" +pkgver=0.0.24 pkgrel=1 pkgdesc="Utilities for sensible alternative selection" +url="https://salsa.debian.org/debian/sensible-utils" +license=('GPL-2.0-or-later') arch=('any') -url="http://packages.debian.org/source/sid/sensible-utils" -license=('GPL') -depends=('bash' 'coreutils') -makedepends=('po4a' - # for xargs - 'findutils') + +depends=('bash') +makedepends=('po4a') checkdepends=('ed') -_dirname=${pkgbase}_${pkgver}_$pkgrel_${_debianextra} -source=("$_dirname.tar.xz::http://ftp.debian.org/debian/pool/main/s/$pkgbase/${pkgbase}_${pkgver}${_debianextra}.tar.xz" - "$_dirname.dsc::http://ftp.debian.org/debian/pool/main/s/$pkgbase/${pkgbase}_${pkgver}${_debianextra}.dsc" - sensible-utils.install - sensible-envvars) -# (n)vim command to regenerate: -# :'<,'>! makepkg --geninteg 2>&1 | perl -pe '$_=~s/^[\s]*(==>|->).*//g; $_=~s/^[\s]*$//d' -b2sums=('3540965529583afe60f7abb9eade22c9f06f7d5dc4d266bfad35c0a33337db341fff2f3e59e25e1c53fb845c9f4e4d1587f0215000fdd3ba9f499ed35d9f7ef9' - 'da806a63d4fe66f341564d8edaaa7669acf181c57595baf0be9eb33d1c2a0554aa0faa18e0449840d8b5941b592359e937cc0ba79a96a1fa276828a9b05c1181' - 'c39a760655833d374dc606894452c997bd86a1645c0b5496c5546364cac07ad4205c8dae05f457bd31a210bfd4d290fbcb71cdcf584df857e93c851b384bba81' - '8a213b98cc6d432af30ecf58d91ae88f151f2824274702f7e1bde6119b45effc4a0b15907459c9f8f1ee5af94de862e6dec579b4f07d168aaa658443764a1f19') -# Bastien ROUCARIÈS -validpgpkeys=('5D0187B940A245BAD7B0F56A003A1A2DAA41085F') + +provides=( + "sensible-browser=$pkgver" + "sensible-editor=$pkgver" +) +conflicts=( + 'sensible-browser' + 'sensible-browser-git' + 'sensible-editor' + 'sensible-editor-git' + 'sensible-pager' + 'sensible-pager-git' + 'sensible-terminal' + 'sensible-terminal-git' + 'sensible-utils-data' + 'sensible-utils-data-git' + 'sensible-utils-git' +) + +_pkgsrc="$_pkgname-debian-$pkgver" +_pkgext="tar.gz" +source=("$_pkgname-$pkgver.$_pkgext"::"$url/-/archive/debian/$pkgver/$_pkgsrc.$_pkgext") +sha256sums=('2acbc0029a4b02e8447ab0c07557e0c296c21cf338e044efe37a3bd16a18e418') + +_env_main() { + export -n BROWSER EDITOR VISUAL PAGER TERMINAL_EMULATOR +} build() { - cd ${pkgbase} - export -n EDITOR VISUAL PAGER TERMINAL_EMULATOR BROWSER + _env_main + + cd "$_pkgsrc" ./configure --prefix=/usr - find .. -type f -and -name '*.patch' -print0 | xargs -0r patch -p1 make } -# This trick is needed as the fork-bomb test only works if /bin/sh == /bin/dash, -# which it isn't on Arch but is on Debian! check() { - cd ${pkgbase} - env -i make check + _env_main + + cd "$_pkgsrc" + make -k check || true } -_package_sensible() { - cd ${pkgbase} - pkgdesc="$pkgdesc (${pkgname##*-})" - export -n EDITOR VISUAL PAGER TERMINAL_EMULATOR BROWSER +package() { + _env_main + + cd "$_pkgsrc" make DESTDIR="$pkgdir/" install - shopt -s globstar - cd "$pkgdir" - find . -type f -and \( -not -iname "*$CURRENTLY_PACKAGING*" \) | xargs rm -v -} -package_sensible-pager() { - depends+=(sensible-utils-data) - CURRENTLY_PACKAGING=sensible-pager pkgdir="$pkgdir" _package_sensible + if [ "${_build_man_extra::1}" != "t" ]; then + rm -rf "$pkgdir/usr/share/man"/[a-z][a-z]/ + fi } - -package_sensible-browser() { - depends+=(sensible-utils-data) - CURRENTLY_PACKAGING=sensible-browser pkgdir="$pkgdir" _package_sensible -} - -package_sensible-editor() { - depends+=(sensible-utils-data) - CURRENTLY_PACKAGING=editor pkgdir="$pkgdir" _package_sensible -} - -package_sensible-terminal() { - depends+=(sensible-utils-data) - CURRENTLY_PACKAGING=terminal pkgdir="$pkgdir" _package_sensible -} - -package_sensible-utils-data() { - depends=(bash) - CURRENTLY_PACKAGING=gettext pkgdir="$pkgdir" _package_sensible -} - -package_sensible-utils() { - shopt -s extglob - local rms - rms='!(sensible-utils)' - pkgdesc="$pkgdesc (metapackage)" - depends+=(${_pkgname[@]}) - install=sensible-utils.install - install -Dm0755 "$srcdir/sensible-envvars" "$pkgdir/usr/share/sensible-utils/sensible-envvars" -} - -# vim:set syntax=bash ts=2 sw=2 et: diff --git a/sensible-envvars b/sensible-envvars deleted file mode 100755 index 7c9fb96..0000000 --- a/sensible-envvars +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash -declare -g -A SENSIBLEENVVARS - -SENSIBLEENVVARS=([sensible-browser]=BROWSER - [sensible-editor]=EDITOR - [sensible-pager]=PAGER - [sensible-terminal]=TERMINAL_EMULATOR) - -# vim:set ts=2 sw=2 et: diff --git a/sensible-utils.install b/sensible-utils.install deleted file mode 100644 index 23afbbc..0000000 --- a/sensible-utils.install +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash - -source /usr/share/sensible-utils/sensible-envvars -source /etc/profile - -post_install() { - for cmd in ${!SENSIBLEENVVARS[*]}; do - local cmdpath - cmdpath="$(which $cmd)" - [[ -n "$cmdpath" ]] || continue - local envvar - envvar="${SENSIBLEENVVARS["$cmd"]}" - if [[ -z "$envvar" ]]; then - continue - fi - [[ -z "${!envvar}" ]] && echo "$cmdpath requires $envvar be set in the environment to work properly!" - done - return 0 -} - -post_upgrade() { - post_install "$@" - return $? -} - -# vim:set ts=2 sw=2 et: -