Attachment 6033 Details for Bug 35496

[patch] Drop locale/keymap from univention-base-files

35496-di-keyboard.diff (text/plain), 10.16 KB, created by Philipp Hahn on 2014-07-31 16:04 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Philipp Hahn

Created: 2014-07-31 16:04 CEST

Size: 10.16 KB

patch

obsolete

>diff --git a/branches/ucs-4.0/ucs-4.0-0/base/univention-base-files/conffiles/etc/default/keyboard b/branches/ucs-4.0/ucs-4.0-0/base/univention-base-files/conffiles/etc/default/keyboard
>index 739bea6..0b540f1 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/base/univention-base-files/conffiles/etc/default/keyboard
>+++ b/branches/ucs-4.0/ucs-4.0-0/base/univention-base-files/conffiles/etc/default/keyboard
>@@ -1,19 +1,16 @@
> @%@UCRWARNING=# @%@
>+# KEYBOARD CONFIGURATION FILE
> 
>-# Check /usr/share/doc/keyboard-configuration/README.Debian for
>-# 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.
>+# Consult the keyboard(5) manual page.
> 
> 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
>-
>diff --git a/branches/ucs-4.0/ucs-4.0-0/base/univention-base-files/conffiles/keymap.py b/branches/ucs-4.0/ucs-4.0-0/base/univention-base-files/conffiles/keymap.py
>deleted file mode 100644
>index 207ee0e..0000000
>--- a/branches/ucs-4.0/ucs-4.0-0/base/univention-base-files/conffiles/keymap.py
>+++ /dev/null
>@@ -1,38 +0,0 @@
>-# -*- 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])
>diff --git a/branches/ucs-4.0/ucs-4.0-0/base/univention-base-files/conffiles/xkbKeyboard.py b/branches/ucs-4.0/ucs-4.0-0/base/univention-base-files/conffiles/xkbKeyboard.py
>index 095624f..f100a60 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/base/univention-base-files/conffiles/xkbKeyboard.py
>+++ b/branches/ucs-4.0/ucs-4.0-0/base/univention-base-files/conffiles/xkbKeyboard.py
>@@ -32,5 +32,7 @@
> 
> import os
> 
>+
> def handler(configRegistry, changes):
> 	os.system('/sbin/udevadm trigger --subsystem-match=input --action=change')
>+	os.system('/bin/setupcon --force --save')
>diff --git a/branches/ucs-4.0/ucs-4.0-0/base/univention-base-files/debian/changelog b/branches/ucs-4.0/ucs-4.0-0/base/univention-base-files/debian/changelog
>index 65f0182..f66c418 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/base/univention-base-files/debian/changelog
>+++ b/branches/ucs-4.0/ucs-4.0-0/base/univention-base-files/debian/changelog
>@@ -1,3 +1,9 @@
>+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
> 
>   * Update templates for /etc/init.d/ files (Bug #35522)
>diff --git a/branches/ucs-4.0/ucs-4.0-0/base/univention-base-files/debian/univention-base-files.postinst b/branches/ucs-4.0/ucs-4.0-0/base/univention-base-files/debian/univention-base-files.postinst
>index b59b8b3..4080a5f 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/base/univention-base-files/debian/univention-base-files.postinst
>+++ b/branches/ucs-4.0/ucs-4.0-0/base/univention-base-files/debian/univention-base-files.postinst
>@@ -145,34 +145,10 @@ if [ -e /etc/init.d/rdate ]; then
> 	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
>-if [ -z "$locale_keymap" ]; then
>-	# 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~ -- "$@"
>+dpkg-maintscript-helper rm_conffile /etc/univention/templates/modules/keymap.py 4~
> 
> # <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~ -- "$@"
>diff --git a/branches/ucs-4.0/ucs-4.0-0/base/univention-base-files/debian/univention-base-files.postrm b/branches/ucs-4.0/ucs-4.0-0/base/univention-base-files/debian/univention-base-files.postrm
>index fa4c415..10fd472 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/base/univention-base-files/debian/univention-base-files.postrm
>+++ b/branches/ucs-4.0/ucs-4.0-0/base/univention-base-files/debian/univention-base-files.postrm
>@@ -35,7 +35,7 @@ set -e
> if test "$1" = "purge"; then
> 	rm -rf /var/cache/univention-baseconfig
> 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>
> 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~ -- "$@"
>diff --git a/branches/ucs-4.0/ucs-4.0-0/base/univention-base-files/debian/univention-base-files.preinst b/branches/ucs-4.0/ucs-4.0-0/base/univention-base-files/debian/univention-base-files.preinst
>index a302209..a366408 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/base/univention-base-files/debian/univention-base-files.preinst
>+++ b/branches/ucs-4.0/ucs-4.0-0/base/univention-base-files/debian/univention-base-files.preinst
>@@ -36,8 +36,8 @@ dpkg-divert --rename --quiet --divert /etc/motd.debian --package univention-base
> # 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-maintscript-helper rm_conffile /etc/univention/templates/modules/set_locale.py 1.0.48~ -- "$@"
>-rm -f /etc/univention/templates/modules/set_locale.pyc || true
>+dpkg-maintscript-helper rm_conffile /etc/univention/templates/modules/keymap.py 4~
>+rm -f /etc/univention/templates/modules/keymap.pyc
> 
> # <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~ -- "$@"
>diff --git a/branches/ucs-4.0/ucs-4.0-0/base/univention-base-files/debian/univention-base-files.univention-config-registry b/branches/ucs-4.0/ucs-4.0-0/base/univention-base-files/debian/univention-base-files.univention-config-registry
>index e1cb95c..e3c411c 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/base/univention-base-files/debian/univention-base-files.univention-config-registry
>+++ b/branches/ucs-4.0/ucs-4.0-0/base/univention-base-files/debian/univention-base-files.univention-config-registry
>@@ -204,10 +204,6 @@ Variables: interfaces/primary
> Type: file
> File: etc/bash.bashrc
> 
>-Type: module
>-Module: keymap.py
>-Variables: locale/keymap
>-
> Type: file
> File: etc/default/keyboard
> Variables: xorg/keyboard/options/XkbModel
>diff --git a/branches/ucs-4.0/ucs-4.0-0/base/univention-base-files/debian/univention-base-files.univention-config-registry-variables b/branches/ucs-4.0/ucs-4.0-0/base/univention-base-files/debian/univention-base-files.univention-config-registry-variables
>index 9215012..50db173 100644
>--- a/branches/ucs-4.0/ucs-4.0-0/base/univention-base-files/debian/univention-base-files.univention-config-registry-variables
>+++ b/branches/ucs-4.0/ucs-4.0-0/base/univention-base-files/debian/univention-base-files.univention-config-registry-variables
>@@ -321,12 +321,6 @@ Description[en]=Localisation properties such as time/date formats and the prefer
> 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.

Actions: View | Diff

Attachments on bug 35496: 6033