diff --git a/console-setup-1.84-ctrll-lock.patch b/console-setup-1.84-ctrll-lock.patch deleted file mode 100644 index 147e2a5f2e88ff4c2b87e513c2f35a5c764454a7..0000000000000000000000000000000000000000 --- a/console-setup-1.84-ctrll-lock.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -up console-setup/Keyboard/ckbcomp.orig console-setup/Keyboard/ckbcomp ---- console-setup/Keyboard/ckbcomp.orig 2018-06-21 10:58:36.262160943 +0200 -+++ console-setup/Keyboard/ckbcomp 2018-06-27 13:04:01.843639711 +0200 -@@ -196,10 +196,6 @@ my %acmtable; # Unicode -> legacy code ( - - my $KEYMAP = ''; # This variable contains the generated keymap - --my $broken_caps = 0; # In unicode mode Caps_Lock doesn't work for non-ASCII -- # letters. 1 = the keymap contains non-ascii letters. -- # See http://bugzilla.kernel.org/show_bug.cgi?id=7746#c21 -- - my %keycodes_table; # x keysym -> x key code - my %aliases; # x keysym -> x keysym - -@@ -4376,9 +4372,6 @@ sub print_vector { - my $u = ord (uc (pack ("U", $v))); - my $c = ($v == $l ? $u : $l); - $capsvector[$mask] = $1 ."U+". sprintf ("%04x", $c); -- if ($v != $c && $v gt 0x7f) { -- $broken_caps = 1; -- } - } - } - if ($no_NoSymbol) { -@@ -4776,10 +4769,6 @@ keycode 127 = - die "$0: Unsupported keyboard type $arch\n"; - } - --if ($broken_caps) { -- $KEYMAP =~ s/Caps_Lock/CtrlL_Lock/g; --} -- - print $KEYMAP; - - if ($freebsd) { diff --git a/console-setup.spec b/console-setup.spec index a26566a4fcfaa2230c94fa6518086259342f7df8..de00df83b9325b35f1dc0f6923cc64a6a27a7752 100644 --- a/console-setup.spec +++ b/console-setup.spec @@ -1,14 +1,12 @@ Name: console-setup Version: 1.184 -Release: 4 +Release: 5 Summary: Console font and keymap setup program License: GPLv2+ and MIT and Public Domain URL: https://packages.debian.org/cs/sid/console-setup -Source0: http://ftp.de.debian.org/debian/pool/main/c/%{name}/%{name}_%{version}.tar.xz - -Patch0: console-setup-1.76-paths.patch -Patch1: console-setup-1.76-fsf-address.patch -Patch2: console-setup-1.84-ctrll-lock.patch +Source0: http://sourcearchive.raspbian.org/main/c/console-setup/console-setup_1.184.tar.xz +Patch0: console-setup-1.76-paths.patch +Patch1: console-setup-1.76-fsf-address.patch BuildArch: noarch BuildRequires: perl-generators perl(encoding)