[arch-commits] Commit in kbd/repos (10 files)

2017-01-21 Thread Tobias Powalowski
Date: Saturday, January 21, 2017 @ 10:46:33
  Author: tpowa
Revision: 287074

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  kbd/repos/testing-i686/
  kbd/repos/testing-i686/PKGBUILD
(from rev 287073, kbd/trunk/PKGBUILD)
  kbd/repos/testing-i686/fix-dvorak-es.patch
(from rev 287073, kbd/trunk/fix-dvorak-es.patch)
  kbd/repos/testing-i686/fix-euro2.patch
(from rev 287073, kbd/trunk/fix-euro2.patch)
  kbd/repos/testing-i686/fix-keymap-loading-1.15.5.patch
(from rev 287073, kbd/trunk/fix-keymap-loading-1.15.5.patch)
  kbd/repos/testing-x86_64/
  kbd/repos/testing-x86_64/PKGBUILD
(from rev 287073, kbd/trunk/PKGBUILD)
  kbd/repos/testing-x86_64/fix-dvorak-es.patch
(from rev 287073, kbd/trunk/fix-dvorak-es.patch)
  kbd/repos/testing-x86_64/fix-euro2.patch
(from rev 287073, kbd/trunk/fix-euro2.patch)
  kbd/repos/testing-x86_64/fix-keymap-loading-1.15.5.patch
(from rev 287073, kbd/trunk/fix-keymap-loading-1.15.5.patch)

+
 testing-i686/PKGBUILD  |   51 +++
 testing-i686/fix-dvorak-es.patch   |   11 
 testing-i686/fix-euro2.patch   |9 
 testing-i686/fix-keymap-loading-1.15.5.patch   |   47 +
 testing-x86_64/PKGBUILD|   51 +++
 testing-x86_64/fix-dvorak-es.patch |   11 
 testing-x86_64/fix-euro2.patch |9 
 testing-x86_64/fix-keymap-loading-1.15.5.patch |   47 +
 8 files changed, 236 insertions(+)

Copied: kbd/repos/testing-i686/PKGBUILD (from rev 287073, kbd/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2017-01-21 10:46:33 UTC (rev 287074)
@@ -0,0 +1,51 @@
+# $Id$
+# Maintainer: Tobias Powalowski 
+
+pkgname=kbd
+pkgver=2.0.4
+pkgrel=1
+pkgdesc="Keytable files and keyboard utilities"
+arch=('i686' 'x86_64')
+url="http://www.kbd-project.org;
+license=('GPL')
+depends=('glibc' 'pam')
+makedepends=('check')
+source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/${pkgname}-${pkgver}.tar.gz
+ftp://ftp.kernel.org/pub/linux/utils/kbd/${pkgname}-${pkgver}.tar.sign
+'fix-euro2.patch')
+provides=('vlock')
+conflicts=('vlock')
+replaces=('vlock')
+validpgpkeys=(
+  '7F2A3D07298149A0793C9A4EA45ABA544CFFD434' #Alexey Gladkov 
+ )
+
+prepare() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  # rename keymap files with the same names
+  # this is needed because when only name of keymap is specified
+  # loadkeys loads the first keymap it can find, which is bad (see FS#13837)
+  # this should be removed when upstream adopts the change
+  mv data/keymaps/i386/qwertz/cz{,-qwertz}.map
+  mv data/keymaps/i386/olpc/es{,-olpc}.map
+  mv data/keymaps/i386/olpc/pt{,-olpc}.map
+  mv data/keymaps/i386/dvorak/no{,-dvorak}.map
+  mv data/keymaps/i386/fgGIod/trf{,-fgGIod}.map
+  mv data/keymaps/i386/colemak/{en-latin9,colemak}.map
+  # fix euro2 #28213
+  patch -Np1 -i ../fix-euro2.patch
+}
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr --datadir=/usr/share/kbd --mandir=/usr/share/man
+  make KEYCODES_PROGS=yes RESIZECONS_PROGS=yes
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make KEYCODES_PROGS=yes RESIZECONS_PROGS=yes DESTDIR=${pkgdir} install
+}
+md5sums=('c69fce737a5fd0fa686cbfc4f611a220'
+ 'SKIP'
+ 'd869200acbc0aab6a9cafa43cb140d4e')

Copied: kbd/repos/testing-i686/fix-dvorak-es.patch (from rev 287073, 
kbd/trunk/fix-dvorak-es.patch)
===
--- testing-i686/fix-dvorak-es.patch(rev 0)
+++ testing-i686/fix-dvorak-es.patch2017-01-21 10:46:33 UTC (rev 287074)
@@ -0,0 +1,11 @@
+--- kbd-1.15.5/data/keymaps/i386/dvorak/dvorak-es.map.old  2013-05-08 
14:58:03.393349828 +0200
 kbd-1.15.5/data/keymaps/i386/dvorak/dvorak-es.map  2013-05-08 
14:58:20.206415053 +0200
+@@ -4,7 +4,7 @@
+ 
+ keymaps 0-2,4,5,6,8-10,12,14
+ include "linux-with-alt-and-altgr"
+-include "euro"
++include "euro.map"
+ strings as usual
+ 
+ keycode   1 = Escape

