Date: Wednesday, May 28, 2014 @ 21:24:33 Author: andyrtr Revision: 213729
upgpkg: xkeyboard-config 2.12-1 upstream update 2.12 Modified: xkeyboard-config/trunk/PKGBUILD Deleted: xkeyboard-config/trunk/revert-comma-in-keypad.patch ------------------------------+ PKGBUILD | 17 ++++------------- revert-comma-in-keypad.patch | 39 --------------------------------------- 2 files changed, 4 insertions(+), 52 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-05-28 19:18:31 UTC (rev 213728) +++ PKGBUILD 2014-05-28 19:24:33 UTC (rev 213729) @@ -3,8 +3,8 @@ # Maintainer: Jan de Groot <[email protected]> pkgname=xkeyboard-config -pkgver=2.11 -pkgrel=2 +pkgver=2.12 +pkgrel=1 pkgdesc="X keyboard configuration files" arch=(any) license=('custom') @@ -13,18 +13,9 @@ provides=('xkbdata') replaces=('xkbdata') conflicts=('xkbdata') -source=(http://xorg.freedesktop.org/archive/individual/data/${pkgname}/${pkgname}-${pkgver}.tar.bz2 - revert-comma-in-keypad.patch) -sha256sums=('e7125460892c2b5c3a8d843cb18c24b60c46051e925c2888a61fa672a2f76d76' - '05b22863ddb1de64575b56714ebd693f2ea639b7a4ae15e25c9a1f0d14dba817') +source=(http://xorg.freedesktop.org/archive/individual/data/${pkgname}/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('65b62b95b77b609cb6c0439e0148c48c3ab7dcb5c90eb8d34cf1cb8f360cca44') -prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" - - # fix FS#38743 , not merged upstream - patch -Np1 -i../revert-comma-in-keypad.patch -} - build() { cd "${srcdir}/${pkgname}-${pkgver}" Deleted: revert-comma-in-keypad.patch =================================================================== --- revert-comma-in-keypad.patch 2014-05-28 19:18:31 UTC (rev 213728) +++ revert-comma-in-keypad.patch 2014-05-28 19:24:33 UTC (rev 213729) @@ -1,39 +0,0 @@ -diff --git a/symbols/fr b/symbols/fr -index 9c89db8..3898b1c 100644 ---- a/symbols/fr -+++ b/symbols/fr -@@ -36,8 +36,6 @@ xkb_symbols "basic" { - key <AB09> { [ colon, slash, periodcentered, division ] }; - key <AB10> { [ exclam, section, dead_belowdot, dead_abovedot ] }; - -- include "kpdl(comma)" -- - include "level3(ralt_switch)" - }; - -diff --git a/symbols/it b/symbols/it -index 8a66a30..2673cf9 100644 ---- a/symbols/it -+++ b/symbols/it -@@ -33,8 +33,6 @@ xkb_symbols "basic" { - - key <LSGT> { [ less, greater,guillemotleft,guillemotright] }; - -- include "kpdl(comma)" -- - include "level3(ralt_switch)" - }; - -diff --git a/symbols/nl b/symbols/nl -index 1dde405..76cb018 100644 ---- a/symbols/nl -+++ b/symbols/nl -@@ -49,8 +49,6 @@ xkb_symbols "basic" { - - key <LSGT> { [bracketright, bracketleft, bar, brokenbar ] }; - -- include "kpdl(comma)" -- - include "level3(ralt_switch)" - }; -
