Hello community, here is the log from the commit of package kbd for openSUSE:Factory checked in at 2014-09-20 07:26:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kbd (Old) and /work/SRC/openSUSE:Factory/.kbd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kbd" Changes: -------- --- /work/SRC/openSUSE:Factory/kbd/kbd.changes 2014-09-17 21:23:37.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kbd.new/kbd.changes 2014-09-20 07:26:41.000000000 +0200 @@ -1,0 +2,13 @@ +Thu Sep 18 10:54:51 UTC 2014 - [email protected] + +- port dumpkeys-C-opt.patch +- modified patches: + * kbd-1.15.2-dumpkeys-C-opt.patch + +------------------------------------------------------------------- +Fri Sep 12 09:52:30 UTC 2014 - [email protected] + +- kbd-2.0.2-doshell-reference.patch: + drop doshell reference from openvt.1 man page [bnc#675317] + +------------------------------------------------------------------- New: ---- kbd-2.0.2-doshell-reference.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kbd.spec ++++++ --- /var/tmp/diff_new_pack.hnzMca/_old 2014-09-20 07:26:43.000000000 +0200 +++ /var/tmp/diff_new_pack.hnzMca/_new 2014-09-20 07:26:43.000000000 +0200 @@ -50,6 +50,7 @@ # TODO: no ideas how to port it. Patch6: kbd-1.15.2-dumpkeys-C-opt.patch Patch9: kbd-2.0.2-comment-typo-qwerty.patch +Patch10: kbd-2.0.2-doshell-reference.patch BuildRequires: automake BuildRequires: bison @@ -89,8 +90,9 @@ %patch4 -p1 %patch5 -p1 # TODO: no ideas how to port it. -# %%patch6 +%patch6 %patch9 +%patch10 %build for i in `find data/keymaps/mac -type f` ; do ++++++ kbd-1.15.2-dumpkeys-C-opt.patch ++++++ --- /var/tmp/diff_new_pack.hnzMca/_old 2014-09-20 07:26:43.000000000 +0200 +++ /var/tmp/diff_new_pack.hnzMca/_new 2014-09-20 07:26:43.000000000 +0200 @@ -1,7 +1,7 @@ -Index: man/man1/dumpkeys.1.in +Index: docs/man/man1/dumpkeys.1.in =================================================================== ---- man/man1/dumpkeys.1.in.orig -+++ man/man1/dumpkeys.1.in +--- docs/man/man1/dumpkeys.1.in.orig 2013-08-27 22:45:33.000000000 +0200 ++++ docs/man/man1/dumpkeys.1.in 2014-09-12 13:42:01.557871837 +0200 @@ -4,6 +4,7 @@ dumpkeys \- dump keyboard translation tables .SH SYNOPSIS @@ -10,7 +10,7 @@ [ .B \-hilfn .BI \-c charset -@@ -197,6 +198,12 @@ This option produces an output line `cha +@@ -197,6 +198,12 @@ loadkeys how to interpret the keymap. (For example, "division" is 0xf7 in iso-8859-1 but 0xba in iso-8859-8.) .LP @@ -25,35 +25,27 @@ .TP 20 Index: src/dumpkeys.c =================================================================== ---- src/dumpkeys.c.orig -+++ src/dumpkeys.c -@@ -31,6 +31,7 @@ - static int fd; - static int verbose; - static int nr_keys = 0; /* probably 112, 128, 256 or 512 */ -+static char * console; - - int keymap_index[MAX_NR_KEYMAPS]; /* inverse of good_keymap */ - int good_keymap[MAX_NR_KEYMAPS], keymapnr, allocct; -@@ -582,6 +583,8 @@ valid options are:\n\ +--- src/dumpkeys.c.orig 2014-06-15 20:33:18.000000000 +0200 ++++ src/dumpkeys.c 2014-09-12 13:47:09.633866557 +0200 +@@ -41,6 +41,8 @@ --funcs-only display only the function key strings\n\ --keys-only display only key bindings\n\ --compose-only display only compose key combinations\n\ + -C <vc>\n\ + --console=<vc> Indicate the virtual console device to be used.\n\ -c --charset=")); - list_charsets(stderr); + lk_list_charsets(stderr); fprintf(stderr, _("\ -@@ -593,7 +596,7 @@ valid options are:\n\ +@@ -52,7 +54,7 @@ int main (int argc, char *argv[]) { -- const char *short_opts = "hilvsnf1S:c:V"; -+ const char *short_opts = "hilvsnf1S:c:C:V"; +- const char *short_opts = "hilvsnf1tkdS:c:V"; ++ const char *short_opts = "hilvsnf1tkdS:C:c:V"; const struct option long_opts[] = { { "help", no_argument, NULL, 'h' }, { "short-info", no_argument, NULL, 'i' }, -@@ -606,6 +609,7 @@ main (int argc, char *argv[]) { +@@ -65,6 +67,7 @@ { "keys-only", no_argument, NULL, 'k' }, { "compose-only",no_argument, NULL, 'd' }, { "charset", required_argument, NULL, 'c' }, @@ -61,8 +53,16 @@ { "verbose", no_argument, NULL, 'v' }, { "version", no_argument, NULL, 'V' }, { NULL, 0, NULL, 0 } -@@ -665,6 +669,9 @@ main (int argc, char *argv[]) { - usage(); +@@ -79,6 +82,7 @@ + char funcs_only = 0; + char keys_only = 0; + char diac_only = 0; ++ char * console = NULL; + + struct lk_ctx *ctx; + +@@ -135,6 +139,9 @@ + } printf("charset \"%s\"\n", optarg); break; + case 'C': @@ -71,12 +71,12 @@ case 'V': print_version_and_exit(); case 'h': -@@ -676,7 +683,7 @@ main (int argc, char *argv[]) { +@@ -146,7 +153,7 @@ if (optind < argc) usage(); - fd = getfd(NULL); + fd = getfd(console); - find_nr_keys(); - + /* check whether the keyboard is in Unicode mode */ + if (ioctl(fd, KDGKBMODE, &kbd_mode)) { ++++++ kbd-2.0.2-doshell-reference.patch ++++++ Index: docs/man/man1/openvt.1 =================================================================== --- docs/man/man1/openvt.1.orig 2013-08-27 22:45:33.000000000 +0200 +++ docs/man/man1/openvt.1 2014-09-12 11:48:08.465988937 +0200 @@ -92,5 +92,4 @@ .SH "SEE ALSO" .BR chvt (1), -.BR doshell (8), .BR login (1) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