Copied: kbd/repos/testing-i686/fix-euro2.patch (from rev 287073, 
kbd/trunk/fix-euro2.patch)
===
--- testing-i686/fix-euro2.patch(rev 0)
+++ testing-i686/fix-euro2.patch2017-01-21 10:46:33 UTC (rev 287074)
@@ -0,0 +1,9 @@
+--- kbd-1.15.5/data/keymaps/i386/include/euro2.map.old 2013-05-08 
15:00:25.917752313 +0200
 kbd-1.15.5/data/keymaps/i386/include/euro2.map 2013-05-08 
15:00:54.943957367 +0200
+@@ -2,5 +2,5 @@
+ # [Say: "loadkeys euro2" to get Euro and cent with AltGr (right alt)
+ #  on the positions where many keyboards have E and C.
+ #  To get it displayed, use 

[arch-commits] Commit in kbd/repos (10 files)

2015-07-14 Thread Tobias Powalowski
Date: Tuesday, July 14, 2015 @ 08:00:27
  Author: tpowa
Revision: 242188

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  kbd/repos/testing-i686/
  kbd/repos/testing-i686/PKGBUILD
(from rev 242187, kbd/trunk/PKGBUILD)
  kbd/repos/testing-i686/fix-dvorak-es.patch
(from rev 242187, kbd/trunk/fix-dvorak-es.patch)
  kbd/repos/testing-i686/fix-euro2.patch
(from rev 242187, kbd/trunk/fix-euro2.patch)
  kbd/repos/testing-i686/fix-keymap-loading-1.15.5.patch
(from rev 242187, kbd/trunk/fix-keymap-loading-1.15.5.patch)
  kbd/repos/testing-x86_64/
  kbd/repos/testing-x86_64/PKGBUILD
(from rev 242187, kbd/trunk/PKGBUILD)
  kbd/repos/testing-x86_64/fix-dvorak-es.patch
(from rev 242187, kbd/trunk/fix-dvorak-es.patch)
  kbd/repos/testing-x86_64/fix-euro2.patch
(from rev 242187, kbd/trunk/fix-euro2.patch)
  kbd/repos/testing-x86_64/fix-keymap-loading-1.15.5.patch
(from rev 242187, kbd/trunk/fix-keymap-loading-1.15.5.patch)

+
 testing-i686/PKGBUILD  |   46 ++
 testing-i686/fix-dvorak-es.patch   |   11 +
 testing-i686/fix-euro2.patch   |9 
 testing-i686/fix-keymap-loading-1.15.5.patch   |   47 +++
 testing-x86_64/PKGBUILD|   46 ++
 testing-x86_64/fix-dvorak-es.patch |   11 +
 testing-x86_64/fix-euro2.patch |9 
 testing-x86_64/fix-keymap-loading-1.15.5.patch |   47 +++
 8 files changed, 226 insertions(+)

Copied: kbd/repos/testing-i686/PKGBUILD (from rev 242187, kbd/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2015-07-14 06:00:27 UTC (rev 242188)
@@ -0,0 +1,46 @@
+# $Id$
+# Maintainer: Tobias Powalowski tp...@archlinux.org
+
+pkgname=kbd
+pkgver=2.0.3
+pkgrel=1
+pkgdesc=Keytable files and keyboard utilities
+arch=('i686' 'x86_64')
+url=http://www.kbd-project.org;
+license=('GPL')
+depends=('glibc' 'pam')
+makedepends=('check')
+source=(ftp://ftp.altlinux.org/pub/people/legion/kbd/${pkgname}-${pkgver}.tar.gz
+'fix-euro2.patch')
+provides=('vlock')
+conflicts=('vlock')
+replaces=('vlock')
+md5sums=('d636ee56f35233b5cd6f855c08372489'
+ 'd869200acbc0aab6a9cafa43cb140d4e')
+
+prepare() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  # rename keymap files with the same names
+  # this is needed because when only name of keymap is specified
+  # loadkeys loads the first keymap it can find, which is bad (see FS#13837)
+  # this should be removed when upstream adopts the change
+  mv data/keymaps/i386/qwertz/cz{,-qwertz}.map
+  mv data/keymaps/i386/olpc/es{,-olpc}.map
+  mv data/keymaps/i386/olpc/pt{,-olpc}.map
+  mv data/keymaps/i386/dvorak/no{,-dvorak}.map
+  mv data/keymaps/i386/fgGIod/trf{,-fgGIod}.map
+  mv data/keymaps/i386/colemak/{en-latin9,colemak}.map
+  # fix euro2 #28213
+  patch -Np1 -i ../fix-euro2.patch
+}
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr --datadir=/usr/share/kbd --mandir=/usr/share/man
+  make KEYCODES_PROGS=yes RESIZECONS_PROGS=yes
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make KEYCODES_PROGS=yes RESIZECONS_PROGS=yes DESTDIR=${pkgdir} install
+}

Copied: kbd/repos/testing-i686/fix-dvorak-es.patch (from rev 242187, 
kbd/trunk/fix-dvorak-es.patch)
===
--- testing-i686/fix-dvorak-es.patch(rev 0)
+++ testing-i686/fix-dvorak-es.patch2015-07-14 06:00:27 UTC (rev 242188)
@@ -0,0 +1,11 @@
+--- kbd-1.15.5/data/keymaps/i386/dvorak/dvorak-es.map.old  2013-05-08 
14:58:03.393349828 +0200
 kbd-1.15.5/data/keymaps/i386/dvorak/dvorak-es.map  2013-05-08 
