Attachment #6033 for bug #35496

View | Details | Raw Unified | Return to bug 35496
Collapse All | Expand All




@%@UCRWARNING=# @%@
# KEYBOARD CONFIGURATION FILE

# Consult the keyboard(5) manual page.
# documentation on what to do after having modified this file.

# The following variables describe your keyboard and can have the same
# values as the XkbModel, XkbLayout, XkbVariant and XkbOptions options
# in /etc/X11/xorg.conf.

XKBMODEL="@%@xorg/keyboard/options/XkbModel@%@"
XKBLAYOUT="@%@xorg/keyboard/options/XkbLayout@%@"
XKBVARIANT="@%@xorg/keyboard/options/XkbVariant@%@"
XKBOPTIONS="@%@xorg/keyboard/options/XkbOptions@%@"

BACKSPACE="guess"

# If you don't want to use the XKB layout on the console, you can
# specify an alternative keymap.  Make sure it will be accessible
# before /usr is mounted.
KMAP=/etc/console/boottime.kmap.gz





# -*- coding: utf-8 -*-
#
# Univention Configuration Registry
#  config registry module for the network interfaces
#
# Copyright 2009-2014 Univention GmbH
#
# http://www.univention.de/
#
# All rights reserved.
#
# The source code of this program is made available
# under the terms of the GNU Affero General Public License version 3
# (GNU AGPL V3) as published by the Free Software Foundation.
#
# Binary versions of this program provided by Univention to you as
# well as other copyrighted, protected or trademarked materials like
# Logos, graphics, fonts, specific documentations and configurations,
# cryptographic keys etc. are subject to a license agreement between
# you and Univention and not subject to the GNU AGPL V3.
#
# In the case you use this program under the terms of the GNU AGPL V3,
# the program is provided in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public
# License with the Debian GNU/Linux or Univention distribution in file
# /usr/share/common-licenses/AGPL-3; if not, see
# <http://www.gnu.org/licenses/>.

import os

def handler(configRegistry, changes):
	for keymap in set(changes):
		if configRegistry.get(keymap):
			os.system('/usr/sbin/install-keymap "%s"' % configRegistry[keymap])

(-)a/branches/ucs-4.0/ucs-4.0-0/base/univention-base-files/conffiles/xkbKeyboard.py (+2 lines)

Lines 32-36	Link Here

import os

import os

def handler(configRegistry, changes):

def handler(configRegistry, changes):

	os.system('/sbin/udevadm trigger --subsystem-match=input --action=change')

	os.system('/sbin/udevadm trigger --subsystem-match=input --action=change')

	os.system('/bin/setupcon --force --save')

(-)a/branches/ucs-4.0/ucs-4.0-0/base/univention-base-files/debian/changelog (+6 lines)

Lines 1-3	Link Here

