[arch-commits] Commit in kbd/trunk (PKGBUILD vlock.pam)

[Tobias Powalowski via arch-commits]

Date: Friday, August 14, 2020 @ 12:27:18
  Author: tpowa
Revision: 394029

upgpkg: kbd 2.3.0-2: fix #61730, add vlock pam file

Added:
  kbd/trunk/vlock.pam
Modified:
  kbd/trunk/PKGBUILD

---+
 PKGBUILD  |9 ++---
 vlock.pam |5 +
 2 files changed, 11 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-08-14 08:36:12 UTC (rev 394028)
+++ PKGBUILD2020-08-14 12:27:18 UTC (rev 394029)
@@ -2,7 +2,7 @@
 
 pkgname=kbd
 pkgver=2.3.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Keytable files and keyboard utilities"
 arch=('x86_64')
 url="http://www.kbd-project.org;
@@ -12,12 +12,14 @@
 
#source=(https://www.kernel.org/pub/linux/utils/${pkgname}/${pkgname}-${pkgver}.tar.gz
 #
https://www.kernel.org/pub/linux/utils/kbd/${pkgname}-${pkgver}.tar.sign
 
source=(git+https://git.kernel.org/pub/scm/linux/kernel/git/legion/kbd.git#tag=v$pkgver
-'fix-euro2.patch')
+'fix-euro2.patch'
+   'vlock.pam')
 provides=('vlock')
 conflicts=('vlock')
 replaces=('vlock')
 sha256sums=('SKIP'
-'a5e0167b6a82a9eb4d581d56baab930c2d80f5541dc34630460b73e1115384b8')
+'a5e0167b6a82a9eb4d581d56baab930c2d80f5541dc34630460b73e1115384b8'
+'5c2d377a87121e7c399534fb91e2ffc0cc1e75d44a8f07ee6f55c9c089bc81e4')
 validpgpkeys=(
   '7F2A3D07298149A0793C9A4EA45ABA544CFFD434' #Alexey Gladkov 
  )
@@ -56,4 +58,5 @@
 package() {
   cd ${pkgname}
   make KEYCODES_PROGS=yes RESIZECONS_PROGS=yes DESTDIR="${pkgdir}" install
+  install -Dm644 ../vlock.pam "${pkgdir}"/etc/pam.d/vlock
 }

Added: vlock.pam
===
--- vlock.pam   (rev 0)
+++ vlock.pam   2020-08-14 12:27:18 UTC (rev 394029)
@@ -0,0 +1,5 @@
+#%PAM-1.0
+auth required pam_unix.so
+account required pam_unix.so
+password required pam_unix.so
+session required pam_unix.so

[arch-commits] Commit in kbd/trunk (PKGBUILD)

[Tobias Powalowski via arch-commits]

Date: Tuesday, July 21, 2020 @ 12:06:06
  Author: tpowa
Revision: 392322

upgpkg: kbd 2.3.0-1: bump to latest version

Modified:
  kbd/trunk/PKGBUILD

--+
 PKGBUILD |   16 +---
 1 file changed, 5 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-07-21 10:43:38 UTC (rev 392321)
+++ PKGBUILD2020-07-21 12:06:06 UTC (rev 392322)
@@ -1,8 +1,8 @@
 # Maintainer: Tobias Powalowski 
 
 pkgname=kbd
-pkgver=2.2.0
-pkgrel=5
+pkgver=2.3.0
+pkgrel=1
 pkgdesc="Keytable files and keyboard utilities"
 arch=('x86_64')
 url="http://www.kbd-project.org;
@@ -12,14 +12,12 @@
 
#source=(https://www.kernel.org/pub/linux/utils/${pkgname}/${pkgname}-${pkgver}.tar.gz
 #
https://www.kernel.org/pub/linux/utils/kbd/${pkgname}-${pkgver}.tar.sign
 
source=(git+https://git.kernel.org/pub/scm/linux/kernel/git/legion/kbd.git#tag=v$pkgver
-'fix-euro2.patch'
-'kbd-fix-loadkmap-compat.patch')
+'fix-euro2.patch')
 provides=('vlock')
 conflicts=('vlock')
 replaces=('vlock')
-md5sums=('SKIP'
- 'd869200acbc0aab6a9cafa43cb140d4e'
- '98f634bf1771834cdb94bc44aa2636ee')
+sha256sums=('SKIP'
+'a5e0167b6a82a9eb4d581d56baab930c2d80f5541dc34630460b73e1115384b8')
 validpgpkeys=(
   '7F2A3D07298149A0793C9A4EA45ABA544CFFD434' #Alexey Gladkov 
  )
@@ -37,10 +35,6 @@
   mv data/keymaps/i386/colemak/{en-latin9,colemak}.map
   # fix euro2 #28213
   patch -Np1 -i ../fix-euro2.patch
-  git cherry-pick -n 15a74479 # Don't override CFLAGS
-  git cherry-pick -n acf93e44 # https://github.com/legionus/kbd/issues/31
-  git cherry-pick -n 7e27102b # https://github.com/legionus/kbd/issues/32
-  patch -p1 -i ../kbd-fix-loadkmap-compat.patch # Restore compatibility with 
busybox loadkmap
   autoreconf -if
 }
 

