[arch-commits] CVS update of extra/x11/xkeyboard-config (2 files)

[Alexander Baldeck]

    Date: Friday, December 21, 2007 @ 22:18:43
  Author: alexander
    Path: /home/cvs-extra/extra/x11/xkeyboard-config

Modified: PKGBUILD (1.5 -> 1.6)
 Removed: xkeyboard-config-fix-ralt.patch (1.1)

upgpkg: xkeyboard-config 1.1


---------------------------------+
 PKGBUILD                        |   14 +++++----
 xkeyboard-config-fix-ralt.patch |   59 --------------------------------------
 2 files changed, 8 insertions(+), 65 deletions(-)


Index: extra/x11/xkeyboard-config/PKGBUILD
diff -u extra/x11/xkeyboard-config/PKGBUILD:1.5 extra/x11/xkeyboard-config/PKGBUILD:1.6
--- extra/x11/xkeyboard-config/PKGBUILD:1.5	Sun Sep 23 06:15:46 2007
+++ extra/x11/xkeyboard-config/PKGBUILD	Fri Dec 21 22:18:42 2007
@@ -1,8 +1,7 @@
-# $Id: PKGBUILD,v 1.5 2007/09/23 10:15:46 jgc Exp $
-#Maintainer: Alexander Baldeck <kth5 at archlinux.org>
-
+# $Id: PKGBUILD,v 1.6 2007/12/22 03:18:42 alexander Exp $
+# Maintainer: Alexander Baldeck <kth5 at archlinux.org>
 pkgname=xkeyboard-config
-pkgver=1.0
+pkgver=1.1
 pkgrel=1
 pkgdesc="X keyboard configuration files"
 arch=(i686 x86_64)
@@ -14,11 +13,13 @@
 replaces=('xkbdata')
 conflicts=('xkbdata')
 source=(http://xlibs.freedesktop.org/xkbdesc/xkeyboard-config-${pkgver}.tar.bz2)
-md5sums=('bcf08a6bf76bd5661f730d36a1d66517')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --with-xkb-base=/usr/share/X11/xkb --with-xkb-rules-symlink=xorg --enable-compat-rules=yes
+  ./configure --prefix=/usr \
+              --with-xkb-base=/usr/share/X11/xkb \
+              --with-xkb-rules-symlink=xorg \
+              --enable-compat-rules=yes
   make || return 1
   make DESTDIR=${startdir}/pkg install || return 1
   rm -f ${startdir}/pkg/usr/share/X11/xkb/compiled
@@ -26,3 +27,4 @@
   mkdir -p ${startdir}/pkg/usr/share/licenses/${pkgname}
   install -m644 COPYING ${startdir}/pkg/usr/share/licenses/${pkgname}/
 }
+md5sums=('2c76b91bd31bff78db771566578fe520')
Index: extra/x11/xkeyboard-config/xkeyboard-config-fix-ralt.patch
diff -u extra/x11/xkeyboard-config/xkeyboard-config-fix-ralt.patch:1.1 extra/x11/xkeyboard-config/xkeyboard-config-fix-ralt.patch:removed
--- extra/x11/xkeyboard-config/xkeyboard-config-fix-ralt.patch:1.1	Wed May 16 14:40:54 2007
+++ extra/x11/xkeyboard-config/xkeyboard-config-fix-ralt.patch	Fri Dec 21 22:18:43 2007
@@ -1,59 +0,0 @@
-Index: symbols/level3
-===================================================================
-RCS file: /cvs/xlibs/xkbdesc/symbols/level3,v
-retrieving revision 1.14
-diff -u -r1.14 level3
---- symbols/level3	9 Oct 2006 21:53:27 -0000	1.14
-+++ symbols/level3	16 Oct 2006 19:36:21 -0000
-@@ -14,7 +14,7 @@
-     type[Group1]="ONE_LEVEL",
-     symbols[Group1] = [ ISO_Level3_Shift ]
-     };
--  modifier_map Mod5   { <RALT> };
-+  modifier_map Mod5   { ISO_Level3_Shift };
- };
- 
- partial modifier_keys
-@@ -66,7 +66,7 @@
-     type[Group1]="ONE_LEVEL",
-     symbols[Group1] = [ ISO_Level3_Shift ]
-     };
--  modifier_map Mod5   { <RCTL> };
-+  modifier_map Mod5   { ISO_Level3_Shift };
- };
- 
- // using the level(menu_switch) map, the Menu key temporarily
-@@ -77,7 +77,7 @@
-     type[Group1]="ONE_LEVEL",
-     symbols[Group1] = [ ISO_Level3_Shift ]
-     };
--  modifier_map Mod5   { <MENU> };
-+  modifier_map Mod5   { ISO_Level3_Shift };
- };
- 
- // using the level3(win_switch) map, the either Windows' logo key
-@@ -96,7 +96,7 @@
-     type[Group1]="ONE_LEVEL",
-     symbols[Group1] = [ ISO_Level3_Shift ]
-     };
--  modifier_map Mod5   { <LWIN> };
-+  modifier_map Mod5   { ISO_Level3_Shift };
- };
- 
- // using the level(rwin_switch) map, the right Windows' logo key
-@@ -109,7 +109,7 @@
-     type[Group1]="ONE_LEVEL",
-     symbols[Group1] = [ ISO_Level3_Shift ]
-     };
--  modifier_map Mod5   { <RWIN> };
-+  modifier_map Mod5   { ISO_Level3_Shift };
- };
- 
- // using the level3(enter_switch) map, the Enter key on the keypad
-@@ -121,5 +121,5 @@
-     type[Group1]="ONE_LEVEL",
-     symbols[Group1] = [ ISO_Level3_Shift ]
-     };
--  modifier_map Mod5   { <KPEN> };
-+  modifier_map Mod5   { ISO_Level3_Shift };
- };