[arch-commits] Commit in xkeyboard-config/repos/extra-any (3 files)

[Andreas Radke]

    Date: Wednesday, May 28, 2014 @ 21:24:41
  Author: andyrtr
Revision: 213730

archrelease: copy trunk to extra-any

Added:
  xkeyboard-config/repos/extra-any/PKGBUILD
    (from rev 213729, xkeyboard-config/trunk/PKGBUILD)
Deleted:
  xkeyboard-config/repos/extra-any/PKGBUILD
  xkeyboard-config/repos/extra-any/revert-comma-in-keypad.patch

------------------------------+
 PKGBUILD                     |   85 ++++++++++++++++++-----------------------
 revert-comma-in-keypad.patch |   39 ------------------
 2 files changed, 38 insertions(+), 86 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2014-05-28 19:24:33 UTC (rev 213729)
+++ PKGBUILD	2014-05-28 19:24:41 UTC (rev 213730)
@@ -1,47 +0,0 @@
-# $Id$
-# Maintainer: Andreas Radke <andyrtr at archlinux.org>
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=xkeyboard-config
-pkgver=2.11
-pkgrel=2
-pkgdesc="X keyboard configuration files"
-arch=(any)
-license=('custom')
-url="http://www.freedesktop.org/wiki/Software/XKeyboardConfig"
-makedepends=('intltool' 'xorg-xkbcomp')
-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')
-
-prepare() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  # fix FS#38743 , not merged upstream
-  patch -Np1 -i../revert-comma-in-keypad.patch
-}
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr \
-      --with-xkb-base=/usr/share/X11/xkb \
-      --with-xkb-rules-symlink=xorg \
-      --enable-compat-rules=yes
-  make
- }
- 
- package() { 
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-  rm -f "${pkgdir}/usr/share/X11/xkb/compiled"
-
-  install -m755 -d "${pkgdir}/var/lib/xkb"
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}

Copied: xkeyboard-config/repos/extra-any/PKGBUILD (from rev 213729, xkeyboard-config/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2014-05-28 19:24:41 UTC (rev 213730)
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer: Andreas Radke <andyrtr at archlinux.org>
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=xkeyboard-config
+pkgver=2.12
+pkgrel=1
+pkgdesc="X keyboard configuration files"
+arch=(any)
+license=('custom')
+url="http://www.freedesktop.org/wiki/Software/XKeyboardConfig"
+makedepends=('intltool' 'xorg-xkbcomp')
+provides=('xkbdata')
+replaces=('xkbdata')
+conflicts=('xkbdata')
+source=(http://xorg.freedesktop.org/archive/individual/data/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('65b62b95b77b609cb6c0439e0148c48c3ab7dcb5c90eb8d34cf1cb8f360cca44')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  ./configure --prefix=/usr \
+      --with-xkb-base=/usr/share/X11/xkb \
+      --with-xkb-rules-symlink=xorg \
+      --enable-compat-rules=yes
+  make
+ }
+ 
+ package() { 
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  make DESTDIR="${pkgdir}" install
+  rm -f "${pkgdir}/usr/share/X11/xkb/compiled"
+
+  install -m755 -d "${pkgdir}/var/lib/xkb"
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+}

Deleted: revert-comma-in-keypad.patch
===================================================================
--- revert-comma-in-keypad.patch	2014-05-28 19:24:33 UTC (rev 213729)
+++ revert-comma-in-keypad.patch	2014-05-28 19:24:41 UTC (rev 213730)
@@ -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)"
- };
-