14:58:20.206415053 +0200
+@@ -4,7 +4,7 @@
+ 
+ keymaps 0-2,4,5,6,8-10,12,14
+ include linux-with-alt-and-altgr
+-include euro
++include euro.map
+ strings as usual
+ 
+ keycode   1 = Escape

Copied: kbd/repos/testing-i686/fix-euro2.patch (from rev 242187, 
kbd/trunk/fix-euro2.patch)
===
--- testing-i686/fix-euro2.patch(rev 0)
+++ testing-i686/fix-euro2.patch2015-07-14 06:00:27 UTC (rev 242188)
@@ -0,0 +1,9 @@
+--- kbd-1.15.5/data/keymaps/i386/include/euro2.map.old 2013-05-08 
15:00:25.917752313 +0200
 kbd-1.15.5/data/keymaps/i386/include/euro2.map 2013-05-08 
15:00:54.943957367 +0200
+@@ -2,5 +2,5 @@
+ # [Say: loadkeys euro2 to get Euro and cent with AltGr (right alt)
+ #  on the positions where many keyboards have E and C.
+ #  To get it displayed, use a latin0 (i.e., latin9) font.]
+-altgr keycode  18 = currency
++altgr keycode  18 = euro
+ altgr keycode  46 = cent

Copied: kbd/repos/testing-i686/fix-keymap-loading-1.15.5.patch (from rev 
242187, 

[arch-commits] Commit in kbd/repos (10 files)

2014-07-31 Thread Tobias Powalowski
Date: Thursday, July 31, 2014 @ 09:06:56
  Author: tpowa
Revision: 218427

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  kbd/repos/testing-i686/
  kbd/repos/testing-i686/PKGBUILD
(from rev 218426, kbd/trunk/PKGBUILD)
  kbd/repos/testing-i686/fix-dvorak-es.patch
(from rev 218426, kbd/trunk/fix-dvorak-es.patch)
  kbd/repos/testing-i686/fix-euro2.patch
(from rev 218426, kbd/trunk/fix-euro2.patch)
  kbd/repos/testing-i686/fix-keymap-loading-1.15.5.patch
(from rev 218426, kbd/trunk/fix-keymap-loading-1.15.5.patch)
  kbd/repos/testing-x86_64/
  kbd/repos/testing-x86_64/PKGBUILD
(from rev 218426, kbd/trunk/PKGBUILD)
  kbd/repos/testing-x86_64/fix-dvorak-es.patch
(from rev 218426, kbd/trunk/fix-dvorak-es.patch)
  kbd/repos/testing-x86_64/fix-euro2.patch
(from rev 218426, kbd/trunk/fix-euro2.patch)
  kbd/repos/testing-x86_64/fix-keymap-loading-1.15.5.patch
(from rev 218426, kbd/trunk/fix-keymap-loading-1.15.5.patch)

+
 testing-i686/PKGBUILD  |   50 +++
 testing-i686/fix-dvorak-es.patch   |   11 +
 testing-i686/fix-euro2.patch   |9 
 testing-i686/fix-keymap-loading-1.15.5.patch   |   47 +
 testing-x86_64/PKGBUILD|   50 +++
 testing-x86_64/fix-dvorak-es.patch |   11 +
 testing-x86_64/fix-euro2.patch |9 
 testing-x86_64/fix-keymap-loading-1.15.5.patch |   47 +
 8 files changed, 234 insertions(+)

Copied: kbd/repos/testing-i686/PKGBUILD (from rev 218426, kbd/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2014-07-31 07:06:56 UTC (rev 218427)
@@ -0,0 +1,50 @@
+# $Id$
+# Maintainer: Tobias Powalowski tp...@archlinux.org
+
+pkgname=kbd
+pkgver=2.0.2
+pkgrel=1
+pkgdesc=Keytable files and keyboard utilities
+arch=('i686' 'x86_64')
+url=http://www.kbd-project.org;
+license=('GPL')
+depends=('glibc' 'pam')
+makedepends=('check')
+source=(ftp://ftp.altlinux.org/pub/people/legion/kbd/${pkgname}-${pkgver}.tar.gz
+'fix-dvorak-es.patch'
+'fix-euro2.patch')
+provides=('vlock')
+conflicts=('vlock')
+replaces=('vlock')
+md5sums=('f1f75f0dd5f7dde89ce47585274366f8'
+ '998957c4f815347dcc874c4d7555dc66'
+ 'd869200acbc0aab6a9cafa43cb140d4e')
+
+prepare() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  # rename keymap files with the same names
+  # this is needed because when only name of keymap is specified
+  # loadkeys loads the first keymap it can find, which is bad (see FS#13837)
+  # this should be removed when upstream adopts the change
+  mv data/keymaps/i386/qwertz/cz{,-qwertz}.map
+  mv data/keymaps/i386/olpc/es{,-olpc}.map
+  mv data/keymaps/i386/olpc/pt{,-olpc}.map
+  mv data/keymaps/i386/dvorak/no{,-dvorak}.map
+  mv data/keymaps/i386/fgGIod/trf{,-fgGIod}.map
+  mv data/keymaps/i386/colemak/{en-latin9,colemak}.map
+  # fix es-dvorak #33662
+  patch -Np1 -i ../fix-dvorak-es.patch
+  # fix euro2 #28213
+  patch -Np1 -i ../fix-euro2.patch
+}
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr --datadir=/usr/share/kbd --mandir=/usr/share/man
+  make KEYCODES_PROGS=yes RESIZECONS_PROGS=yes
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make KEYCODES_PROGS=yes RESIZECONS_PROGS=yes DESTDIR=${pkgdir} install
+}