[arch-commits] Commit in kbd/trunk (PKGBUILD)

[Felix Yan via arch-commits]

Date: Wednesday, November 13, 2019 @ 17:16:18
  Author: felixonmars
Revision: 368313

[core] mass rebuild

Modified:
  kbd/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-11-13 17:16:15 UTC (rev 368312)
+++ PKGBUILD2019-11-13 17:16:18 UTC (rev 368313)
@@ -2,7 +2,7 @@
 
 pkgname=kbd
 pkgver=2.2.0
-pkgrel=4
+pkgrel=5
 pkgdesc="Keytable files and keyboard utilities"
 arch=('x86_64')
 url="http://www.kbd-project.org;

[arch-commits] Commit in kbd/trunk (PKGBUILD)

[Antonio Rojas via arch-commits]

Date: Tuesday, October 8, 2019 @ 20:24:18
  Author: arojas
Revision: 364190

Fix quoting

Modified:
  kbd/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-10-08 20:23:51 UTC (rev 364189)
+++ PKGBUILD2019-10-08 20:24:18 UTC (rev 364190)
@@ -25,7 +25,7 @@
  )
 
 prepare() {
-  cd ${srcdir}/${pkgname}
+  cd ${pkgname}
   # 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)

[arch-commits] Commit in kbd/trunk (PKGBUILD kbd-fix-loadkmap-compat.patch)

[Antonio Rojas via arch-commits]

Date: Monday, October 7, 2019 @ 19:11:59
  Author: arojas
Revision: 364047

Use upstream fix for FS#63565 (FS#64058)

Modified:
  kbd/trunk/PKGBUILD
  kbd/trunk/kbd-fix-loadkmap-compat.patch

---+
 PKGBUILD  |4 ++--
 kbd-fix-loadkmap-compat.patch |   16 
 2 files changed, 14 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-10-07 18:55:21 UTC (rev 364046)
+++ PKGBUILD2019-10-07 19:11:59 UTC (rev 364047)
@@ -2,7 +2,7 @@
 
 pkgname=kbd
 pkgver=2.2.0
-pkgrel=3
+pkgrel=4
 pkgdesc="Keytable files and keyboard utilities"
 arch=('x86_64')
 url="http://www.kbd-project.org;
@@ -19,7 +19,7 @@
 replaces=('vlock')
 md5sums=('SKIP'
  'd869200acbc0aab6a9cafa43cb140d4e'
- '730b1054fbd88b87c27c5565bd7d4fc6')
+ '98f634bf1771834cdb94bc44aa2636ee')
 validpgpkeys=(
   '7F2A3D07298149A0793C9A4EA45ABA544CFFD434' #Alexey Gladkov 
  )

Modified: kbd-fix-loadkmap-compat.patch
===
--- kbd-fix-loadkmap-compat.patch   2019-10-07 18:55:21 UTC (rev 364046)
+++ kbd-fix-loadkmap-compat.patch   2019-10-07 19:11:59 UTC (rev 364047)
@@ -1,14 +1,22 @@
 diff --git a/src/libkeymap/dump.c b/src/libkeymap/dump.c
-index 83ac351..a7ba1e5 100644
+index 83ac351..8531b5a 100644
 --- a/src/libkeymap/dump.c
 +++ b/src/libkeymap/dump.c
-@@ -72,7 +72,7 @@ int lk_dump_bkeymap(struct lk_ctx *ctx, FILE *fd)
+@@ -72,9 +72,14 @@ int lk_dump_bkeymap(struct lk_ctx *ctx, FILE *fd)
continue;
  
for (j = 0; j < NR_KEYS / 2; j++) {
 -  int v = lk_get_key(ctx, i, j);
-+  short v = (short)lk_get_key(ctx, i, j);
++  int value = lk_get_key(ctx, i, j);
  
-   if (fwrite(, sizeof(v), 1, fd) != 1)
+-  if (fwrite(, sizeof(v), 1, fd) != 1)
++  if (value < 0 || value > USHRT_MAX) {
++  ERR(ctx, _("can not bind key %d to value %d 
because it is too large"), j, value);
++  goto fail;
++  }
++
++  if (fwrite(, sizeof(unsigned short), 1, fd) != 1)
goto fail;
+   }
+   }
 

[arch-commits] Commit in kbd/trunk (PKGBUILD kbd-fix-loadkmap-compat.patch)

[Antonio Rojas via arch-commits]

Date: Wednesday, August 28, 2019 @ 20:28:11
  Author: arojas
Revision: 361344

Restore compatibility with loadkmap (FS#63565), run test suite

Added:
  kbd/trunk/kbd-fix-loadkmap-compat.patch
Modified:
  kbd/trunk/PKGBUILD

---+
 PKGBUILD  |   20 
 kbd-fix-loadkmap-compat.patch |   14 ++
 2 files changed, 30 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-08-28 19:40:36 UTC (rev 361343)
+++ PKGBUILD2019-08-28 20:28:11 UTC (rev 361344)
@@ -2,7 +2,7 @@
 
 pkgname=kbd
 pkgver=2.2.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Keytable files and keyboard utilities"
 arch=('x86_64')
 url="http://www.kbd-project.org;
@@ -12,12 +12,14 @@
 
#source=(https://www.kernel.org/pub/linux/utils/${pkgname}/${pkgname}-${pkgver}.tar.gz
 #
https://www.kernel.org/pub/linux/utils/kbd/${pkgname}-${pkgver}.tar.sign
 
source=(git+https://git.kernel.org/pub/scm/linux/kernel/git/legion/kbd.git#tag=v$pkgver
-'fix-euro2.patch')
+'fix-euro2.patch'
+'kbd-fix-loadkmap-compat.patch')
 provides=('vlock')
 conflicts=('vlock')
 replaces=('vlock')
 md5sums=('SKIP'
- 'd869200acbc0aab6a9cafa43cb140d4e')
+ 'd869200acbc0aab6a9cafa43cb140d4e'
+ '730b1054fbd88b87c27c5565bd7d4fc6')
 validpgpkeys=(
   '7F2A3D07298149A0793C9A4EA45ABA544CFFD434' #Alexey Gladkov 
  )
