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.000000000 +0200 -+++ kbd-1.15.3/po/es.po 2011-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 Copied: kbd/repos/core-i686/fix-es.po.patch (from rev 163713, kbd/repos/testing-i686/fix-es.po.patch) =================================================================== --- core-i686/fix-es.po.patch (rev 0) +++ core-i686/fix-es.po.patch 2012-07-18 02:17:05 UTC (rev 163716) @@ -0,0 +1,11 @@ +--- kbd-1.15.3/po/es.old 2011-05-14 23:12:49.000000000 +0200 ++++ kbd-1.15.3/po/es.po 2011-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 Deleted: core-x86_64/PKGBUILD =================================================================== --- core-x86_64/PKGBUILD 2012-07-18 02:16:59 UTC (rev 163715) +++ core-x86_64/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-x86_64/PKGBUILD (from rev 163713, kbd/repos/testing-x86_64/PKGBUILD) =================================================================== --- core-x86_64/PKGBUILD (rev 0) +++ core-x86_64/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-x86_64/fix-es.po.patch =================================================================== --- core-x86_64/fix-es.po.patch 2012-07-18 02:16:59 UTC (rev 163715) +++ core-x86_64/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.000000000 +0200 -+++ kbd-1.15.3/po/es.po 2011-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 Copied: kbd/repos/core-x86_64/fix-es.po.patch (from rev 163713, kbd/repos/testing-x86_64/fix-es.po.patch) =================================================================== --- core-x86_64/fix-es.po.patch (rev 0) +++ core-x86_64/fix-es.po.patch 2012-07-18 02:17:05 UTC (rev 163716) @@ -0,0 +1,11 @@ +--- kbd-1.15.3/po/es.old 2011-05-14 23:12:49.000000000 +0200 ++++ kbd-1.15.3/po/es.po 2011-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