Copied: kbd/repos/testing-i686/fix-dvorak-es.patch (from rev 218426, 
kbd/trunk/fix-dvorak-es.patch)
===
--- testing-i686/fix-dvorak-es.patch(rev 0)
+++ testing-i686/fix-dvorak-es.patch2014-07-31 07:06:56 UTC (rev 218427)
@@ -0,0 +1,11 @@
+--- kbd-1.15.5/data/keymaps/i386/dvorak/dvorak-es.map.old  2013-05-08 
14:58:03.393349828 +0200
 kbd-1.15.5/data/keymaps/i386/dvorak/dvorak-es.map  2013-05-08 
14:58:20.206415053 +0200
+@@ -4,7 +4,7 @@
+ 
+ keymaps 0-2,4,5,6,8-10,12,14
+ include linux-with-alt-and-altgr
+-include euro
++include euro.map
+ strings as usual
+ 
+ keycode   1 = Escape

Copied: kbd/repos/testing-i686/fix-euro2.patch (from rev 218426, 
kbd/trunk/fix-euro2.patch)
===
--- testing-i686/fix-euro2.patch(rev 0)
+++ testing-i686/fix-euro2.patch2014-07-31 07:06:56 UTC (rev 218427)
@@ -0,0 +1,9 @@
+--- kbd-1.15.5/data/keymaps/i386/include/euro2.map.old 2013-05-08 
15:00:25.917752313 +0200
 kbd-1.15.5/data/keymaps/i386/include/euro2.map 2013-05-08 
15:00:54.943957367 +0200
+@@ -2,5 +2,5 @@
+ # [Say: loadkeys euro2 to get Euro and cent with AltGr (right alt)
+ #  on the positions where many keyboards have E and C.
+ #  To get it displayed, use a latin0 (i.e., latin9) font.]
+-altgr keycode  18 = currency
++altgr 

[arch-commits] Commit in kbd/repos (10 files)

2013-11-13 Thread Tobias Powalowski
Date: Wednesday, November 13, 2013 @ 12:06:59
  Author: tpowa
Revision: 199467

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  kbd/repos/testing-i686/
  kbd/repos/testing-i686/PKGBUILD
(from rev 199466, kbd/trunk/PKGBUILD)
  kbd/repos/testing-i686/fix-dvorak-es.patch
(from rev 199466, kbd/trunk/fix-dvorak-es.patch)
  kbd/repos/testing-i686/fix-euro2.patch
(from rev 199466, kbd/trunk/fix-euro2.patch)
  kbd/repos/testing-i686/fix-keymap-loading-1.15.5.patch
(from rev 199466, kbd/trunk/fix-keymap-loading-1.15.5.patch)
  kbd/repos/testing-x86_64/
  kbd/repos/testing-x86_64/PKGBUILD
(from rev 199466, kbd/trunk/PKGBUILD)
  kbd/repos/testing-x86_64/fix-dvorak-es.patch
(from rev 199466, kbd/trunk/fix-dvorak-es.patch)
  kbd/repos/testing-x86_64/fix-euro2.patch
(from rev 199466, kbd/trunk/fix-euro2.patch)
  kbd/repos/testing-x86_64/fix-keymap-loading-1.15.5.patch
(from rev 199466, kbd/trunk/fix-keymap-loading-1.15.5.patch)

+
 testing-i686/PKGBUILD  |   50 +++
 testing-i686/fix-dvorak-es.patch   |   11 +
 testing-i686/fix-euro2.patch   |9 
 testing-i686/fix-keymap-loading-1.15.5.patch   |   47 +
 testing-x86_64/PKGBUILD|   50 +++
 testing-x86_64/fix-dvorak-es.patch |   11 +
 testing-x86_64/fix-euro2.patch |9 
 testing-x86_64/fix-keymap-loading-1.15.5.patch |   47 +
 8 files changed, 234 insertions(+)

Copied: kbd/repos/testing-i686/PKGBUILD (from rev 199466, kbd/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2013-11-13 11:06:59 UTC (rev 199467)
@@ -0,0 +1,50 @@
+# $Id$
+# Maintainer: Tobias Powalowski tp...@archlinux.org
+
+pkgname=kbd
+pkgver=2.0.1
+pkgrel=1
+pkgdesc=Keytable files and keyboard utilities
+arch=('i686' 'x86_64')
+url=http://www.kbd-project.org;
+license=('GPL')
+depends=('glibc' 'pam')
+makedepends=('check')
+source=(ftp://ftp.altlinux.org/pub/people/legion/kbd/${pkgname}-${pkgver}.tar.gz
+'fix-dvorak-es.patch'
+'fix-euro2.patch')
+provides=('vlock')
+conflicts=('vlock')
+replaces=('vlock')
+md5sums=('cc0ee9f2537d8636cae85a8c6541ed2e'
+ '998957c4f815347dcc874c4d7555dc66'
+ 'd869200acbc0aab6a9cafa43cb140d4e')
+
+prepare() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  # rename keymap files with the same names
+  # this is needed because when only name of keymap is specified
+  # loadkeys loads the first keymap it can find, which is bad (see FS#13837)
+  # this should be removed when upstream adopts the change
+  mv data/keymaps/i386/qwertz/cz{,-qwertz}.map
+  mv data/keymaps/i386/olpc/es{,-olpc}.map
+  mv data/keymaps/i386/olpc/pt{,-olpc}.map
+  mv data/keymaps/i386/dvorak/no{,-dvorak}.map
+  mv data/keymaps/i386/fgGIod/trf{,-fgGIod}.map
+  mv data/keymaps/i386/colemak/{en-latin9,colemak}.map
+  # fix es-dvorak #33662
+  patch -Np1 -i ../fix-dvorak-es.patch
+  # fix euro2 #28213
+  patch -Np1 -i ../fix-euro2.patch
+}
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr --datadir=/usr/share/kbd --mandir=/usr/share/man
+  make KEYCODES_PROGS=yes RESIZECONS_PROGS=yes
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make KEYCODES_PROGS=yes RESIZECONS_PROGS=yes DESTDIR=${pkgdir} install
+}