@@ -38,6 +40,7 @@
   git cherry-pick -n 15a74479 # Don't override CFLAGS
   git cherry-pick -n acf93e44 # https://github.com/legionus/kbd/issues/31
   git cherry-pick -n 7e27102b # https://github.com/legionus/kbd/issues/32
+  patch -p1 -i ../kbd-fix-loadkmap-compat.patch # Restore compatibility with 
busybox loadkmap
   autoreconf -if
 }
 
@@ -47,7 +50,16 @@
   make KEYCODES_PROGS=yes RESIZECONS_PROGS=yes
 }
 
+check() {
+  cd ${pkgname}
+
+# This test is expected to fail since kbd-fix-loadkmap-compat.patch modifies 
the binary format
+  sed -e 's|dumpkeys-bkeymap ||' -i tests/Makefile
+
+  make check
+}
+
 package() {
   cd ${pkgname}
-  make KEYCODES_PROGS=yes RESIZECONS_PROGS=yes DESTDIR=${pkgdir} install
+  make KEYCODES_PROGS=yes RESIZECONS_PROGS=yes DESTDIR="${pkgdir}" install
 }

Added: kbd-fix-loadkmap-compat.patch
===
--- kbd-fix-loadkmap-compat.patch   (rev 0)
+++ kbd-fix-loadkmap-compat.patch   2019-08-28 20:28:11 UTC (rev 361344)
@@ -0,0 +1,14 @@
+diff --git a/src/libkeymap/dump.c b/src/libkeymap/dump.c
+index 83ac351..a7ba1e5 100644
+--- a/src/libkeymap/dump.c
 b/src/libkeymap/dump.c
+@@ -72,7 +72,7 @@ int lk_dump_bkeymap(struct lk_ctx *ctx, FILE *fd)
+   continue;
+ 
+   for (j = 0; j < NR_KEYS / 2; j++) {
+-  int v = lk_get_key(ctx, i, j);
++  short v = (short)lk_get_key(ctx, i, j);
+ 
+   if (fwrite(, sizeof(v), 1, fd) != 1)
+   goto fail;
+

[arch-commits] Commit in kbd/trunk (PKGBUILD)

[Antonio Rojas via arch-commits]

Date: Tuesday, August 27, 2019 @ 13:53:37
  Author: arojas
Revision: 361276

Remove unused patches

Modified:
  kbd/trunk/PKGBUILD

--+
 PKGBUILD |   10 ++
 1 file changed, 2 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-08-27 13:48:22 UTC (rev 361275)
+++ PKGBUILD2019-08-27 13:53:37 UTC (rev 361276)
@@ -12,18 +12,12 @@
 
#source=(https://www.kernel.org/pub/linux/utils/${pkgname}/${pkgname}-${pkgver}.tar.gz
 #
https://www.kernel.org/pub/linux/utils/kbd/${pkgname}-${pkgver}.tar.sign
 
source=(git+https://git.kernel.org/pub/scm/linux/kernel/git/legion/kbd.git#tag=v$pkgver
-'fix-euro2.patch'
-
kbd-dont-override-cflags.patch::"https://github.com/legionus/kbd/commit/15a74479.patch;
-kbd-31.patch::"https://github.com/legionus/kbd/commit/acf93e44.patch;
-kbd-32.patch::"https://github.com/legionus/kbd/commit/7e27102b.patch;)
+'fix-euro2.patch')
 provides=('vlock')
 conflicts=('vlock')
 replaces=('vlock')
 md5sums=('SKIP'
- 'd869200acbc0aab6a9cafa43cb140d4e'
- 'f33bf61aa3e57befa0408c7578c81c7d'
- '9e515a98f7ee1a2c1562c0e93467fa6d'
- '9fc8d774887a55a7e4bc79240a2986c5')
+ 'd869200acbc0aab6a9cafa43cb140d4e')
 validpgpkeys=(
   '7F2A3D07298149A0793C9A4EA45ABA544CFFD434' #Alexey Gladkov 
  )

[arch-commits] Commit in kbd/trunk (PKGBUILD)

[Antonio Rojas via arch-commits]

Date: Monday, August 26, 2019 @ 11:49:24
  Author: arojas
Revision: 361224

Update to 2.2.0

Modified:
  kbd/trunk/PKGBUILD

--+
 PKGBUILD |7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-08-26 11:45:07 UTC (rev 361223)
