pool/console-setup
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
0a9a9a058a
console-setup/console-setup-1.76-paths.patch
Andreas Jaeger c9f10430c7 Accepting request 321791 from home:sndirsch:fate318355 
package created; it's required by kbd in order to convert xkb
layouts from xkeyboard-config to console keymaps (FATE#318426)

OBS-URL: https://build.opensuse.org/request/show/321791
OBS-URL: https://build.opensuse.org/package/show/Base:System/console-setup?expand=0&rev=1
2015-08-13 14:36:46 +00:00

169 lines
5.7 KiB
Diff
Raw Blame History

Index: console-setup-1.130/Makefile
===================================================================
--- console-setup-1.130.orig/Makefile
+++ console-setup-1.130/Makefile
@@ -2,7 +2,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
SHELL = /bin/sh
@@ -36,8 +36,8 @@ build-all: build-linux build-freebsd bui
.PHONY: install-common
install-common: build-common
- install -d $(bootprefix)/bin/
- install setupcon $(bootprefix)/bin/
+ install -d $(bootprefix)/usr/bin/
+ install setupcon $(bootprefix)/usr/bin/
install -d $(etcdir)/default
install -m 644 config/keyboard $(etcdir)/default/
install -m 644 config/console-setup $(etcdir)/default/
@@ -49,10 +49,10 @@ install-common: build-common
.PHONY: install-common-linux
install-common-linux: build-linux
- install -d $(prefix)/share/consolefonts/
- install -m 644 Fonts/*.psf.gz $(prefix)/share/consolefonts/
- install -d $(prefix)/share/consoletrans
- install -m 644 acm/*.acm.gz $(prefix)/share/consoletrans/
+ install -d $(prefix)/usr/share/consolefonts/
+ install -m 644 Fonts/*.psf.gz $(prefix)/usr/share/consolefonts/
+ install -d $(prefix)/usr/share/consoletrans
+ install -m 644 acm/*.acm.gz $(prefix)/usr/share/consoletrans/
install -d $(etcdir)/console-setup
install -m 644 Keyboard/compose.*.inc $(etcdir)/console-setup/
install -m 644 Keyboard/remap.inc $(etcdir)/console-setup/
@@ -77,8 +77,8 @@ install-ckbcomp:
mkdir -p $(etcdir)/console-setup \
&& cp -r Keyboard/ckb/ $(etcdir)/console-setup/ckb; \
fi
- install -d $(prefix)/bin/
- install -m 755 Keyboard/ckbcomp $(prefix)/bin/
+ install -d $(prefix)/usr/bin/
+ install -m 755 Keyboard/ckbcomp $(prefix)/usr/bin/
install -d $(mandir)/man1/
install -m 644 man/ckbcomp.1 $(mandir)/man1/
Index: console-setup-1.130/man/ckbcomp.1
===================================================================
--- console-setup-1.130.orig/man/ckbcomp.1
+++ console-setup-1.130/man/ckbcomp.1
@@ -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
character mapping table defining this encoding in
-.IR /usr/local/share/consoletrans .
+.IR /usr/share/consoletrans .
Definitions of the following charmaps are provided:
.nh
.BR ARMSCII-8 ,
@@ -86,8 +86,9 @@ for files included by the keymap descrip
multiple times. If a file can not be found in any of the specified
directories, it will be searched also in some other standard
locations, such as
-.IR /usr/local/etc/console-setup/ckb ,
-.IR /usr/local/share/X11/xkb
+.IR /etc/console-setup/ckb ,
+.IR /usr/local/share/X11/xkb ,
+.IR /usr/share/X11/xkb
and
.IR /etc/X11/xkb
@@ -167,9 +168,9 @@ Specifies the layout variant used to cho
Adds an option used to choose component names.
.SH FILES
-.I /usr/local/share/consoletrans
+.I /usr/share/consoletrans
.br
-.I /usr/local/etc/console-setup/ckb
+.I /etc/console-setup/ckb
.br
.I /usr/share/X11/xkb
.br
Index: console-setup-1.130/man/console-setup.5
===================================================================
--- console-setup-1.130.orig/man/console-setup.5
+++ console-setup-1.130/man/console-setup.5
@@ -378,16 +378,16 @@ Completely covered by the following font
The standard location of the
.B console-setup
configuration file is
-.IR /usr/local/etc/default/console-setup .
+.IR /etc/default/console-setup .
The keyboard configuration is in
-.IR /usr/local/etc/default/keyboard .
+.IR /etc/default/keyboard .
Fonts that can be used with the variable
.B FONT
are usually installed in
-.IR /usr/share/consolefonts/ " or " /usr/share/syscons/fonts/ .
+.IR /usr/share/consolefonts/ " or " /lib/kbd/consolefonts/ .
Translation maps that can be used with the variable CONSOLE_MAP are
usually installed in
-.IR /usr/share/consoletrans/ " or " /usr/share/syscons/scrnmaps/ .
+.IR /usr/share/consoletrans/ " or " /lib/kbd/consoletrans/ .
.SH NOTES
The aim of the Terminus font is to reduce the eyes-fatigue when one
Index: console-setup-1.130/man/keyboard.5
===================================================================
--- console-setup-1.130.orig/man/keyboard.5
+++ console-setup-1.130/man/keyboard.5
@@ -154,12 +154,12 @@ on FreeBSD.
The standard location of the
.B keyboard
file is
-.IR /usr/local/etc/default/keyboard .
+.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/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 .
Index: console-setup-1.130/man/setupcon.1
===================================================================
--- console-setup-1.130.orig/man/setupcon.1
+++ console-setup-1.130/man/setupcon.1
@@ -22,11 +22,11 @@ the console. Most of the time you invok
without arguments. The keyboard configuration is specified in
.I ~/.keyboard
or
-.IR /usr/local/etc/default/keyboard .
+.IR /etc/default/keyboard .
The font configuration is specified in
.I ~/.console-setup
or
-.IR /usr/local/etc/default/console-setup .
+.IR /etc/default/console-setup .
Consult
.BR keyboard (5)
and
@@ -151,13 +151,13 @@ Display usage information.
.br
.I ~/.keyboard
.br
-.I /usr/local/etc/default/console-setup
+.I /etc/default/console-setup
.br
-.I /usr/local/etc/default/keyboard
+.I /etc/default/keyboard
.br
-.I /usr/local/etc/default/console-setup.VARIANT
+.I /etc/default/console-setup.VARIANT
.br
-.I /usr/local/etc/default/keyboard.VARIANT
+.I /etc/default/keyboard.VARIANT
.br
.I /etc/console-setup/
Reference in New Issue View Git Blame Copy Permalink