Copied: kbd/repos/testing-i686/fix-dvorak-es.patch (from rev 199466, 
kbd/trunk/fix-dvorak-es.patch)
===
--- testing-i686/fix-dvorak-es.patch(rev 0)
+++ testing-i686/fix-dvorak-es.patch2013-11-13 11:06:59 UTC (rev 199467)
@@ -0,0 +1,11 @@
+--- kbd-1.15.5/data/keymaps/i386/dvorak/dvorak-es.map.old  2013-05-08 
14:58:03.393349828 +0200
 kbd-1.15.5/data/keymaps/i386/dvorak/dvorak-es.map  2013-05-08 
14:58:20.206415053 +0200
+@@ -4,7 +4,7 @@
+ 
+ keymaps 0-2,4,5,6,8-10,12,14
+ include linux-with-alt-and-altgr
+-include euro
++include euro.map
+ strings as usual
+ 
+ keycode   1 = Escape

Copied: kbd/repos/testing-i686/fix-euro2.patch (from rev 199466, 
kbd/trunk/fix-euro2.patch)
===
--- testing-i686/fix-euro2.patch(rev 0)
+++ testing-i686/fix-euro2.patch2013-11-13 11:06:59 UTC (rev 199467)
@@ -0,0 +1,9 @@
+--- kbd-1.15.5/data/keymaps/i386/include/euro2.map.old 2013-05-08 
15:00:25.917752313 +0200
 kbd-1.15.5/data/keymaps/i386/include/euro2.map 2013-05-08 
15:00:54.943957367 +0200
+@@ -2,5 +2,5 @@
+ # [Say: loadkeys euro2 to get Euro and cent with AltGr (right alt)
+ #  on the positions where many keyboards have E and C.
+ #  To get it displayed, use a latin0 (i.e., latin9) font.]
+-altgr keycode  18 = currency

[arch-commits] Commit in kbd/repos (10 files)

2013-08-19 Thread Tobias Powalowski
Date: Monday, August 19, 2013 @ 12:46:42
  Author: tpowa
Revision: 193388

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  kbd/repos/testing-i686/
  kbd/repos/testing-i686/PKGBUILD
(from rev 193386, kbd/trunk/PKGBUILD)
  kbd/repos/testing-i686/fix-dvorak-es.patch
(from rev 193386, kbd/trunk/fix-dvorak-es.patch)
  kbd/repos/testing-i686/fix-euro2.patch
(from rev 193387, kbd/trunk/fix-euro2.patch)
  kbd/repos/testing-i686/fix-keymap-loading-1.15.5.patch
(from rev 193387, kbd/trunk/fix-keymap-loading-1.15.5.patch)
  kbd/repos/testing-x86_64/
  kbd/repos/testing-x86_64/PKGBUILD
(from rev 193387, kbd/trunk/PKGBUILD)
  kbd/repos/testing-x86_64/fix-dvorak-es.patch
(from rev 193387, kbd/trunk/fix-dvorak-es.patch)
  kbd/repos/testing-x86_64/fix-euro2.patch
(from rev 193387, kbd/trunk/fix-euro2.patch)
  kbd/repos/testing-x86_64/fix-keymap-loading-1.15.5.patch
(from rev 193387, kbd/trunk/fix-keymap-loading-1.15.5.patch)

+
 testing-i686/PKGBUILD  |   50 +++
 testing-i686/fix-dvorak-es.patch   |   11 +
 testing-i686/fix-euro2.patch   |9 
 testing-i686/fix-keymap-loading-1.15.5.patch   |   47 +
 testing-x86_64/PKGBUILD|   50 +++
 testing-x86_64/fix-dvorak-es.patch |   11 +
 testing-x86_64/fix-euro2.patch |9 
 testing-x86_64/fix-keymap-loading-1.15.5.patch |   47 +
 8 files changed, 234 insertions(+)