+++ PKGBUILD2019-08-26 11:49:24 UTC (rev 361224)
@@ -1,8 +1,8 @@
 # Maintainer: Tobias Powalowski 
 
 pkgname=kbd
-pkgver=2.0.4
-pkgrel=2
+pkgver=2.2.0
+pkgrel=1
 pkgdesc="Keytable files and keyboard utilities"
 arch=('x86_64')
 url="http://www.kbd-project.org;
@@ -28,7 +28,6 @@
   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
@@ -45,6 +44,6 @@
   cd ${srcdir}/${pkgname}-${pkgver}
   make KEYCODES_PROGS=yes RESIZECONS_PROGS=yes DESTDIR=${pkgdir} install
 }
-md5sums=('c69fce737a5fd0fa686cbfc4f611a220'
+md5sums=('5b07c5cf73f2a2bdff5a489368969f70'
  'SKIP'
  'd869200acbc0aab6a9cafa43cb140d4e')

[arch-commits] Commit in kbd/trunk (PKGBUILD)

[Allan McRae via arch-commits]

Date: Wednesday, November 7, 2018 @ 00:09:38
  Author: allan
Revision: 338015

upgpkg: kbd 2.0.4-2

get some PIE and a new format .BUILDINFO

Modified:
  kbd/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-11-06 22:45:40 UTC (rev 338014)
+++ PKGBUILD2018-11-07 00:09:38 UTC (rev 338015)
@@ -2,7 +2,7 @@
 
 pkgname=kbd
 pkgver=2.0.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Keytable files and keyboard utilities"
 arch=('x86_64')
 url="http://www.kbd-project.org;

[arch-commits] Commit in kbd/trunk (PKGBUILD)

[Jelle van der Waa]

Date: Friday, November 24, 2017 @ 22:34:20
  Author: jelle
Revision: 310833

update source to https

the ftp.kernel.org died, so update to https

Modified:
  kbd/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-11-24 22:29:46 UTC (rev 310832)
+++ PKGBUILD2017-11-24 22:34:20 UTC (rev 310833)
@@ -10,8 +10,8 @@
 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
+source=(https://www.kernel.org/pub/linux/utils/${pkgname}/${pkgname}-${pkgver}.tar.gz
+https://www.kernel.org/pub/linux/utils/kbd/${pkgname}-${pkgver}.tar.sign
 'fix-euro2.patch')
 provides=('vlock')
 conflicts=('vlock')

[arch-commits] Commit in kbd/trunk (PKGBUILD)

[Tobias Powalowski]

Date: Saturday, January 21, 2017 @ 10:46:16
  Author: tpowa
Revision: 287073

upgpkg: kbd 2.0.4-1

bump to latest version

Modified:
  kbd/trunk/PKGBUILD

--+
 PKGBUILD |   13 +
 1 file changed, 9 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-01-21 09:53:00 UTC (rev 287072)
+++ PKGBUILD2017-01-21 10:46:16 UTC (rev 287073)
@@ -2,7 +2,7 @@
 # Maintainer: Tobias Powalowski 
 
 pkgname=kbd
-pkgver=2.0.3
+pkgver=2.0.4
 pkgrel=1
 pkgdesc="Keytable files and keyboard utilities"
 arch=('i686' 'x86_64')
@@ -10,13 +10,15 @@
 license=('GPL')
 depends=('glibc' 'pam')
 makedepends=('check')
-source=(ftp://ftp.altlinux.org/pub/people/legion/kbd/${pkgname}-${pkgver}.tar.gz
+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')
-md5sums=('d636ee56f35233b5cd6f855c08372489'
- 'd869200acbc0aab6a9cafa43cb140d4e')
+validpgpkeys=(
+  '7F2A3D07298149A0793C9A4EA45ABA544CFFD434' #Alexey Gladkov 
+ )
 
 prepare() {
   cd ${srcdir}/${pkgname}-${pkgver}
@@ -44,3 +46,6 @@
   cd ${srcdir}/${pkgname}-${pkgver}
   make KEYCODES_PROGS=yes RESIZECONS_PROGS=yes DESTDIR=${pkgdir} install
 }
+md5sums=('c69fce737a5fd0fa686cbfc4f611a220'
+ 'SKIP'
+ 'd869200acbc0aab6a9cafa43cb140d4e')

[arch-commits] Commit in kbd/trunk (PKGBUILD)

[Tobias Powalowski]

Date: Tuesday, July 14, 2015 @ 08:00:16
  Author: tpowa
Revision: 242187

upgpkg: kbd 2.0.3-1

bump to latest version

Modified:
  kbd/trunk/PKGBUILD

--+
 PKGBUILD |8 ++--
 1 file changed, 2 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-07-14 03:37:15 UTC (rev 242186)
+++ PKGBUILD2015-07-14 06:00:16 UTC (rev 242187)
@@ -2,7 +2,7 @@
 # Maintainer: Tobias Powalowski tp...@archlinux.org
 
 pkgname=kbd
-pkgver=2.0.2
+pkgver=2.0.3
 pkgrel=1
 pkgdesc=Keytable files and keyboard utilities
 arch=('i686' 'x86_64')
@@ -11,13 +11,11 @@
 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'
+md5sums=('d636ee56f35233b5cd6f855c08372489'
  'd869200acbc0aab6a9cafa43cb140d4e')
 
 prepare() {
@@ -32,8 +30,6 @@
   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
 }

[arch-commits] Commit in kbd/trunk (PKGBUILD)

[Tobias Powalowski]

Date: Thursday, July 31, 2014 @ 09:06:47
  Author: tpowa
Revision: 218426

upgpkg: kbd 2.0.2-1

bump to latest version

Modified:
  kbd/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-07-31 07:00:11 UTC (rev 218425)
+++ PKGBUILD2014-07-31 07:06:47 UTC (rev 218426)
@@ -2,7 +2,7 @@
 # Maintainer: Tobias Powalowski tp...@archlinux.org
 
 pkgname=kbd
-pkgver=2.0.1
+pkgver=2.0.2
 pkgrel=1
 pkgdesc=Keytable files and keyboard utilities
 arch=('i686' 'x86_64')
@@ -16,7 +16,7 @@
 provides=('vlock')
 conflicts=('vlock')
 replaces=('vlock')
-md5sums=('cc0ee9f2537d8636cae85a8c6541ed2e'
+md5sums=('f1f75f0dd5f7dde89ce47585274366f8'
  '998957c4f815347dcc874c4d7555dc66'
  'd869200acbc0aab6a9cafa43cb140d4e')
 

[arch-commits] Commit in kbd/trunk (PKGBUILD)

[Tobias Powalowski]

Date: Monday, August 19, 2013 @ 12:46:28
  Author: tpowa
Revision: 193386

upgpkg: kbd 2.0.0-1

bump to 2.0.0

Modified:
  kbd/trunk/PKGBUILD

--+
 PKGBUILD |   16 ++--
 1 file changed, 6 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-08-19 10:45:30 UTC (rev 193385)
+++ PKGBUILD2013-08-19 10:46:28 UTC (rev 193386)
@@ -2,20 +2,23 @@
 # Maintainer: Tobias Powalowski tp...@archlinux.org
 
 pkgname=kbd
-pkgver=1.15.5
-pkgrel=4
+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-keymap-loading-1.15.5.patch'
 'fix-dvorak-es.patch'
 'fix-euro2.patch')
 provides=('vlock')
 conflicts=('vlock')
 replaces=('vlock')
+md5sums=('5ba259a0b2464196f6488a72070a3d60'
+ '998957c4f815347dcc874c4d7555dc66'
+ 'd869200acbc0aab6a9cafa43cb140d4e')
 
 prepare() {
   cd ${srcdir}/${pkgname}-${pkgver}
@@ -29,9 +32,6 @@
   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
@@ -48,7 +48,3 @@
   cd ${srcdir}/${pkgname}-${pkgver}
   make KEYCODES_PROGS=yes RESIZECONS_PROGS=yes DESTDIR=${pkgdir} install
 }
-md5sums=('34c71feead8ab9c01ec638acea8cd877'
- '4362091d5e23bab2d158f8c7693a45d8'
- '998957c4f815347dcc874c4d7555dc66'
- 'd869200acbc0aab6a9cafa43cb140d4e')

[arch-commits] Commit in kbd/trunk (PKGBUILD fix-dvorak-es.patch fix-euro2.patch)

[Tobias Powalowski]

Date: Wednesday, May 8, 2013 @ 15:07:34
  Author: tpowa
Revision: 184776

upgpkg: kbd 1.15.5-4

fix #33662 #28213

Added:
  kbd/trunk/fix-dvorak-es.patch
  kbd/trunk/fix-euro2.patch
Modified:
  kbd/trunk/PKGBUILD

-+
 PKGBUILD|   22 +-
 fix-dvorak-es.patch |   11 +++
 fix-euro2.patch |9 +
 3 files changed, 37 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-05-08 10:44:44 UTC (rev 184775)
+++ PKGBUILD2013-05-08 13:07:34 UTC (rev 184776)
@@ -3,21 +3,21 @@
 
 pkgname=kbd
 pkgver=1.15.5
-pkgrel=3
+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-keymap-loading-1.15.5.patch'
+'fix-dvorak-es.patch'
+'fix-euro2.patch')
 provides=('vlock')
 conflicts=('vlock')
 replaces=('vlock')
-md5sums=('34c71feead8ab9c01ec638acea8cd877'
- '4362091d5e23bab2d158f8c7693a45d8')
 
-build() {
+prepare() {
   cd ${srcdir}/${pkgname}-${pkgver}
   # rename keymap files with the same names
   # this is needed because when only name of keymap is specified
@@ -32,6 +32,14 @@
   # 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
 }
@@ -40,3 +48,7 @@
   cd ${srcdir}/${pkgname}-${pkgver}
   make KEYCODES_PROGS=yes RESIZECONS_PROGS=yes DESTDIR=${pkgdir} install
 }
+md5sums=('34c71feead8ab9c01ec638acea8cd877'
+ '4362091d5e23bab2d158f8c7693a45d8'
+ '998957c4f815347dcc874c4d7555dc66'
+ 'd869200acbc0aab6a9cafa43cb140d4e')

Added: fix-dvorak-es.patch
===
--- fix-dvorak-es.patch (rev 0)
+++ fix-dvorak-es.patch 2013-05-08 13:07:34 UTC (rev 184776)
@@ -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

Added: fix-euro2.patch
===
--- fix-euro2.patch (rev 0)
+++ fix-euro2.patch 2013-05-08 13:07:34 UTC (rev 184776)
@@ -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

[arch-commits] Commit in kbd/trunk (PKGBUILD fix-keymap-loading-1.15.5.patch)

[Tobias Powalowski]

Date: Wednesday, January 16, 2013 @ 13:18:07
  Author: tpowa
Revision: 175210

upgpkg: kbd 1.15.5-3

fix keymap loading

Added:
  kbd/trunk/fix-keymap-loading-1.15.5.patch
Modified:
  kbd/trunk/PKGBUILD

-+
 PKGBUILD|   12 ++---
 fix-keymap-loading-1.15.5.patch |   47 ++
 2 files changed, 55 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-01-16 17:39:36 UTC (rev 175209)
+++ PKGBUILD2013-01-16 18:18:07 UTC (rev 175210)
@@ -3,17 +3,19 @@
 
 pkgname=kbd
 pkgver=1.15.5
-pkgrel=2
+pkgrel=3
 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)
