packages: kbd/kbd-ngettext.patch, kbd/kbd.spec, kbd/kbd-po.patch, kbd/kbd-m...
qboosh
qboosh at pld-linux.org
Thu May 26 21:53:33 CEST 2011
Author: qboosh Date: Thu May 26 19:53:33 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- updated to 1.15.3
- updated ngettext patch
- removed obsolete missing-nls patch
- added po patch (fix one es.po error)
---- Files affected:
packages/kbd:
kbd-ngettext.patch (1.3 -> 1.4) , kbd.spec (1.109 -> 1.110) , kbd-po.patch (1.4 -> 1.5) , kbd-missing-nls.patch (1.5 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/kbd/kbd-ngettext.patch
diff -u packages/kbd/kbd-ngettext.patch:1.3 packages/kbd/kbd-ngettext.patch:1.4
--- packages/kbd/kbd-ngettext.patch:1.3 Thu May 6 09:22:23 2010
+++ packages/kbd/kbd-ngettext.patch Thu May 26 21:53:28 2011
@@ -1,27 +1,29 @@
---- kbd-1.15/src/loadkeys.y.orig 2008-10-23 21:03:59.000000000 +0200
-+++ kbd-1.15/src/loadkeys.y 2008-12-05 22:13:37.720317959 +0100
-@@ -1044,15 +1044,13 @@
- keyct = defkeys(fd, console, warned);
+--- kbd-1.15.3/src/loadkeys.y.orig 2011-05-02 01:19:11.000000000 +0200
++++ kbd-1.15.3/src/loadkeys.y 2011-05-25 22:05:36.323510071 +0200
+@@ -582,17 +582,15 @@
funcct = deffuncs(fd);
+
if (verbose) {
-- printf(_("\nChanged %d %s and %d %s.\n"),
+- printf(_("\nChanged %d %s and %d %s.\n"),
- keyct, (keyct == 1) ? _("key") : _("keys"),
- funcct, (funcct == 1) ? _("string") : _("strings"));
+ printf(ngettext("\nChanged %d key", "\nChanged %d keys", keyct), keyct);
+ printf(ngettext(" and %d string.\n", " and %d strings.\n", funcct), funcct);
}
+
if (accent_table_size > 0 || nocompose) {
- diacct = defdiacs(fd);
- if (verbose) {
-- printf(_("Loaded %d compose %s.\n"), diacct,
-- (diacct == 1) ? _("definition") : _("definitions"));
-+ printf(ngettext("Loaded %d compose definition.\n", "Loaded %d compose definitions.\n", diacct), diacct);
- }
- }
- else
---- kbd-1.15/po/pl.po.orig 2008-12-01 20:58:05.000000000 +0100
-+++ kbd-1.15/po/pl.po 2008-12-05 22:25:04.324293655 +0100
-@@ -13,6 +13,7 @@
+ diacct = defdiacs(fd);
+
+ if (verbose) {
+- printf(_("Loaded %d compose %s.\n"),
+- diacct, (diacct == 1) ? _("definition") : _("definitions"));
++ printf(ngettext("Loaded %d compose definition.\n", "Loaded %d compose definitions.\n", diacct), diacct);
+ }
+
+ } else if (verbose) {
+--- kbd-1.15.3/po/pl.po.orig 2011-05-14 23:07:50.000000000 +0200
++++ kbd-1.15.3/po/pl.po 2011-05-26 20:54:15.239593047 +0200
+@@ -14,6 +14,7 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-2\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -29,12 +31,12 @@
#: src/chvt.c:28
#, c-format
-@@ -615,47 +616,41 @@
+@@ -620,45 +621,39 @@
msgid "impossible error in do_constant"
msgstr "niemo¿liwy b³±d w do_constant"
-# XXX: ngettext should be used for the following five messages
- #: loadkeys.y:1113
+ #: loadkeys.y:585
#, c-format
msgid ""
"\n"
@@ -42,15 +44,23 @@
-msgstr ""
+"Changed %d key"
+msgid_plural ""
++"\n"
++"Changed %d keys"
++msgstr[0] ""
"\n"
-"Zmienionych klawiszy: %d%s ³añcuchów: %d%s\n"
-
--#: loadkeys.y:1114
+-#: loadkeys.y:586
-msgid "key"
-msgstr ","
-+"Changed %d keys"
-+msgstr[0] ""
-+"\n"
+-
+-#: loadkeys.y:586
+-msgid "keys"
+-msgstr ","
+-
+-#: loadkeys.y:587
+-msgid "string"
+-msgstr "."
+"Zmieniono %d klawisz"
+msgstr[1] ""
+"\n"
@@ -59,47 +69,34 @@
+"\n"
+"Zmieniono %d klawiszy"
- #: loadkeys.y:1114
--msgid "keys"
--msgstr ","
--
--#: loadkeys.y:1115
--msgid "string"
--msgstr "."
--
--#: loadkeys.y:1115
+ #: loadkeys.y:587
-msgid "strings"
-msgstr "."
--
++#, c-format
++msgid " and %d string.\n"
++msgid_plural " and %d strings.\n"
++msgstr[0] " i %d ³añcuch.\n"
++msgstr[1] " i %d ³añcuchy.\n"
++msgstr[2] " i %d ³añcuchów.\n"
+
-# XXX: ngettext should be used for the following three messages
--#: loadkeys.y:1120
+ #: loadkeys.y:594
#, c-format
-msgid "Loaded %d compose %s.\n"
-msgstr "Wczytanych definicji compose: %d%s\n"
-
--#: loadkeys.y:1121
+-#: loadkeys.y:595
-msgid "definition"
-msgstr "."
-+msgid " and %d string.\n"
-+msgid_plural " and %d strings.\n"
-+msgstr[0] " i %d ³añcuch.\n"
-+msgstr[1] " i %d ³añcuchy.\n"
-+msgstr[2] " i %d ³añcuchów.\n"
-+
-+#: loadkeys.y:1126
-+#, c-format
+-
+-#: loadkeys.y:595
+-msgid "definitions"
+-msgstr "."
+msgid "Loaded %d compose definition.\n"
+msgid_plural "Loaded %d compose definitions.\n"
+msgstr[0] "Wczytano %d definicjê compose.\n"
+msgstr[1] "Wczytano %d definicje compose.\n"
+msgstr[2] "Wczytano %d definicji compose.\n"
--#: loadkeys.y:1121
--msgid "definitions"
--msgstr "."
--
--#: loadkeys.y:1126
-+#: loadkeys.y:1126
+ #: loadkeys.y:599
#, c-format
- msgid "(No change in compose definitions.)\n"
- msgstr "(Brak zmian w definicjach compose)\n"
================================================================
Index: packages/kbd/kbd.spec
diff -u packages/kbd/kbd.spec:1.109 packages/kbd/kbd.spec:1.110
--- packages/kbd/kbd.spec:1.109 Mon Mar 7 20:48:14 2011
+++ packages/kbd/kbd.spec Thu May 26 21:53:28 2011
@@ -5,12 +5,12 @@
Summary(ko.UTF-8): ì½˜ì†”ì„ ì„¤ì •í•˜ëŠ” ë„구 (ê¸€ì‡ íŒ, ê°€ìƒ í„°ë¯¸ë„, ê·¸ ë°–ì—)
Summary(pl.UTF-8): Narzędzia do obsługi konsoli
Name: kbd
-Version: 1.15.2
-Release: 3
+Version: 1.15.3
+Release: 1
License: GPL v2+
Group: Applications/Console
Source0: ftp://ftp.altlinux.org/pub/people/legion/kbd/%{name}-%{version}.tar.gz
-# Source0-md5: 77d0b51454522bc6c170bbdc6e31202a
+# Source0-md5: 8143e179a0f3c25646ce5085e8777200
Source1: %{name}.init
Source2: %{name}.sysconfig
Source3: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
@@ -25,11 +25,11 @@
Source9: %{name}-mac-pl.kmap
Source10: %{name}-pl3.map
Source11: %{name}-pl4.map
-Patch0: %{name}-missing-nls.patch
-Patch1: %{name}-unicode_start.patch
-Patch2: %{name}-ngettext.patch
-Patch3: %{name}-tty-detect.patch
-Patch4: %{name}-defkeymap.patch
+Patch0: %{name}-unicode_start.patch
+Patch1: %{name}-ngettext.patch
+Patch2: %{name}-tty-detect.patch
+Patch3: %{name}-defkeymap.patch
+Patch4: %{name}-po.patch
URL: http://www.win.tue.nl/~aeb/linux/
BuildRequires: autoconf >= 2.60
BuildRequires: automake >= 1:1.9
@@ -113,11 +113,12 @@
bzip2 -dc %{SOURCE3} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
-rm -f doc/{*,*/*}.sgml
+%{__rm} doc/{*,*/*}.sgml
# Greek is el, not gr
-rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/gr
-rm $RPM_BUILD_ROOT%{_mandir}/{README.kbd-non-english-man-pages,kbd-keypaps_instead_keytables.patch}*
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/locale/gr
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/{README.kbd-non-english-man-pages,kbd-keypaps_instead_keytables.patch}*
+
%find_lang %{name}
%clean
@@ -137,22 +138,73 @@
%doc AUTHORS COPYING ChangeLog README doc/*.txt
%attr(754,root,root) /etc/rc.d/init.d/console
%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/console
-%attr(755,root,root) /etc/profile.d/console.*
+%attr(755,root,root) /etc/profile.d/console.csh
+%attr(755,root,root) /etc/profile.d/console.sh
-%attr(755,root,root) /bin/*
-%attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) /bin/dumpkeys
+%attr(755,root,root) /bin/kbd_mode
+%attr(755,root,root) /bin/setfont
+%attr(755,root,root) /bin/unicode_start
+%attr(755,root,root) /bin/unicode_stop
+%attr(755,root,root) %{_bindir}/chvt
+%attr(755,root,root) %{_bindir}/deallocvt
+%attr(755,root,root) %{_bindir}/fgconsole
+%attr(755,root,root) %{_bindir}/getkeycodes
+%attr(755,root,root) %{_bindir}/kbdinfo
+%attr(755,root,root) %{_bindir}/kbdrate
+%attr(755,root,root) %{_bindir}/loadkeys
+%attr(755,root,root) %{_bindir}/loadunimap
+%attr(755,root,root) %{_bindir}/mapscrn
+%attr(755,root,root) %{_bindir}/openvt
+%attr(755,root,root) %{_bindir}/psfaddtable
+%attr(755,root,root) %{_bindir}/psfgettable
+%attr(755,root,root) %{_bindir}/psfstriptable
+%attr(755,root,root) %{_bindir}/psfxtable
+%attr(755,root,root) %{_bindir}/resizecons
+%attr(755,root,root) %{_bindir}/setkeycodes
+%attr(755,root,root) %{_bindir}/setleds
+%attr(755,root,root) %{_bindir}/setmetamode
+%attr(755,root,root) %{_bindir}/setvtrgb
+%attr(755,root,root) %{_bindir}/showconsolefont
+%attr(755,root,root) %{_bindir}/showkey
%dir %{_ldatadir}
-%{_ldatadir}/console*
+%{_ldatadir}/consolefonts
+%{_ldatadir}/consoletrans
%{_ldatadir}/keymaps
%{_ldatadir}/unimaps
-%{_mandir}/man?/*
-%lang(es) %{_mandir}/es/man?/*
-%lang(fi) %{_mandir}/fi/man?/*
-%lang(fr) %{_mandir}/fr/man?/*
-%lang(hu) %{_mandir}/hu/man?/*
-%lang(ko) %{_mandir}/ko/man?/*
-%lang(pl) %{_mandir}/pl/man?/*
+%{_mandir}/man1/chvt.1*
+%{_mandir}/man1/deallocvt.1*
+%{_mandir}/man1/dumpkeys.1*
+%{_mandir}/man1/fgconsole.1*
+%{_mandir}/man1/kbd_mode.1*
+%{_mandir}/man1/loadkeys.1*
+%{_mandir}/man1/openvt.1*
+%{_mandir}/man1/psfaddtable.1*
+%{_mandir}/man1/psfgettable.1*
+%{_mandir}/man1/psfstriptable.1*
+%{_mandir}/man1/psfxtable.1*
+%{_mandir}/man1/setleds.1*
+%{_mandir}/man1/setmetamode.1*
+%{_mandir}/man1/showkey.1*
+%{_mandir}/man1/unicode_start.1*
+%{_mandir}/man1/unicode_stop.1*
+%{_mandir}/man5/keymaps.5*
+%{_mandir}/man8/getkeycodes.8*
+%{_mandir}/man8/kbdrate.8*
+%{_mandir}/man8/loadunimap.8*
+%{_mandir}/man8/mapscrn.8*
+%{_mandir}/man8/resizecons.8*
+%{_mandir}/man8/setfont.8*
+%{_mandir}/man8/setkeycodes.8*
+%{_mandir}/man8/setvtrgb.8*
+%{_mandir}/man8/showconsolefont.8*
+%lang(es) %{_mandir}/es/man[158]/*
+%lang(fi) %{_mandir}/fi/man[158]/*
+%lang(fr) %{_mandir}/fr/man[158]/*
+%lang(hu) %{_mandir}/hu/man[158]/*
+%lang(ko) %{_mandir}/ko/man[158]/*
+%lang(pl) %{_mandir}/pl/man[158]/*
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -160,6 +212,12 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.110 2011/05/26 19:53:28 qboosh
+- updated to 1.15.3
+- updated ngettext patch
+- removed obsolete missing-nls patch
+- added po patch (fix one es.po error)
+
Revision 1.109 2011/03/07 19:48:14 arekm
- rel 3; disable power saving on console; make little sense with current monitors while causes essential information to be lost in case of KVMs etc
================================================================
Index: packages/kbd/kbd-po.patch
diff -u /dev/null packages/kbd/kbd-po.patch:1.5
--- /dev/null Thu May 26 21:53:33 2011
+++ packages/kbd/kbd-po.patch Thu May 26 21:53:28 2011
@@ -0,0 +1,11 @@
+--- kbd-1.15.3/po/es.po.orig 2011-05-14 23:12:49.000000000 +0200
++++ kbd-1.15.3/po/es.po 2011-05-26 21:36:19.173010892 +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 %2$dx%3$d de %1$d caracteres en %4$s\n"
+
+ #: src/setkeycodes.c:21
+ #, c-format
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kbd/kbd-ngettext.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kbd/kbd.spec?r1=1.109&r2=1.110&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kbd/kbd-po.patch?r1=1.4&r2=1.5&f=u
More information about the pld-cvs-commit
mailing list