Copied: kbd/repos/testing-i686/PKGBUILD (from rev 193386, kbd/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2013-08-19 10:46:42 UTC (rev 193388)
@@ -0,0 +1,50 @@
+# $Id$
+# Maintainer: Tobias Powalowski tp...@archlinux.org
+
+pkgname=kbd
+pkgver=2.0.0
+pkgrel=1
+pkgdesc=Keytable files and keyboard utilities
+arch=('i686' 'x86_64')
+url=http://www.kbd-project.org;
+license=('GPL')
+depends=('glibc' 'pam')
+makedepends=('check')
+source=(ftp://ftp.altlinux.org/pub/people/legion/kbd/${pkgname}-${pkgver}.tar.gz
+'fix-dvorak-es.patch'
+'fix-euro2.patch')
+provides=('vlock')
+conflicts=('vlock')
+replaces=('vlock')
+md5sums=('5ba259a0b2464196f6488a72070a3d60'
+ '998957c4f815347dcc874c4d7555dc66'
+ 'd869200acbc0aab6a9cafa43cb140d4e')
+
+prepare() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  # rename keymap files with the same names
+  # this is needed because when only name of keymap is specified
+  # loadkeys loads the first keymap it can find, which is bad (see FS#13837)
+  # this should be removed when upstream adopts the change
+  mv data/keymaps/i386/qwertz/cz{,-qwertz}.map
+  mv data/keymaps/i386/olpc/es{,-olpc}.map
+  mv data/keymaps/i386/olpc/pt{,-olpc}.map
+  mv data/keymaps/i386/dvorak/no{,-dvorak}.map
+  mv data/keymaps/i386/fgGIod/trf{,-fgGIod}.map
+  mv data/keymaps/i386/colemak/{en-latin9,colemak}.map
+  # fix es-dvorak #33662
+  patch -Np1 -i ../fix-dvorak-es.patch
+  # fix euro2 #28213
+  patch -Np1 -i ../fix-euro2.patch
+}
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr --datadir=/usr/share/kbd --mandir=/usr/share/man
+  make KEYCODES_PROGS=yes RESIZECONS_PROGS=yes
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make KEYCODES_PROGS=yes RESIZECONS_PROGS=yes DESTDIR=${pkgdir} install
+}

Copied: kbd/repos/testing-i686/fix-dvorak-es.patch (from rev 193386, 
kbd/trunk/fix-dvorak-es.patch)
===
--- testing-i686/fix-dvorak-es.patch(rev 0)
+++ testing-i686/fix-dvorak-es.patch2013-08-19 10:46:42 UTC (rev 193388)
@@ -0,0 +1,11 @@
+--- kbd-1.15.5/data/keymaps/i386/dvorak/dvorak-es.map.old  2013-05-08 
14:58:03.393349828 +0200
 kbd-1.15.5/data/keymaps/i386/dvorak/dvorak-es.map  2013-05-08 
14:58:20.206415053 +0200
+@@ -4,7 +4,7 @@
+ 
+ keymaps 0-2,4,5,6,8-10,12,14
+ include linux-with-alt-and-altgr
+-include euro
++include euro.map
+ strings as usual
+ 
+ keycode   1 = Escape

Copied: kbd/repos/testing-i686/fix-euro2.patch (from rev 193387, 
kbd/trunk/fix-euro2.patch)
===
--- testing-i686/fix-euro2.patch(rev 0)
+++ testing-i686/fix-euro2.patch2013-08-19 10:46:42 UTC (rev 193388)
@@ -0,0 +1,9 @@
+--- kbd-1.15.5/data/keymaps/i386/include/euro2.map.old 2013-05-08 
15:00:25.917752313 +0200
 kbd-1.15.5/data/keymaps/i386/include/euro2.map 2013-05-08 
15:00:54.943957367 +0200
+@@ -2,5 +2,5 @@
+ # [Say: loadkeys euro2 to get Euro and cent with AltGr (right alt)
+ #  on the positions where many keyboards have E and C.
+ #  To get it displayed, use a latin0 (i.e., latin9) font.]
+-altgr keycode  18 = currency
++altgr 

[arch-commits] Commit in kbd/repos (10 files)

2013-05-08 Thread Tobias Powalowski
Date: Wednesday, May 8, 2013 @ 15:07:46
  Author: tpowa
Revision: 184777

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  kbd/repos/testing-i686/
  kbd/repos/testing-i686/PKGBUILD
(from rev 184776, kbd/trunk/PKGBUILD)
  kbd/repos/testing-i686/fix-dvorak-es.patch
(from rev 184776, kbd/trunk/fix-dvorak-es.patch)
  kbd/repos/testing-i686/fix-euro2.patch
(from rev 184776, kbd/trunk/fix-euro2.patch)
  kbd/repos/testing-i686/fix-keymap-loading-1.15.5.patch
(from rev 184776, kbd/trunk/fix-keymap-loading-1.15.5.patch)
  kbd/repos/testing-x86_64/
  kbd/repos/testing-x86_64/PKGBUILD
(from rev 184776, kbd/trunk/PKGBUILD)
  kbd/repos/testing-x86_64/fix-dvorak-es.patch
(from rev 184776, kbd/trunk/fix-dvorak-es.patch)
  kbd/repos/testing-x86_64/fix-euro2.patch
(from rev 184776, kbd/trunk/fix-euro2.patch)
  kbd/repos/testing-x86_64/fix-keymap-loading-1.15.5.patch
(from rev 184776, kbd/trunk/fix-keymap-loading-1.15.5.patch)

+
 testing-i686/PKGBUILD  |   54 +++
 testing-i686/fix-dvorak-es.patch   |   11 
 testing-i686/fix-euro2.patch   |9 +++
 testing-i686/fix-keymap-loading-1.15.5.patch   |   47 
 testing-x86_64/PKGBUILD|   54 +++
 testing-x86_64/fix-dvorak-es.patch |   11 
 testing-x86_64/fix-euro2.patch |9 +++
 testing-x86_64/fix-keymap-loading-1.15.5.patch |   47 
 8 files changed, 242 insertions(+)