+source=(ftp://ftp.altlinux.org/pub/people/legion/kbd/${pkgname}-${pkgver}.tar.gz
+'fix-keymap-loading-1.15.5.patch')
 provides=('vlock')
 conflicts=('vlock')
 replaces=('vlock')
-md5sums=('34c71feead8ab9c01ec638acea8cd877')
+md5sums=('34c71feead8ab9c01ec638acea8cd877'
+ '4362091d5e23bab2d158f8c7693a45d8')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
@@ -27,7 +29,9 @@
   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
   ./configure --prefix=/usr --datadir=/usr/share/kbd --mandir=/usr/share/man
   make KEYCODES_PROGS=yes RESIZECONS_PROGS=yes
 }

Added: fix-keymap-loading-1.15.5.patch
===
--- fix-keymap-loading-1.15.5.patch (rev 0)
+++ fix-keymap-loading-1.15.5.patch 2013-01-16 18:18:07 UTC (rev 175210)
@@ -0,0 +1,47 @@
+commit 7e06e56157e8431d02e1377cdc44230944203d88
+Author: Alexey Gladkov gladkov.ale...@gmail.com
+Date:   Tue Dec 11 14:24:44 2012 +0400
+
+Fix regression in 16117ce6ab
+
+Signed-off-by: Alexey Gladkov gladkov.ale...@gmail.com
+
+diff --git a/src/loadkeys.analyze.l b/src/loadkeys.analyze.l
+index c18dcea..f817c78 100644
+--- a/src/loadkeys.analyze.l
 b/src/loadkeys.analyze.l
