packages: kbd/kbd-ngettext.patch, kbd/kbd.spec, kbd/kbd-po.patch (REMOVED), ...

[arekm]

Author: arekm                        Date: Thu May  6 07:22:28 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 1.15.2

---- Files affected:
packages/kbd:
   kbd-ngettext.patch (1.2 -> 1.3) , kbd.spec (1.105 -> 1.106) , kbd-po.patch (1.3 -> NONE)  (REMOVED), kbd-posixsh.patch (1.2 -> NONE)  (REMOVED), kbd-sparc.patch (1.5 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/kbd/kbd-ngettext.patch
diff -u packages/kbd/kbd-ngettext.patch:1.2 packages/kbd/kbd-ngettext.patch:1.3
--- packages/kbd/kbd-ngettext.patch:1.2	Fri Dec  5 22:47:43 2008
+++ packages/kbd/kbd-ngettext.patch	Thu May  6 09:22:23 2010
@@ -34,7 +34,7 @@
  msgstr "niemo¿liwy b³±d w do_constant"
  
 -# XXX: ngettext should be used for the following five messages
- #: loadkeys.y:1047
+ #: loadkeys.y:1113
  #, c-format
  msgid ""
  "\n"
@@ -45,7 +45,7 @@
  "\n"
 -"Zmienionych klawiszy: %d%s ³añcuchów: %d%s\n"
 -
--#: loadkeys.y:1048
+-#: loadkeys.y:1114
 -msgid "key"
 -msgstr ","
 +"Changed %d keys"
@@ -59,25 +59,25 @@
 +"\n"
 +"Zmieniono %d klawiszy"
  
- #: loadkeys.y:1048
+ #: loadkeys.y:1114
 -msgid "keys"
 -msgstr ","
 -
--#: loadkeys.y:1049
+-#: loadkeys.y:1115
 -msgid "string"
 -msgstr "."
 -
--#: loadkeys.y:1049
+-#: loadkeys.y:1115
 -msgid "strings"
 -msgstr "."
 -
 -# XXX: ngettext should be used for the following three messages
--#: loadkeys.y:1054
+-#: loadkeys.y:1120
  #, c-format
 -msgid "Loaded %d compose %s.\n"
 -msgstr "Wczytanych definicji compose: %d%s\n"
 -
--#: loadkeys.y:1055
+-#: loadkeys.y:1121
 -msgid "definition"
 -msgstr "."
 +msgid " and %d string.\n"
@@ -86,7 +86,7 @@
 +msgstr[1] " i %d ³añcuchy.\n"
 +msgstr[2] " i %d ³añcuchów.\n"
 +
-+#: loadkeys.y:1053
++#: loadkeys.y:1126
 +#, c-format
 +msgid "Loaded %d compose definition.\n"
 +msgid_plural "Loaded %d compose definitions.\n"
@@ -94,12 +94,12 @@
 +msgstr[1] "Wczytano %d definicje compose.\n"
 +msgstr[2] "Wczytano %d definicji compose.\n"
  
--#: loadkeys.y:1055
+-#: loadkeys.y:1121
 -msgid "definitions"
 -msgstr "."
 -
--#: loadkeys.y:1060
-+#: loadkeys.y:1058
+-#: loadkeys.y:1126
++#: loadkeys.y:1126
  #, 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.105 packages/kbd/kbd.spec:1.106
--- packages/kbd/kbd.spec:1.105	Mon Mar 15 15:11:58 2010
+++ packages/kbd/kbd.spec	Thu May  6 09:22:23 2010
@@ -5,12 +5,12 @@
 Summary(ko.UTF-8):	콘솔을 ì„¤ì •í•˜ëŠ” 도구 (ê¸€ì‡ íŒ, 가상 터미널, ê·¸ 밖에)
 Summary(pl.UTF-8):	Narzędzia do obsługi konsoli
 Name:		kbd
-Version:	1.15
-Release:	4
+Version:	1.15.2
+Release:	1
 License:	GPL v2+
 Group:		Applications/Console
 Source0:	ftp://ftp.altlinux.org/pub/people/legion/kbd/%{name}-%{version}.tar.gz
-# Source0-md5:	ba3fd20e6c79e58422c3cc6b28718939
+# Source0-md5:	77d0b51454522bc6c170bbdc6e31202a
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
 Source3:	http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
@@ -26,13 +26,10 @@
 Source10:	%{name}-pl3.map
 Source11:	%{name}-pl4.map
 Patch0:		%{name}-missing-nls.patch
-Patch1:		%{name}-sparc.patch
-Patch2:		%{name}-unicode_start.patch
-Patch3:		%{name}-posixsh.patch
-Patch4:		%{name}-ngettext.patch
-Patch5:		%{name}-po.patch
-Patch6:		%{name}-tty-detect.patch
-Patch7:		%{name}-defkeymap.patch
+Patch1:		%{name}-unicode_start.patch
+Patch2:		%{name}-ngettext.patch
+Patch3:		%{name}-tty-detect.patch
+Patch4:		%{name}-defkeymap.patch
 URL:		http://www.win.tue.nl/~aeb/linux/
 BuildRequires:	autoconf >= 2.60
 BuildRequires:	automake
@@ -71,12 +68,10 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
 
 %build
-%{__aclocal}
+%{__gettextize}
+%{__aclocal} -I m4
 %{__autoconf}
 %{__autoheader}
 %{__automake}
@@ -165,6 +160,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.106  2010/05/06 07:22:23  arekm
+- up to 1.15.2
+
 Revision 1.105  2010/03/15 14:11:58  glen
 - make "loadkeys -d" work again; rel 4
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kbd/kbd-ngettext.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kbd/kbd.spec?r1=1.105&r2=1.106&f=u