Copied: kbd/repos/testing-i686/PKGBUILD (from rev 184776, kbd/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2013-05-08 13:07:46 UTC (rev 184777)
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Tobias Powalowski tp...@archlinux.org
+
+pkgname=kbd
+pkgver=1.15.5
+pkgrel=4
+pkgdesc=Keytable files and keyboard utilities
+arch=('i686' 'x86_64')
+url=http://www.kbd-project.org;
+license=('GPL')
+depends=('glibc' 'pam')
+source=(ftp://ftp.altlinux.org/pub/people/legion/kbd/${pkgname}-${pkgver}.tar.gz
+'fix-keymap-loading-1.15.5.patch'
+'fix-dvorak-es.patch'
+'fix-euro2.patch')
+provides=('vlock')
+conflicts=('vlock')
+replaces=('vlock')
+
+prepare() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  # rename keymap files with the same names
+  # this is needed because when only name of keymap is specified
+  # loadkeys loads the first keymap it can find, which is bad (see FS#13837)
+  # this should be removed when upstream adopts the change
+  mv data/keymaps/i386/qwertz/cz{,-qwertz}.map
+  mv data/keymaps/i386/olpc/es{,-olpc}.map
+  mv data/keymaps/i386/olpc/pt{,-olpc}.map
+  mv data/keymaps/i386/dvorak/no{,-dvorak}.map
+  mv data/keymaps/i386/fgGIod/trf{,-fgGIod}.map
+  mv data/keymaps/i386/colemak/{en-latin9,colemak}.map
+  # fix https://bugs.archlinux.org/task/33308
+  # keymap loading is broken for cetain keymaps
+  patch -Np1 -i ../fix-keymap-loading-1.15.5.patch
+  # fix es-dvorak #33662
+  patch -Np1 -i ../fix-dvorak-es.patch
+  # fix euro2 #28213
+  patch -Np1 -i ../fix-euro2.patch
+}
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr --datadir=/usr/share/kbd --mandir=/usr/share/man
+  make KEYCODES_PROGS=yes RESIZECONS_PROGS=yes
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make KEYCODES_PROGS=yes RESIZECONS_PROGS=yes DESTDIR=${pkgdir} install
+}
+md5sums=('34c71feead8ab9c01ec638acea8cd877'
+ '4362091d5e23bab2d158f8c7693a45d8'
+ '998957c4f815347dcc874c4d7555dc66'
+ 'd869200acbc0aab6a9cafa43cb140d4e')

Copied: kbd/repos/testing-i686/fix-dvorak-es.patch (from rev 184776, 
kbd/trunk/fix-dvorak-es.patch)
===
--- testing-i686/fix-dvorak-es.patch(rev 0)
+++ testing-i686/fix-dvorak-es.patch2013-05-08 13:07:46 UTC (rev 184777)
@@ -0,0 +1,11 @@
+--- kbd-1.15.5/data/keymaps/i386/dvorak/dvorak-es.map.old  2013-05-08 
14:58:03.393349828 +0200
 kbd-1.15.5/data/keymaps/i386/dvorak/dvorak-es.map  2013-05-08 
14:58:20.206415053 +0200
+@@ -4,7 +4,7 @@
+ 
+ keymaps 0-2,4,5,6,8-10,12,14
+ include linux-with-alt-and-altgr
+-include euro
++include euro.map
+ strings as usual
+ 
+ keycode   1 = Escape

Copied: kbd/repos/testing-i686/fix-euro2.patch (from rev 184776, 
kbd/trunk/fix-euro2.patch)
===
--- testing-i686/fix-euro2.patch(rev 0)
+++ testing-i686/fix-euro2.patch2013-05-08 13:07:46 UTC (rev 184777)
@@ -0,0 +1,9 @@
+--- kbd-1.15.5/data/keymaps/i386/include/euro2.map.old 2013-05-08 
15:00:25.917752313 +0200
 kbd-1.15.5/data/keymaps/i386/include/euro2.map 2013-05-08 
15:00:54.943957367 +0200
+@@ -2,5 +2,5 @@
+ # [Say: loadkeys 

[arch-commits] Commit in kbd/repos (10 files)

2012-07-17 Thread Dave Reisner
Date: Tuesday, July 17, 2012 @ 22:17:05
  Author: dreisner
Revision: 163716

db-move: moved kbd from [testing] to [core] ( i686,  x86_64)

Added:
  kbd/repos/core-i686/PKGBUILD
(from rev 163713, kbd/repos/testing-i686/PKGBUILD)
  kbd/repos/core-i686/fix-es.po.patch
(from rev 163713, kbd/repos/testing-i686/fix-es.po.patch)
  kbd/repos/core-x86_64/PKGBUILD
(from rev 163713, kbd/repos/testing-x86_64/PKGBUILD)
  kbd/repos/core-x86_64/fix-es.po.patch
(from rev 163713, kbd/repos/testing-x86_64/fix-es.po.patch)
Deleted:
  kbd/repos/core-i686/PKGBUILD
  kbd/repos/core-i686/fix-es.po.patch
  kbd/repos/core-x86_64/PKGBUILD
  kbd/repos/core-x86_64/fix-es.po.patch
  kbd/repos/testing-i686/
  kbd/repos/testing-x86_64/