+@@ -307,8 +307,10 @@ To  to|To|TO
+   char *s = xstrndup(yytext+1, strlen(yytext)-2);
+   /* use static pathname to store *s ? */
+   open_include(s);
+-  yy_pop_state();
+-  state_ptr--;
++  while (state_ptr  0) {
++  yy_pop_state();
++  state_ptr--;
++  }
+   }
+ INCLSTR[^]|\\|\[^\n]*{Eol} {
+   yyerror(_(expected filename between quotes));
+@@ -323,7 +325,7 @@ To  to|To|TO
+   }
+ {Eol} {
+   line_nr++;
+-  if (state_ptr  0) {
++  while (state_ptr  0) {
+   yy_pop_state();
+   state_ptr--;
+   }
+@@ -428,8 +430,10 @@ To  to|To|TO
+   }
+ STR\   {
+   *p = '\0';
+-  yy_pop_state();
+-  state_ptr--;
++  while (state_ptr  0) {
++  yy_pop_state();
++  state_ptr--;
++  }
+   return(STRLITERAL);
+   }
+ . {

[arch-commits] Commit in kbd/trunk (PKGBUILD fix-es.po.patch)

[Tobias Powalowski]

Date: Wednesday, December 19, 2012 @ 09:01:53
  Author: tpowa
Revision: 173342

upgpkg: kbd 1.15.5-1

bump to latest version

Modified:
  kbd/trunk/PKGBUILD
Deleted:
  kbd/trunk/fix-es.po.patch

-+
 PKGBUILD|   13 +
 fix-es.po.patch |   11 ---
 2 files changed, 5 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-12-19 13:50:59 UTC (rev 173341)
+++ PKGBUILD2012-12-19 14:01:53 UTC (rev 173342)
@@ -2,21 +2,18 @@
 # Maintainer: Tobias Powalowski tp...@archlinux.org
 
 pkgname=kbd
-pkgver=1.15.3
-pkgrel=3
+pkgver=1.15.5
+pkgrel=1
 pkgdesc=Keytable files and keyboard utilities
 arch=('i686' 'x86_64')
 url=http://www.kbd-project.org;
 license=('GPL')
-depends=('glibc')
-source=(ftp://ftp.altlinux.org/pub/people/legion/kbd/${pkgname}-${pkgver}.tar.gz
-fix-es.po.patch)
-md5sums=('8143e179a0f3c25646ce5085e8777200'
- '4ded3edb50fb7a3277bae6a870cee812')
+depends=('glibc' 'pam')
+source=(ftp://ftp.altlinux.org/pub/people/legion/kbd/${pkgname}-${pkgver}.tar.gz)
+md5sums=('34c71feead8ab9c01ec638acea8cd877')
 
 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)

Deleted: fix-es.po.patch
===
--- fix-es.po.patch 2012-12-19 13:50:59 UTC (rev 173341)
+++ fix-es.po.patch 2012-12-19 14:01:53 UTC (rev 173342)
@@ -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 Saved %d-char %dx%d font file on %s\n
--msgstr Se ha guardado el fichero de tipos %2$dx%3$d de %1$d caracteres en 
%s\n
-+msgstr Se ha guardado el fichero de tipos %dx%d de %d caracteres en %s\n
- 
- #: src/setkeycodes.c:21
- #, c-format

[arch-commits] Commit in kbd/trunk (PKGBUILD)

[Tobias Powalowski]

Date: Wednesday, December 19, 2012 @ 12:49:51
  Author: tpowa
Revision: 173497

upgpkg: kbd 1.15.5-2

added vlock conflict and replaces

Modified:
  kbd/trunk/PKGBUILD

--+
 PKGBUILD |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-12-19 15:01:23 UTC (rev 173496)
+++ PKGBUILD2012-12-19 17:49:51 UTC (rev 173497)
@@ -3,13 +3,16 @@
 
 pkgname=kbd
 pkgver=1.15.5
-pkgrel=1
+pkgrel=2
 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)
+provides=('vlock')
+conflicts=('vlock')
+replaces=('vlock')
 md5sums=('34c71feead8ab9c01ec638acea8cd877')
 
 build() {

[arch-commits] Commit in kbd/trunk (PKGBUILD)

[Tobias Powalowski]

Date: Wednesday, August 29, 2012 @ 03:42:41
  Author: tpowa
Revision: 165685

update project page

Modified:
  kbd/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-08-29 05:14:58 UTC (rev 165684)
+++ PKGBUILD2012-08-29 07:42:41 UTC (rev 165685)
@@ -6,7 +6,7 @@
 pkgrel=3
 pkgdesc=Keytable files and keyboard utilities
 arch=('i686' 'x86_64')
-url=ftp://ftp.altlinux.org/pub/people/legion/kbd/;
+url=http://www.kbd-project.org;
 license=('GPL')
 depends=('glibc')
 
source=(ftp://ftp.altlinux.org/pub/people/legion/kbd/${pkgname}-${pkgver}.tar.gz

[arch-commits] Commit in kbd/trunk (PKGBUILD)

[Dave Reisner]

Date: Sunday, July 15, 2012 @ 21:58:39
  Author: dreisner
Revision: 163564

upgpkg: kbd 1.15.3-3

- remove symlink hack; initscript doesn't call loadkeys directly

Modified:
  kbd/trunk/PKGBUILD

--+
 PKGBUILD |8 +---
 1 file changed, 1 insertion(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-07-16 01:29:27 UTC (rev 163563)
+++ PKGBUILD2012-07-16 01:58:39 UTC (rev 163564)
@@ -3,7 +3,7 @@
 
 pkgname=kbd
 pkgver=1.15.3
-pkgrel=2
+pkgrel=3
 pkgdesc=Keytable files and keyboard utilities
 arch=('i686' 'x86_64')
 url=ftp://ftp.altlinux.org/pub/people/legion/kbd/;
@@ -35,10 +35,4 @@
 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
 }

[arch-commits] Commit in kbd/trunk (PKGBUILD)

[Tobias Powalowski]

Date: Wednesday, October 5, 2011 @ 10:28:52
  Author: tpowa
Revision: 139864

upgpkg: kbd 1.15.3-2

fix colemak layout

Modified:
  kbd/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-10-05 14:22:51 UTC (rev 139863)
+++ PKGBUILD2011-10-05 14:28:52 UTC (rev 139864)
@@ -3,7 +3,7 @@
 
 pkgname=kbd
 pkgver=1.15.3
-pkgrel=1
+pkgrel=2
 pkgdesc=Keytable files and keyboard utilities
 arch=('i686' 'x86_64')
 url=ftp://ftp.altlinux.org/pub/people/legion/kbd/;
@@ -11,7 +11,8 @@
 depends=('glibc')
 
source=(ftp://ftp.altlinux.org/pub/people/legion/kbd/${pkgname}-${pkgver}.tar.gz
 fix-es.po.patch)
-md5sums=('8143e179a0f3c25646ce5085e8777200')
+md5sums=('8143e179a0f3c25646ce5085e8777200'
+ '4ded3edb50fb7a3277bae6a870cee812')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
@@ -25,6 +26,7 @@
   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
@@ -40,5 +42,3 @@
   mkdir ${pkgdir}/bin
   ln -s /usr/bin/loadkeys ${pkgdir}/bin/loadkeys
 }
-md5sums=('8143e179a0f3c25646ce5085e8777200'
- '4ded3edb50fb7a3277bae6a870cee812')

[arch-commits] Commit in kbd/trunk (PKGBUILD fix-es.po.patch)

[Tobias Powalowski]

Date: Sunday, May 15, 2011 @ 15:12:02
  Author: tpowa
Revision: 123997

upgpkg: kbd 1.15.3-1
bump to latest version

Added:
  kbd/trunk/fix-es.po.patch
Modified:
  kbd/trunk/PKGBUILD

-+
 PKGBUILD|   17 -
 fix-es.po.patch |   11 +++
 2 files changed, 23 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-05-15 17:50:09 UTC (rev 123996)
+++ PKGBUILD2011-05-15 19:12:02 UTC (rev 123997)
@@ -2,19 +2,20 @@
 # Maintainer: Tobias Powalowski tp...@archlinux.org
 
 pkgname=kbd
-pkgver=1.15.2
+pkgver=1.15.3
 pkgrel=1
 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)
-md5sums=('77d0b51454522bc6c170bbdc6e31202a')
+source=(ftp://ftp.altlinux.org/pub/people/legion/kbd/${pkgname}-${pkgver}.tar.gz
+fix-es.po.patch)
+md5sums=('8143e179a0f3c25646ce5085e8777200')
 
 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)