univention-base-files (4.0.0-5) unstable; urgency=low

  * Remove deprecated keyboard layout handling (Bug #35522)

 -- Philipp Hahn <hahn@univention.de>  Thu, 31 Jul 2014 14:49:40 +0200

univention-base-files (4.0.0-4) unstable; urgency=low

univention-base-files (4.0.0-4) unstable; urgency=low

  * Update templates for /etc/init.d/ files (Bug #35522)

  * Update templates for /etc/init.d/ files (Bug #35522)




	chmod +x /etc/init.d/rdate
fi

eval "$(univention-config-registry shell locale locale/keymap)"
if [ "$locale" = "de_DE@euro" ]; then
	locale="de_DE@euro:ISO-8859-15"
	univention-config-registry set locale="$locale"
elif [ "$locale" = "de_DE" ]; then
	locale="de_DE:ISO-8859-15"
	univention-config-registry set locale="$locale"
fi
if [ -n "$locale" ]; then
	locale-gen || true
fi
dpkg-maintscript-helper rm_conffile /etc/univention/templates/modules/keymap.py 4~
	# try to catch the keymap from /etc/console/boottime.kmap.gz
	if [ -e /etc/console/boottime.kmap.gz ]; then
		md5_boottime=$(md5sum /etc/console/boottime.kmap.gz | sed -e 's| .*||')
		for f in $(find /usr/share/keymaps/i386/); do
			if [ -d "$f" ]; then
				continue
			fi
			md5_file=$(md5sum "$f" | sed -e 's| .*||')
			if [ "$md5_boottime" = "$md5_file" ]; then
				univention-config-registry set locale/keymap=$(echo "$f" | sed -e 's|.*/||;s|.kmap.gz||')
				break
			fi
		done
	fi
fi
dpkg-maintscript-helper rm_conffile /etc/univention/templates/modules/set_locale.py 1.0.48~ -- "$@"

# <https://forge.univention.org/bugzilla/show_bug.cgi?id=26058>
dpkg-maintscript-helper mv_conffile /etc/univention/templates/files/etc/network/interfaces /etc/univention/templates/files/etc/network/interfaces.d/10-default 2.0.2-1~ -- "$@"

(-)a/branches/ucs-4.0/ucs-4.0-0/base/univention-base-files/debian/univention-base-files.postrm (-1 / +1 lines)

Lines 35-41 set -e	Link Here

if test "$1" = "purge"; then

if test "$1" = "purge"; then

	rm -rf /var/cache/univention-baseconfig

	rm -rf /var/cache/univention-baseconfig

fi

fi

dpkg-maintscript-helper rm_conffile /etc/univention/templates/modules/set_locale.py 1.0.48~ -- "$@"

dpkg-maintscript-helper rm_conffile /etc/univention/templates/modules/keymap.py 4~

# <https://forge.univention.org/bugzilla/show_bug.cgi?id=26058>

# <https://forge.univention.org/bugzilla/show_bug.cgi?id=26058>

dpkg-maintscript-helper mv_conffile /etc/univention/templates/files/etc/network/interfaces /etc/univention/templates/files/etc/network/interfaces.d/10-default 2.0.2-1~ -- "$@"

dpkg-maintscript-helper mv_conffile /etc/univention/templates/files/etc/network/interfaces /etc/univention/templates/files/etc/network/interfaces.d/10-default 2.0.2-1~ -- "$@"

(-)a/branches/ucs-4.0/ucs-4.0-0/base/univention-base-files/debian/univention-base-files.preinst (-2 / +2 lines)

Lines 36-43 dpkg-divert --rename --quiet --divert /etc/motd.debian --package univention-base	Link Here

# https://forge.univention.org/bugzilla/show_bug.cgi?id=27759

# https://forge.univention.org/bugzilla/show_bug.cgi?id=27759

dpkg-divert --rename --quiet --divert /etc/motd.tail.debian --package univention-base-files --add /etc/motd.tail

dpkg-divert --rename --quiet --divert /etc/motd.tail.debian --package univention-base-files --add /etc/motd.tail

dpkg-maintscript-helper rm_conffile /etc/univention/templates/modules/set_locale.py 1.0.48~ -- "$@"

dpkg-maintscript-helper rm_conffile /etc/univention/templates/modules/keymap.py 4~

rm -f /etc/univention/templates/modules/set_locale.pyc || true

rm -f /etc/univention/templates/modules/keymap.pyc

# <https://forge.univention.org/bugzilla/show_bug.cgi?id=26058>

# <https://forge.univention.org/bugzilla/show_bug.cgi?id=26058>

dpkg-maintscript-helper mv_conffile /etc/univention/templates/files/etc/network/interfaces /etc/univention/templates/files/etc/network/interfaces.d/10-default 2.0.2-1~ -- "$@"

dpkg-maintscript-helper mv_conffile /etc/univention/templates/files/etc/network/interfaces /etc/univention/templates/files/etc/network/interfaces.d/10-default 2.0.2-1~ -- "$@"

(-)a/branches/ucs-4.0/ucs-4.0-0/base/univention-base-files/debian/univention-base-files.univention-config-registry (-4 lines)

Lines 204-213 Variables: interfaces/primary	Link Here

204

Type: file

204

Type: file

205

File: etc/bash.bashrc

205

File: etc/bash.bashrc

206

207

Type: module

208

Module: keymap.py

209

Variables: locale/keymap

210

211

Type: file

207

Type: file

212

File: etc/default/keyboard

208

File: etc/default/keyboard

213

Variables: xorg/keyboard/options/XkbModel

209

Variables: xorg/keyboard/options/XkbModel




Type=str
Categories=system-locale

[locale/keymap]
Description[de]=Die verwendete Tastaturbelegung. Sie kann über das UMC-Modul 'Systemeinstellungen' geändert werden.
Description[en]=The keyboard layout in use. It can modified using the UMC module 'System settings'.
Type=str
Categories=system-locale

[logrotate/rotate]
Description[de]=Logdateien werden nach diesem Kriterium rotiert, z.B. "daily", "weekly", "monthly", oder eine Größenbegrenzung wie "size 100M". Siehe 'man logrotate.conf' für weitere Formate.
Description[en]=Log files are rotated according to this criterion, e.g. "daily", "weekly", "monthly" or up to a size limit like "size 100M". See 'man logrotate.conf' for additional formats.

Return to bug 35496