-+
 core-i686/PKGBUILD  |   82 +++---
 core-i686/fix-es.po.patch   |   22 +--
 core-x86_64/PKGBUILD|   82 +++---
 core-x86_64/fix-es.po.patch |   22 +--
 4 files changed, 98 insertions(+), 110 deletions(-)

Deleted: core-i686/PKGBUILD
===
--- core-i686/PKGBUILD  2012-07-18 02:16:59 UTC (rev 163715)
+++ core-i686/PKGBUILD  2012-07-18 02:17:05 UTC (rev 163716)
@@ -1,44 +0,0 @@
-# $Id$
-# Maintainer: Tobias Powalowski tp...@archlinux.org
-
-pkgname=kbd
-pkgver=1.15.3
-pkgrel=2
-pkgdesc=Keytable files and keyboard utilities
-arch=('i686' 'x86_64')
-url=ftp://ftp.altlinux.org/pub/people/legion/kbd/;
-license=('GPL')
-depends=('glibc')
-source=(ftp://ftp.altlinux.org/pub/people/legion/kbd/${pkgname}-${pkgver}.tar.gz
-fix-es.po.patch)
-md5sums=('8143e179a0f3c25646ce5085e8777200'
- '4ded3edb50fb7a3277bae6a870cee812')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np1 -i ../fix-es.po.patch
-  # rename keymap files with the same names
-  # this is needed because when only name of keymap is specified
-  # loadkeys loads the first keymap it can find, which is bad (see FS#13837)
-  # this should be removed when upstream adopts the change
-  mv data/keymaps/i386/qwertz/cz{,-qwertz}.map
-  mv data/keymaps/i386/olpc/es{,-olpc}.map
-  mv data/keymaps/i386/olpc/pt{,-olpc}.map
-  mv data/keymaps/i386/dvorak/no{,-dvorak}.map
-  mv data/keymaps/i386/fgGIod/trf{,-fgGIod}.map
-  mv data/keymaps/i386/colemak/{en-latin9,colemak}.map
-
-  ./configure --prefix=/usr --datadir=/usr/share/kbd --mandir=/usr/share/man
-  make KEYCODES_PROGS=yes RESIZECONS_PROGS=yes
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make KEYCODES_PROGS=yes RESIZECONS_PROGS=yes DESTDIR=${pkgdir} install
-
-  # this is needed because initscripts call /bin/loadkeys
-  # remove this when next versions of kbd
-  # and initscripts with /usr/bin/loadkeys usage will be released
-  mkdir ${pkgdir}/bin
-  ln -s /usr/bin/loadkeys ${pkgdir}/bin/loadkeys
-}

Copied: kbd/repos/core-i686/PKGBUILD (from rev 163713, 
kbd/repos/testing-i686/PKGBUILD)
===
--- core-i686/PKGBUILD  (rev 0)
+++ core-i686/PKGBUILD  2012-07-18 02:17:05 UTC (rev 163716)
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer: Tobias Powalowski tp...@archlinux.org
+
+pkgname=kbd
+pkgver=1.15.3
+pkgrel=3
+pkgdesc=Keytable files and keyboard utilities
+arch=('i686' 'x86_64')
+url=ftp://ftp.altlinux.org/pub/people/legion/kbd/;
+license=('GPL')
+depends=('glibc')
+source=(ftp://ftp.altlinux.org/pub/people/legion/kbd/${pkgname}-${pkgver}.tar.gz
+fix-es.po.patch)
+md5sums=('8143e179a0f3c25646ce5085e8777200'
+ '4ded3edb50fb7a3277bae6a870cee812')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  patch -Np1 -i ../fix-es.po.patch
+  # rename keymap files with the same names
+  # this is needed because when only name of keymap is specified
+  # loadkeys loads the first keymap it can find, which is bad (see FS#13837)
+  # this should be removed when upstream adopts the change
+  mv data/keymaps/i386/qwertz/cz{,-qwertz}.map
+  mv data/keymaps/i386/olpc/es{,-olpc}.map
+  mv data/keymaps/i386/olpc/pt{,-olpc}.map
+  mv data/keymaps/i386/dvorak/no{,-dvorak}.map
+  mv data/keymaps/i386/fgGIod/trf{,-fgGIod}.map
+  mv data/keymaps/i386/colemak/{en-latin9,colemak}.map
+
+  ./configure --prefix=/usr --datadir=/usr/share/kbd --mandir=/usr/share/man
+  make KEYCODES_PROGS=yes RESIZECONS_PROGS=yes
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make KEYCODES_PROGS=yes RESIZECONS_PROGS=yes DESTDIR=${pkgdir} install
+}

Deleted: core-i686/fix-es.po.patch
===
--- core-i686/fix-es.po.patch   2012-07-18 02:16:59 UTC (rev 163715)
+++ core-i686/fix-es.po.patch   2012-07-18 02:17:05 UTC (rev 163716)
@@ -1,11 +0,0 @@
 kbd-1.15.3/po/es.old   2011-05-14 23:12:49.0 +0200
-+++ kbd-1.15.3/po/es.po2011-05-15 21:07:02.120669404 +0200
-@@ -1363,7 +1363,7 @@
- #: src/setfont.c:682
- #, c-format
- msgid