@@ -26,7 +27,11 @@
   mv data/keymaps/i386/fgGIod/trf{,-fgGIod}.map
 
   ./configure --prefix=/usr --datadir=/usr/share/kbd --mandir=/usr/share/man
-  make KEYCODES_PROGS=yes RESIZECONS_PROGS=yes || return 1
+  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
@@ -35,3 +40,5 @@
   mkdir ${pkgdir}/bin
   ln -s /usr/bin/loadkeys ${pkgdir}/bin/loadkeys
 }
+md5sums=('8143e179a0f3c25646ce5085e8777200'
+ '4ded3edb50fb7a3277bae6a870cee812')

Added: fix-es.po.patch
===
--- fix-es.po.patch (rev 0)
+++ fix-es.po.patch 2011-05-15 19:12:02 UTC (rev 123997)
@@ -0,0 +1,11 @@
+--- 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 Saved %d-char %dx%d font file on %s\n
+-msgstr Se ha guardado el fichero de tipos %2$dx%3$d de %1$d caracteres en 
%s\n
++msgstr Se ha guardado el fichero de tipos %dx%d de %d caracteres en %s\n
+ 
+ #: src/setkeycodes.c:21
+ #, c-format

[arch-commits] Commit in kbd/trunk (PKGBUILD)

[Allan McRae]

