--- xkeyboard-config-0.8.orig/rules/base.xml.in +++ xkeyboard-config-0.8/rules/base.xml.in @@ -502,6 +502,18 @@ + logiinkse + <_description>Logitech iTouch Internet Navigator Keyboard SE + + + + + logiinkseusb + <_description>Logitech iTouch Internet Navigator Keyboard SE (USB) + + + + logiultrax <_description>Logitech Ultra-X Keyboard @@ -1727,6 +1739,12 @@ +        kr +        <_description>Korean +       +     +     +       la <_shortDescription>Lao <_description>Laos --- xkeyboard-config-0.8.orig/rules/base.lst +++ xkeyboard-config-0.8/rules/base.lst @@ -82,6 +82,8 @@ logiik Logitech Internet Keyboard logiink Logitech Internet Navigator Keyboard itouchin Logitech iTouch keyboard Internet Navigator + logiinkse Logitech iTouch Internet Navigator Keyboard SE + logiinkseusb Logitech iTouch Internet Navigator Keyboard SE (USB) logiultrax Logitech Ultra-X Keyboard mx1998 Memorex MX1998 mx2500 Memorex MX2500 EZ-Access Keyboard @@ -155,6 +157,7 @@ jp Japan kg Kyrgyzstan kh Cambodia + kr              Korea kz Kazakhstan la Laos latam Latin American --- xkeyboard-config-0.8.orig/types/pc +++ xkeyboard-config-0.8/types/pc @@ -17,6 +17,14 @@ level_name[Level2] = "Control"; }; + type "PC_ALT_LEVEL2" { + modifiers = Alt; + map[None] = Level1; + map[Alt] = Level2; + level_name[Level1] = "Base"; + level_name[Level2] = "Alt"; + }; + type "PC_SYSRQ" { modifiers = Alt+LevelThree; map[None] = Level1; --- xkeyboard-config-0.8.orig/debian/control +++ xkeyboard-config-0.8/debian/control @@ -0,0 +1,22 @@ +Source: xkeyboard-config +Section: x11 +Priority: optional +Maintainer: Daniel Stone +Build-Depends: debhelper (>= 4.0.0), intltool, libxml-parser-perl, xkbutils +Standards-Version: 3.6.1.0 + +Package: xkeyboard-config +Architecture: all +Depends: ${misc:Depends} +Replaces: xlibs (<< 6.8.2-39), xlibs-data (<< 6.8.2-39), libx11-6 (<< 1:6.2.1+cvs.20050610-1) +Conflicts: xlibs (<< 6.8.2-39), libxkbfile1 (<< 7.0.0-3) +Pre-Depends: x11-common (>= 7.0.0-0ubuntu3) +Description: XKB data + This package contains layout and other data for XKB, the X Keyboard + Extension. This data contains enough information on all known keyboards + to be able to configure an X server to understand its layouts and keys + correctly. + . + This data formerly lived in the 'xlibs' package, but it is now in its + own package, after having moved to the xkeyboard-config upstream tarballs: + http://www.freedesktop.org/wiki/Software_2fxkeyboard-config --- xkeyboard-config-0.8.orig/debian/rules +++ xkeyboard-config-0.8/debian/rules @@ -0,0 +1,90 @@ +#!/usr/bin/make -f +# debian/rules for the Debian xkeyboard-config package. +# Copyright © 2004 Scott James Remnant +# Copyright © 2005 Daniel Stone + +# Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 + +CFLAGS = -Wall -g +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + INSTALL_PROGRAM += -s +endif + +DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) + confflags += --build=$(DEB_HOST_GNU_TYPE) +else + confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) +endif + +confflags := --with-xkb-base=/etc/X11/xkb --with-xkb-rules-symlink=xorg --enable-xkbcomp-symlink=no + +build: build-stamp +build-stamp: + dh_testdir + + mkdir obj-$(DEB_BUILD_GNU_TYPE) + cd obj-$(DEB_BUILD_GNU_TYPE) && CFLAGS="$(CFLAGS)" \ + ../configure --prefix=/usr --mandir=\$${prefix}/share/man \ + --infodir=\$${prefix}/share/info --sysconfdir=/etc \ + $(confflags) + cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) + + cd po && intltool-update --verbose -p + + touch build-stamp + +clean: + dh_testdir + dh_testroot + rm -f build-stamp + + rm -f config.cache config.log config.status + rm -f */config.cache */config.log */config.status + rm -f conftest* */conftest* + rm -rf autom4te.cache */autom4te.cache + rm -rf obj-* + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install + rm debian/tmp/etc/X11/xkb/compiled + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + + dh_installdocs + dh_install --sourcedir=debian/tmp + dh_installchangelogs + dh_installman + dh_link + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +# Build architecture-independent files here. +binary-indep: build install +# Nothing to do + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install --- xkeyboard-config-0.8.orig/debian/changelog +++ xkeyboard-config-0.8/debian/changelog @@ -0,0 +1,163 @@ +xkeyboard-config (0.8-6) dapper; urgency=low + + * debian/rules: Generate a POT file. Closes: LP##35407. + + -- Martin Pitt Fri, 7 Apr 2006 09:57:49 +0200 + +xkeyboard-config (0.8-5) dapper; urgency=low + + * Experimentally remove the default Shift-NumLock=>Pointer_EnableKeys + (aka MouseKeys) policy so that NumLock works on ThinkPads (which send + Shift+NumLock). If this causes problems for a large number of people + it can be investigated. [Malone: #35080] + + -- Paul Sladen Sat, 25 Mar 2006 16:00:17 +0000 + +xkeyboard-config (0.8-4) dapper; urgency=low + + * symbols/group: + - patch from the CVS to fix the ralt issue (Ubuntu :#35845) + + -- Sebastien Bacher Fri, 24 Mar 2006 01:28:57 +0100 + +xkeyboard-config (0.8-3) dapper; urgency=low + + [ Tollef Fog Heen ] + * Add missing descriptions for Logitech iTouch Internet Navigator + Keyboard SE and same + USB, added in upstream CVS (Malone: #29470) + + [ Sebastien Bacher ] + * symbols/level3, types/pc: + - CVS patch to fix some of the issues with "compose:ralt" (Ubuntu: + #35845) + + -- Tollef Fog Heen Thu, 23 Mar 2006 10:55:02 +0100 + +xkeyboard-config (0.8-2) dapper; urgency=low + + * Rename the korean symbols file to kr since it's a South Korean + keyboard layout. + * Add missing include "us" for hr(us). + + -- Tollef Fog Heen Tue, 21 Mar 2006 11:56:38 +0100 + +xkeyboard-config (0.8-1) dapper; urgency=low + + * New upstream release + - Fixes group switching (Malone: #21595) + * Add Korean symbols file. + + -- Tollef Fog Heen Thu, 16 Mar 2006 14:55:09 +0100 + +xkeyboard-config (0.6-11) dapper; urgency=low + + * Make sure compose:caps is actually there. + + -- Tollef Fog Heen Sun, 26 Feb 2006 14:43:59 +0100 + +xkeyboard-config (0.6-10) dapper; urgency=low + + * Change dependency on x-common to x11-common. + + -- Daniel Stone Thu, 19 Jan 2006 18:39:16 +1100 + +xkeyboard-config (0.6-9) dapper; urgency=low + + * Respin to get compose:caps back (suspect timestamp hilarity with + rules/base, ugh; closes: Ubuntu#20484). + + -- Daniel Stone Mon, 12 Dec 2005 15:16:36 +1100 + +xkeyboard-config (0.6-8) dapper; urgency=low + + * Add de_CH -> ch(de) and fr_CH -> ch(fr) mappings. + * Add level3(ralt_switch_for_alts_toggle), which maps RALT to + [ l3switch, group_next ], which is the desired behaviour for a three-level + keyboard with multiple layouts present (see below). + * Add list of layouts which use third/fourth levels to base.lists.part. + * Add l[x] + o -> s mappings for all four levels; for all three-level + layouts, map grp:alts_toggle -> level3(ralt_switch_for_alts_toggle) for + that group only. Note that this precludes (sensibly) adding layouts + which use a different key than RALT for the l3 switcher to + $threelevellayouts, although this is only cosmetic (closes: Ubuntu#15372). + * Adjust altwin(meta_win) to cope with this; only modify the first level of + LALT and RALT. + * Only modify the first level in compose(ralt). + * Bind Alt_R to Mod1 in pc. + * Remove (completely false) ONE_LEVEL declarations for LALT, RALT, LWIN and + RWIN through level3. + * Add Conflicts on libxkbfile1 (<< 7.0.0-3), so we force upgrading to a + fixed version; l[x] + o -> s mappings (and l + o -> s) in the rules + will cause earlier versions of xkbfile to choke. + + -- Daniel Stone Mon, 10 Oct 2005 15:41:08 +1000 + +xkeyboard-config (0.6-5) breezy; urgency=low + + * Add ralt -> l3 mapping to no(dvorak), es(dvorak), and de(dvorak). + * diaresis -> diaeresis in de(dvorak). + + -- Daniel Stone Thu, 6 Oct 2005 12:01:39 +1000 + +xkeyboard-config (0.6-4) breezy; urgency=low + + * Add l:us_intl -> l:us,v:alt-intl mapping in rules.ml_s.part (closes: + Ubuntu#16568). + + -- Daniel Stone Fri, 30 Sep 2005 19:11:29 +1000 + +xkeyboard-config (0.6-3) breezy; urgency=low + + * Remove ca mapping from rules.ml_s.part, re-merge the rules. Add default + 'default' mapping to symbols/ca, which emulates the old rule-based + behaviour. Add ca_enhanced mapping to rules.ml_s.part. Add ca(fr) and + ca_enhanced to base.xml.in (closes: Ubuntu#15040). + * Fix merge.sh to be srcdir != destdir safe. + * Re-add compose:caps (closes: Ubuntu#15790). + * Add hr(alt) variant, thanks Ante Karamatic (closes: Ubuntu#14667); also + add hr_US -> hr(alt) mapping in rules. + + -- Daniel Stone Wed, 21 Sep 2005 18:19:41 +1000 + +xkeyboard-config (0.6-2) breezy; urgency=low + + * Fix missing build-depends. + + -- LaMont Jones Sat, 3 Sep 2005 11:22:39 -0600 + +xkeyboard-config (0.6-1) breezy; urgency=low + + * New upstream release. + + Provides fr-latin9 as an alias for fr(latin9) (closes: Ubuntu#13919). + + -- Daniel Stone Mon, 29 Aug 2005 13:01:44 +1000 + +xkeyboard-config (0.5-4) breezy; urgency=low + + * Replaces on old versions of xlibs-data. + + -- Daniel Stone Thu, 4 Aug 2005 19:30:21 +1000 + +xkeyboard-config (0.5-3) breezy; urgency=low + + * Add /usr/lib/X11/xkb and /usr/X11R6/lib/X11/xkb symlinks; add Pre-Depends + on x-common as we now use /usr/lib/X11 and want that to be in a + transitioned state. Add Conflicts on old (monolith) versions of libx11-6 + as that's where the XKB symlinks used to live. + + -- Daniel Stone Mon, 25 Jul 2005 21:19:44 +1000 + +xkeyboard-config (0.5-2) breezy; urgency=low + + * Remove 'compiled' symlink in debian/rules, averting conflict with + xbase-clients. + * Bump xlibs Conflicts/Replaces to -39, to account for fun with broken + packaging. + + -- Daniel Stone Mon, 18 Jul 2005 18:47:52 +1000 + +xkeyboard-config (0.5-1) breezy; urgency=low + + * First xkeyboard-config release. + + -- Daniel Stone Mon, 11 Jul 2005 15:07:19 +1000 --- xkeyboard-config-0.8.orig/debian/xkeyboard-config.links +++ xkeyboard-config-0.8/debian/xkeyboard-config.links @@ -0,0 +1,5 @@ +etc/X11/xkb/rules/base etc/X11/xkb/rules/xfree86 +etc/X11/xkb/rules/base.lst etc/X11/xkb/rules/xfree86.lst +etc/X11/xkb/rules/base.xml etc/X11/xkb/rules/xfree86.xml +etc/X11/xkb usr/lib/X11/xkb +etc/X11/xkb usr/X11R6/lib/X11/xkb --- xkeyboard-config-0.8.orig/debian/compat +++ xkeyboard-config-0.8/debian/compat @@ -0,0 +1 @@ +4 --- xkeyboard-config-0.8.orig/debian/copyright +++ xkeyboard-config-0.8/debian/copyright @@ -0,0 +1,22 @@ +Copyright (C) 2001-2005 Denis Barbier , +Frank Murphy , Ivan Pascal (pascal@info.tsu.ru), +Andriy Rysin (arysin@myrealbox.com) and +Sergey V. Udaltsov (svu@users.sourceforge.net). + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the name of the copyright holder(s) not be used in +advertising or publicity pertaining to distribution of the software without +specific, written prior permission. The copyright holder(s) makes no +representations about the suitability of this software for any purpose. It +is provided "as is" without express or implied warranty. + +THE COPYRIGHT HOLDER(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +EVENT SHALL THE COPYRIGHT HOLDER(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE. --- xkeyboard-config-0.8.orig/debian/xkeyboard-config.postinst +++ xkeyboard-config-0.8/debian/xkeyboard-config.postinst @@ -0,0 +1,10 @@ +#! /bin/sh + +if [ -e "/etc/X11/xkb/symbols/ko" ]; then + if md5sum --status -c < { [ any, any, backslash ] }; --- xkeyboard-config-0.8.orig/symbols/kr +++ xkeyboard-config-0.8/symbols/kr @@ -0,0 +1,7 @@ +partial default alphanumeric_keys +xkb_symbols "hangul_keys" { + include "us" + name[Group1]= "Korean"; + key { [ Hangul ] }; + key { [ Hangul_Hanja ] }; +}; --- xkeyboard-config-0.8.orig/symbols/pc +++ xkeyboard-config-0.8/symbols/pc @@ -120,7 +120,10 @@ key { [ Right ] }; // End "Editing" section, begin "Keypad" - key { [ Num_Lock, Pointer_EnableKeys ] }; + + // Disable Shift-NumLock=>MouseKeys as a global policy, so + // that NumLock works on ThinkPads, which send Shift-NumLock + key { [ Num_Lock ] }; // Ungrab cancels server/keyboard/pointer grabs key { --- xkeyboard-config-0.8.orig/symbols/group +++ xkeyboard-config-0.8/symbols/group @@ -102,11 +102,11 @@ partial modifier_keys xkb_symbols "ctrl_shift_toggle" { key { - type="PC_BREAK", + type[Group1]="PC_BREAK", symbols[Group1]= [ Shift_L, ISO_Prev_Group ] }; key { - type="PC_BREAK", + type[Group1]="PC_BREAK", symbols[Group1]= [ Shift_R, ISO_Next_Group ] }; key { [ Control_L, ISO_Prev_Group ] }; @@ -137,21 +137,21 @@ xkb_symbols "ctrl_alt_toggle" { virtual_modifiers Alt; key { - type="PC_BREAK", + type[Group1]="PC_BREAK", symbols[Group1]= [ NoSymbol, ISO_Prev_Group ], virtualMods= Alt }; key { - type="PC_BREAK", + type[Group1]="PC_BREAK", symbols[Group1]= [ NoSymbol, ISO_Next_Group ], virtualMods= Alt }; key { - type="PC_SYSRQ", + type[Group1]="PC_SYSRQ", symbols[Group1]= [ Control_L, ISO_Prev_Group ] }; key { - type="PC_SYSRQ", + type[Group1]="PC_SYSRQ", symbols[Group1]= [ Control_R, ISO_Next_Group ] }; }; @@ -173,11 +173,11 @@ virtualMods= Alt }; key { - type="PC_SYSRQ", + type[Group1]="PC_SYSRQ", symbols[Group1]= [ Shift_L, ISO_Prev_Group ] }; key { - type="PC_SYSRQ", + type[Group1]="PC_SYSRQ", symbols[Group1]= [ Shift_R, ISO_Next_Group ] }; }; @@ -219,11 +219,11 @@ xkb_symbols "ctrls_toggle" { virtual_modifiers AltGr; key { - type="PC_BREAK", + type[Group1]="PC_BREAK", symbols[Group1]= [ NoSymbol, ISO_Prev_Group ] }; key { - type="PC_BREAK", + type[Group1]="PC_BREAK", symbols[Group1]= [ NoSymbol, ISO_Next_Group ] }; }; @@ -233,12 +233,12 @@ xkb_symbols "alts_toggle" { virtual_modifiers Alt; key { - type="PC_SYSRQ", + type[Group1]="PC_SYSRQ", symbols[Group1]= [ NoSymbol, ISO_Prev_Group ], virtualMods= Alt }; key { - type="PC_SYSRQ", + type[Group1]="PC_SYSRQ", symbols[Group1]= [ NoSymbol, ISO_Next_Group ], virtualMods= Alt }; --- xkeyboard-config-0.8.orig/symbols/Makefile.am +++ xkeyboard-config-0.8/symbols/Makefile.am @@ -13,7 +13,7 @@ gr hr hu \ ie il in \ ir is it \ -jp kg kh kz la \ +jp kg kh kr kz la \ latam latin lk \ lt lv mao \ mk mm mn \ --- xkeyboard-config-0.8.orig/symbols/Makefile.in +++ xkeyboard-config-0.8/symbols/Makefile.in @@ -175,7 +175,7 @@ gr hr hu \ ie il in \ ir is it \ -jp kg kh kz la \ +jp kg kh kr kz la \ latam latin lk \ lt lv mao \ mk mm mn \ --- xkeyboard-config-0.8.orig/symbols/level3 +++ xkeyboard-config-0.8/symbols/level3 @@ -26,7 +26,7 @@ symbols[Group1] = [ Alt_L, ISO_Prev_Group, ISO_Prev_Group ] }; key { - type[Group1]="PC_SYSRQ", + type[Group1]="PC_ALT_LEVEL2", symbols[Group1] = [ ISO_Level3_Shift, ISO_Next_Group ], virtualMods= AltGr };