diff options
| author | A. Wilcox <awilcox@wilcox-tech.com> | 2020-06-21 20:08:00 +0000 |
|---|---|---|
| committer | A. Wilcox <awilcox@wilcox-tech.com> | 2020-06-21 20:08:00 +0000 |
| commit | e215aada623820354d91abadd43c53b5b9869509 (patch) | |
| tree | 51c3592c261663afb27aac5dc9e2e440653332a7 /system | |
| parent | f7f7951daabc324db9a74e513ee39a8653c22a1e (diff) | |
| parent | 561fb3e9d0b5b889501bc8893179add2d2afc882 (diff) | |
| download | packages-e215aada623820354d91abadd43c53b5b9869509.tar.gz packages-e215aada623820354d91abadd43c53b5b9869509.tar.bz2 packages-e215aada623820354d91abadd43c53b5b9869509.tar.xz packages-e215aada623820354d91abadd43c53b5b9869509.zip | |
Merge branch 'bump/sr.2020.06.18' into 'master'
Misc. bumps, 2020.06.18
See merge request adelie/packages!475
Diffstat (limited to 'system')
| -rw-r--r-- | system/ed/APKBUILD | 4 | ||||
| -rw-r--r-- | system/kbd/APKBUILD | 18 | ||||
| -rw-r--r-- | system/kbd/consolefont.confd | 4 | ||||
| -rw-r--r-- | system/kbd/keymaps.confd | 3 |
4 files changed, 11 insertions, 18 deletions
diff --git a/system/ed/APKBUILD b/system/ed/APKBUILD index d13ab5a2b..f57513f33 100644 --- a/system/ed/APKBUILD +++ b/system/ed/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=ed -pkgver=1.15 +pkgver=1.16 pkgrel=0 pkgdesc="GNU version of standard text editor" url="https://www.gnu.org/software/ed/" @@ -30,4 +30,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="27a16db41e88626b9718b1868f2fc629b609e436aca2450846f87492c61bf60cec3db0c54ff9a421d9bcbf59fe91a8c672aee5772e1b1eec8a365f227c30ecba ed-1.15.tar.lz" +sha512sums="1ca999edd7007c56bf9aa91436997a813e665910dda19a3307fa5b85adc05667eb120cb54cb6544b919f1c7f631baf3ee03079abe1171b875fb9653f535fa7bd ed-1.16.tar.lz" diff --git a/system/kbd/APKBUILD b/system/kbd/APKBUILD index deb7fb205..144ddcefc 100644 --- a/system/kbd/APKBUILD +++ b/system/kbd/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kbd pkgver=2.2.0_git20190823 -pkgrel=1 +pkgrel=2 pkgdesc="Console keyboard and font management utilities" url="https://kbd-project.org/" arch="all" @@ -11,7 +11,9 @@ license="GPL-2.0+" depends="" checkdepends="check-dev" makedepends="linux-headers linux-pam-dev autoconf automake libtool" -subpackages="$pkgname-doc $pkgname-fonts::noarch $pkgname-keymaps::noarch +provides="$pkgname-keymaps" +replaces="$pkgname-keymaps" +subpackages="$pkgname-doc $pkgname-fonts::noarch $pkgname-lang $pkgname-openrc" source="https://dev.sick.bike/dist/$pkgname-$pkgver.tar.xz consolefont.confd @@ -62,16 +64,8 @@ fonts() { mkdir -p "$subpkgdir"/usr/share mv "$pkgdir"/usr/share/consolefonts "$subpkgdir"/usr/share/ } - -keymaps() { - pkgdesc="Legacy keymaps shipped with Linux kbd tools" - mkdir -p "$subpkgdir"/usr/share - mv "$pkgdir"/usr/share/keymaps "$subpkgdir"/usr/share/ - mv "$pkgdir"/usr/share/unimaps "$subpkgdir"/usr/share/ -} - sha512sums="7f6202aeb17d6224095447a92d999478220457e1e7cadb90a7c40ca7f3b0c5b1f672db1995fb69652ca37558a75df582bfb5fea5772f3b1e040fe39f8f54504e kbd-2.2.0_git20190823.tar.xz -19761fdd2b32c1bbcc9254b89b7893741e144b917a75410af3f274553fe61e2f56cbbd17ff77ac929e9377604663cbbfd9e53c73e7d41e71de6de573730950c7 consolefont.confd +837054b29050b955b4c3f1ddd6481c79792a66e2415bafbcfbf3e12a27066ddd3ce35e069448dfb1b2a00e843cec180dd6940edbd9014cd2a0c2aaa1b76c9fb0 consolefont.confd 1e67f75f27ec5de8f71489c83f78e53e8fd0925ae2d82dabf516f98905c5aff206a8e943e92b6af413eae5f0ecb9c2240526dfc3c56811a8dc1d19ced561bba3 consolefont.initd -af7d37fc6be1382414ca8245ca6f8d2ee8b82650b8a08eebbd980cf6dd2b92524fce2851ce0b2cd67e915488c12044ab50c5ab1f01c3072af87eed3e058ac268 keymaps.confd +9391671bbe8b3b7b4eba63ff4e4b7f17297712393abca69f0e24e3a5304a545faa213de8bc799de922b69ee52048d6e6cf352d7213b459991286ef6dea77e8c3 keymaps.confd 510d7eb582a914fa7cfb868d0c3d55a21ee1519033117d0943a153528b5810d09f6421ddc02d93906c1a66fb7e07e86240f38dad0d38cfb5a8c7e9a6335a937f keymaps.initd" diff --git a/system/kbd/consolefont.confd b/system/kbd/consolefont.confd index 4c41d0633..9e8a30505 100644 --- a/system/kbd/consolefont.confd +++ b/system/kbd/consolefont.confd @@ -15,6 +15,6 @@ #consoletranslation="8859-1_to_uni" # unicodemap is the unicode map file to use. Leave commented to use the -# default one. Have a look in /usr/share/unimaps (from the kbd-keymaps -# package) for a selection of map files you can use. +# default one. Have a look in /usr/share/unimaps for a selection of map +# files you can use. #unicodemap="iso01" diff --git a/system/kbd/keymaps.confd b/system/kbd/keymaps.confd index 9a2863413..30e65188a 100644 --- a/system/kbd/keymaps.confd +++ b/system/kbd/keymaps.confd @@ -1,6 +1,5 @@ # Use keymap to specify the default console keymap. There is a complete tree -# of keymaps in /usr/share/keymaps to choose from (from the kbd-keymaps -# package). +# of keymaps in /usr/share/keymaps to choose from. keymap="us" # Should we first load the 'windowkeys' console keymap? Most x86 users will |