Date: Tuesday, June 15, 2010 @ 01:16:19
  Author: allan
Revision: 82650

fix $startdir usage

Modified:
  kbd/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-06-15 04:52:48 UTC (rev 82649)
+++ PKGBUILD2010-06-15 05:16:19 UTC (rev 82650)
@@ -13,7 +13,7 @@
 md5sums=('77d0b51454522bc6c170bbdc6e31202a')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
+  cd ${srcdir}/${pkgname}-${pkgver}
 
   # rename keymap files with the same names
   # this is needed because when only name of keymap is specified
@@ -27,11 +27,11 @@
 
   ./configure --prefix=/usr --datadir=/usr/share/kbd --mandir=/usr/share/man
   make KEYCODES_PROGS=yes RESIZECONS_PROGS=yes || return 1
-  make KEYCODES_PROGS=yes RESIZECONS_PROGS=yes DESTDIR=${startdir}/pkg install
+  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 ${startdir}/pkg/bin
-  ln -s /usr/bin/loadkeys ${startdir}/pkg/bin/loadkeys
+  mkdir ${pkgdir}/bin
+  ln -s /usr/bin/loadkeys ${pkgdir}/bin/loadkeys
 }

[arch-commits] Commit in kbd/trunk (PKGBUILD)

[Tobias Powalowski]

Date: Monday, April 12, 2010 @ 14:05:20
  Author: tpowa
Revision: 77418

upgpkg: kbd 1.15.2-1
bump to latest version

Modified:
  kbd/trunk/PKGBUILD

--+
 PKGBUILD |7 ++-
 1 file changed, 2 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-04-12 18:04:07 UTC (rev 77417)
+++ PKGBUILD2010-04-12 18:05:20 UTC (rev 77418)
@@ -2,7 +2,7 @@
 # Maintainer: Tobias Powalowski tp...@archlinux.org
 
 pkgname=kbd
-pkgver=1.15.1
+pkgver=1.15.2
 pkgrel=1
 pkgdesc=Keytable files and keyboard utilities
 arch=('i686' 'x86_64')
@@ -10,7 +10,7 @@
 license=('GPL')
 depends=('glibc')
 
source=(ftp://ftp.altlinux.org/pub/people/legion/kbd/${pkgname}-${pkgver}.tar.gz)
-md5sums=('f997c490fe5ede839aacf31da6c4eb06')
+md5sums=('77d0b51454522bc6c170bbdc6e31202a')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
@@ -25,9 +25,6 @@
   mv data/keymaps/i386/dvorak/no{,-dvorak}.map
   mv data/keymaps/i386/fgGIod/trf{,-fgGIod}.map
 
-  aclocal
-  autoconf
-  automake --add-missing
   ./configure --prefix=/usr --datadir=/usr/share/kbd --mandir=/usr/share/man
   make KEYCODES_PROGS=yes RESIZECONS_PROGS=yes || return 1
   make KEYCODES_PROGS=yes RESIZECONS_PROGS=yes DESTDIR=${startdir}/pkg install