commit kbd for openSUSE:Factory
Hello community, here is the log from the commit of package kbd for openSUSE:Factory checked in at 2017-09-29 11:52:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kbd (Old) and /work/SRC/openSUSE:Factory/.kbd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kbd" Fri Sep 29 11:52:20 2017 rev:83 rq:529011 version:2.0.4 Changes: -------- --- /work/SRC/openSUSE:Factory/kbd/kbd.changes 2017-05-06 18:25:20.803672429 +0200 +++ /work/SRC/openSUSE:Factory/.kbd.new/kbd.changes 2017-09-29 11:52:23.680114346 +0200 @@ -1,0 +2,10 @@ +Fri Sep 22 15:51:51 CEST 2017 - sbrabec@suse.com + +- Version update to 2.0.6: + * translation updates + * support for U+202F + * minor fixes and code cleanup + * minor improvements and more characters support +- Enable vlock (bsc#1056449, FATE#261). + +------------------------------------------------------------------- Old: ---- kbd-2.0.3-repack.tar.bz2 New: ---- kbd-2.0.4-repack.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kbd.spec ++++++ --- /var/tmp/diff_new_pack.RTJf1D/_old 2017-09-29 11:52:24.811954741 +0200 +++ /var/tmp/diff_new_pack.RTJf1D/_new 2017-09-29 11:52:24.815954177 +0200 @@ -17,7 +17,7 @@ Name: kbd -Version: 2.0.3 +Version: 2.0.4 Release: 0 Summary: Keyboard and Font Utilities # git: git://git.altlinux.org/people/legion/packages/kbd.git @@ -25,7 +25,7 @@ Group: System/Console Url: ftp://ftp.altlinux.org/pub/people/legion/kbd/ # ftp://ftp.kernel.org/pub/linux/utils/kbd/kbd-%{version}.tar.xz repack_kbd.sh -Source: %{name}-%{version}-repack.tar.bz2 +Source: %{name}-%{version}-repack.tar.xz Source1: kbd_fonts.tar.bz2 Source2: suse-add.tar.bz2 Source3: README.SUSE @@ -71,6 +71,8 @@ Requires(post): coreutils Requires(postun): coreutils Requires(pre): %fillup_prereq +Provides: vlock = 2.2.3 +Obsoletes: vlock <= 2.2.3 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -130,8 +132,7 @@ --datadir=%{kbd} \ --enable-nls \ --localedir=%{_datadir}/locale \ - --enable-optional-progs \ - --disable-vlock + --enable-optional-progs make %{?_smp_mflags} gcc %{optflags} -o fbtest $RPM_SOURCE_DIR/fbtest.c # fix lat2-16.psfu (bnc#340579) @@ -439,6 +440,7 @@ %{_bindir}/setvesablank %{_bindir}/spawn_console %{_bindir}/spawn_login +%{_bindir}/vlock %{_mandir}/man1/* %{_mandir}/man5/keymaps.5%{ext_man} %ifnarch %{sparc} m68k ++++++ kbd-1.15.2-dumpkeys-C-opt.patch ++++++ --- /var/tmp/diff_new_pack.RTJf1D/_old 2017-09-29 11:52:24.919939513 +0200 +++ /var/tmp/diff_new_pack.RTJf1D/_new 2017-09-29 11:52:24.923938950 +0200 @@ -1,18 +1,18 @@ Index: docs/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 +--- docs/man/man1/dumpkeys.1.in.orig ++++ docs/man/man1/dumpkeys.1.in @@ -4,6 +4,7 @@ dumpkeys \- dump keyboard translation tables .SH SYNOPSIS .B dumpkeys +.RI [ \-C\ '<vc>' | \-\-console='<vc>' ] [ - .B \-hilfn - .BI \-c charset -@@ -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.) + .\".B \-1Vdfhiklnstv + .B \-h \-\-help \-i \-\-short\-info \-l \-s \-\-long\-info +@@ -212,6 +213,12 @@ loadkeys how to interpret the keymap. (F + .B \-V \-\-version + Prints version number and exits. .LP +The affected console device can be specified using the +.I -C @@ -25,43 +25,43 @@ .TP 20 Index: src/dumpkeys.c =================================================================== ---- 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\ +--- src/dumpkeys.c.orig ++++ src/dumpkeys.c +@@ -45,6 +45,8 @@ valid options are:\n\ + -t --funcs-only display only the function key strings\n\ + -k --keys-only display only key bindings\n\ + -d --compose-only display only compose key combinations\n\ + -C <vc>\n\ + --console=<vc> Indicate the virtual console device to be used.\n\ -c --charset=")); lk_list_charsets(stderr); fprintf(stderr, _("\ -@@ -52,7 +54,7 @@ +@@ -60,7 +62,7 @@ valid options are:\n\ - int - main (int argc, char *argv[]) { -- const char *short_opts = "hilvsnf1tkdS:c:V"; -+ const char *short_opts = "hilvsnf1tkdS:C:c:V"; + int main(int argc, char *argv[]) + { +- 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' }, -@@ -65,6 +67,7 @@ - { "keys-only", no_argument, NULL, 'k' }, - { "compose-only",no_argument, NULL, 'd' }, - { "charset", required_argument, NULL, 'c' }, -+ { "console", required_argument, NULL, 'C' }, - { "verbose", no_argument, NULL, 'v' }, - { "version", no_argument, NULL, 'V' }, - { NULL, 0, NULL, 0 } -@@ -79,6 +82,7 @@ - char funcs_only = 0; - char keys_only = 0; - char diac_only = 0; + { "help", no_argument, NULL, 'h' }, + { "short-info", no_argument, NULL, 'i' }, +@@ -73,6 +75,7 @@ int main(int argc, char *argv[]) + { "keys-only", no_argument, NULL, 'k' }, + { "compose-only", no_argument, NULL, 'd' }, + { "charset", required_argument, NULL, 'c' }, ++ { "console", required_argument, NULL, 'C' }, + { "verbose", no_argument, NULL, 'v' }, + { "version", no_argument, NULL, 'V' }, + { NULL, 0, NULL, 0 } +@@ -87,6 +90,7 @@ int main(int argc, char *argv[]) + char funcs_only = 0; + char keys_only = 0; + char diac_only = 0; + char * console = NULL; struct lk_ctx *ctx; -@@ -135,6 +139,9 @@ +@@ -143,6 +147,9 @@ int main(int argc, char *argv[]) } printf("charset \"%s\"\n", optarg); break; @@ -71,12 +71,12 @@ case 'V': print_version_and_exit(); case 'h': -@@ -146,7 +153,7 @@ +@@ -154,7 +161,7 @@ int main(int argc, char *argv[]) if (optind < argc) usage(); -- fd = getfd(NULL); -+ fd = getfd(console); +- if ((fd = getfd(NULL)) < 0) ++ if ((fd = getfd(console)) < 0) + kbd_error(EXIT_FAILURE, 0, _("Couldn't get a file descriptor referring to the console")); /* check whether the keyboard is in Unicode mode */ - if (ioctl(fd, KDGKBMODE, &kbd_mode)) { ++++++ kbd-1.15.2-setfont-no-cruft.patch ++++++ --- /var/tmp/diff_new_pack.RTJf1D/_old 2017-09-29 11:52:24.935937258 +0200 +++ /var/tmp/diff_new_pack.RTJf1D/_new 2017-09-29 11:52:24.939936694 +0200 @@ -1,6 +1,8 @@ ---- kbd-1.14.1wip/src/kdfontop.c.orig 2008-03-03 23:47:18.160420000 +0100 -+++ kbd-1.14.1wip/src/kdfontop.c 2008-03-03 23:52:32.918345000 +0100 -@@ -268,6 +268,23 @@ +Index: kbd-2.0.4/src/kdfontop.c +=================================================================== +--- kbd-2.0.4.orig/src/kdfontop.c ++++ kbd-2.0.4/src/kdfontop.c +@@ -168,6 +168,23 @@ int putfont(int fd, unsigned char *buf, return 0; } @@ -22,9 +24,9 @@ + return -1; +#else /* Second attempt: PIO_FONTX */ - cfd.charcount = count; + cfd.charcount = count; cfd.charheight = height; -@@ -302,4 +319,5 @@ +@@ -190,4 +207,5 @@ int putfont(int fd, unsigned char *buf, return -1; } return 0; ++++++ kbd-1.15.5-loadkeys-search-path.patch ++++++ --- /var/tmp/diff_new_pack.RTJf1D/_old 2017-09-29 11:52:24.955934438 +0200 +++ /var/tmp/diff_new_pack.RTJf1D/_new 2017-09-29 11:52:24.955934438 +0200 @@ -1,18 +1,20 @@ -diff -up kbd-2.0.1/src/loadkeys.c.orig kbd-2.0.1/src/loadkeys.c ---- kbd-2.0.1/src/loadkeys.c.orig 2013-11-27 12:56:57.846069007 +0100 -+++ kbd-2.0.1/src/loadkeys.c 2013-11-27 12:58:03.877302345 +0100 -@@ -26,7 +26,7 @@ +Index: kbd-2.0.4/src/loadkeys.c +=================================================================== +--- kbd-2.0.4.orig/src/loadkeys.c ++++ kbd-2.0.4/src/loadkeys.c +@@ -27,7 +27,7 @@ #include "keymap.h" - static const char *progname = NULL; + static const char *progname = NULL; -static const char *const dirpath1[] = { "", DATADIR "/" KEYMAPDIR "/**", KERNDIR "/", 0 }; +static const char *const dirpath1[] = { "", DATADIR "/" KEYMAPDIR "/**", DATADIR "/" XKBKEYMAPDIR "/", DATADIR "/" LEGACYKEYMAPDIR "/**", KERNDIR "/", 0 }; static const char *const suffixes[] = { "", ".kmap", ".map", 0 }; - static void __attribute__ ((noreturn)) -diff -up kbd-2.0.1/src/paths.h.orig kbd-2.0.1/src/paths.h ---- kbd-2.0.1/src/paths.h.orig 2013-11-27 12:58:10.662326108 +0100 -+++ kbd-2.0.1/src/paths.h 2013-11-27 12:58:32.566403015 +0100 + static void __attribute__((noreturn)) +Index: kbd-2.0.4/src/paths.h +=================================================================== +--- kbd-2.0.4.orig/src/paths.h ++++ kbd-2.0.4/src/paths.h @@ -5,6 +5,8 @@ * The following five subdirectories are defined: */ ++++++ repack_kbd.sh ++++++ --- /var/tmp/diff_new_pack.RTJf1D/_old 2017-09-29 11:52:25.023924850 +0200 +++ /var/tmp/diff_new_pack.RTJf1D/_new 2017-09-29 11:52:25.023924850 +0200 @@ -21,6 +21,6 @@ echo removing files... find $tmpdir -iname \*agafari\* | tee /dev/tty | xargs rm -tar jcf $name-repack.tar.bz2 -C $tmpdir $name +tar Jcf $name-repack.tar.xz -C $tmpdir $name rm -rf $tmpdir
participants (1)
-
root@hilbert.suse.de