diff --git a/console-setup-1.76-paths.patch b/console-setup-1.76-paths.patch index d437638bdc2f794377905a1c0c4b8dd593195c72..bc53b20a416707388cd53de09533054a7be69c87 100644 --- a/console-setup-1.76-paths.patch +++ b/console-setup-1.76-paths.patch @@ -1,12 +1,12 @@ -diff -up console-setup-1.143/Makefile.orig console-setup-1.143/Makefile ---- console-setup-1.143/Makefile.orig 2016-05-24 09:43:13.424382839 +0200 -+++ console-setup-1.143/Makefile 2016-05-24 09:45:10.350994606 +0200 +diff -up console-setup-1.207/Makefile.orig console-setup-1.207/Makefile +--- console-setup-1.207/Makefile.orig 2021-11-08 09:46:06.508441480 +0100 ++++ console-setup-1.207/Makefile 2021-11-08 09:48:57.683728853 +0100 @@ -14,7 +14,7 @@ prefix := /usr/local # etcdir must be either /etc or etcdir := $(prefix)/etc bootprefix := $(patsubst %/usr,%/,$(prefix:%/=%)) -mandir := $(prefix)/share/man -+mandir = $(prefix)/usr/share/man ++mandir := $(prefix)/usr/share/man acmfiles := $(wildcard $./acm/*.acm) @@ -47,9 +47,9 @@ diff -up console-setup-1.143/Makefile.orig console-setup-1.143/Makefile install -d $(mandir)/man1/ install -m 644 man/ckbcomp.1 $(mandir)/man1/ -diff -up console-setup-1.143/man/ckbcomp.1.orig console-setup-1.143/man/ckbcomp.1 ---- console-setup-1.143/man/ckbcomp.1.orig 2011-04-06 03:01:33.000000000 +0200 -+++ console-setup-1.143/man/ckbcomp.1 2016-05-24 09:47:15.360674275 +0200 +diff -up console-setup-1.207/man/ckbcomp.1.orig console-setup-1.207/man/ckbcomp.1 +--- console-setup-1.207/man/ckbcomp.1.orig 2011-07-03 19:59:48.000000000 +0200 ++++ console-setup-1.207/man/ckbcomp.1 2021-11-08 09:51:49.271263086 +0100 @@ -46,7 +46,7 @@ Print a usage message and exit. .BI -charmap\ charmap The encoding to use for the output keymap. There should be an @@ -83,9 +83,9 @@ diff -up console-setup-1.143/man/ckbcomp.1.orig console-setup-1.143/man/ckbcomp. .br .I /usr/share/X11/xkb .br -diff -up console-setup-1.143/man/console-setup.5.orig console-setup-1.143/man/console-setup.5 ---- console-setup-1.143/man/console-setup.5.orig 2016-05-19 05:01:09.000000000 +0200 -+++ console-setup-1.143/man/console-setup.5 2016-05-24 09:47:15.361674281 +0200 +diff -up console-setup-1.207/man/console-setup.5.orig console-setup-1.207/man/console-setup.5 +--- console-setup-1.207/man/console-setup.5.orig 2019-05-30 00:09:36.000000000 +0200 ++++ console-setup-1.207/man/console-setup.5 2021-11-08 09:53:08.829837149 +0100 @@ -403,16 +403,16 @@ Completely covered by the following font The standard location of the .B console-setup @@ -107,9 +107,9 @@ diff -up console-setup-1.143/man/console-setup.5.orig console-setup-1.143/man/co .SH NOTES The aim of the Terminus font is to reduce the eyes-fatigue when one -diff -up console-setup-1.143/man/keyboard.5.orig console-setup-1.143/man/keyboard.5 ---- console-setup-1.143/man/keyboard.5.orig 2016-03-03 05:01:16.000000000 +0100 -+++ console-setup-1.143/man/keyboard.5 2016-05-24 09:47:15.361674281 +0200 +diff -up console-setup-1.207/man/keyboard.5.orig console-setup-1.207/man/keyboard.5 +--- console-setup-1.207/man/keyboard.5.orig 2021-11-08 09:53:21.769232920 +0100 ++++ console-setup-1.207/man/keyboard.5 2021-11-08 09:59:12.477111340 +0100 @@ -154,12 +154,12 @@ on FreeBSD. The standard location of the .B keyboard @@ -118,17 +118,17 @@ diff -up console-setup-1.143/man/keyboard.5.orig console-setup-1.143/man/keyboar +.IR /etc/default/keyboard . Description of all available keyboard models, layouts, variants and options is available in --.IR /usr/local/share/X11/xkb/rules/xorg.lst . -+.IR /usr/share/X11/xkb/rules/xorg.lst . - In most cases, in +-.IR /usr/local/share/X11/xkb/rules/base.lst . ++.IR /usr/share/X11/xkb/rules/base.lst . + In most cases, in -.IR /usr/share/keymaps/ " or " /usr/share/syscons/keymaps/ +.IR /lib/kbd/keymaps/ you will find several keymaps that can be used with the variable .BR KMAP . -diff -up console-setup-1.143/man/setupcon.1.orig console-setup-1.143/man/setupcon.1 ---- console-setup-1.143/man/setupcon.1.orig 2016-03-03 05:01:16.000000000 +0100 -+++ console-setup-1.143/man/setupcon.1 2016-05-24 09:47:15.361674281 +0200 +diff -up console-setup-1.207/man/setupcon.1.orig console-setup-1.207/man/setupcon.1 +--- console-setup-1.207/man/setupcon.1.orig 2021-11-08 09:54:23.983055071 +0100 ++++ console-setup-1.207/man/setupcon.1 2021-11-08 09:56:00.187636963 +0100 @@ -22,11 +22,11 @@ the console. Most of the time you invok without arguments. The keyboard configuration is specified in .I ~/.keyboard diff --git a/console-setup-1.84-ctrll-lock.patch b/console-setup-1.84-ctrll-lock.patch index 147e2a5f2e88ff4c2b87e513c2f35a5c764454a7..34155f464b8cfc16014f6b7c6df6f33ab345680a 100644 --- a/console-setup-1.84-ctrll-lock.patch +++ b/console-setup-1.84-ctrll-lock.patch @@ -1,6 +1,6 @@ -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 +diff -up console-setup-1.201/Keyboard/ckbcomp.orig console-setup-1.201/Keyboard/ckbcomp +--- console-setup-1.201/Keyboard/ckbcomp.orig 2021-03-10 09:35:05.639847205 +0100 ++++ console-setup-1.201/Keyboard/ckbcomp 2021-03-10 09:35:05.641847229 +0100 @@ -196,10 +196,6 @@ my %acmtable; # Unicode -> legacy code ( my $KEYMAP = ''; # This variable contains the generated keymap diff --git a/console-setup.spec b/console-setup.spec index 35bb3517f3106dcabc690b2aa8f34f9f86faf4d4..4624c21cc717ad82968ca39c278f7f6c994ed921 100644 --- a/console-setup.spec +++ b/console-setup.spec @@ -1,10 +1,10 @@ Name: console-setup -Version: 1.184 -Release: 6 +Version: 1.207 +Release: 1 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://sourcearchive.raspbian.org/main/c/console-setup/console-setup_1.184.tar.xz +Source0: http://sourcearchive.raspbian.org/main/c/console-setup/console-setup_1.207.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 @@ -26,7 +26,10 @@ TerminusBoldVGA. %package_help %prep -%autosetup -n %{name} -p1 +%setup -q -n %{name}-%{version} +%patch0 -p1 -b .paths +%patch1 -p1 -b .fsf-address +%patch2 -p1 -b .ctrll-lock1 %build make build-linux @@ -46,6 +49,9 @@ make prefix=%{buildroot} install-linux %{_mandir}/man*/* %changelog +* Tue Jan 18 2022 SimpleUpdate Robot - 1.207-1 +- Upgrade to version 1.207 + * Sun Sep 27 2020 yanan - 1.184-6 - Type:bugfix - ID:NA diff --git a/console-setup_1.184.tar.xz b/console-setup_1.184.tar.xz deleted file mode 100644 index 9d31ad6061ed0b9e749282ea2a676e741c7aa6da..0000000000000000000000000000000000000000 Binary files a/console-setup_1.184.tar.xz and /dev/null differ diff --git a/console-setup_1.207.tar.xz b/console-setup_1.207.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..9d9e95e55b5fd5d345f3cb82952125710eccf576 Binary files /dev/null and b/console-setup_1.207.tar.xz differ