X Strike Force X.Org X11 SVN commit: r2794 - in trunk/data/xkb-data/debian: . patches
Author: barbier
Date: 2006-08-14 10:28:53 -0400 (Mon, 14 Aug 2006)
New Revision: 2794
Modified:
trunk/data/xkb-data/debian/changelog
trunk/data/xkb-data/debian/patches/cvs.diff
trunk/data/xkb-data/debian/patches/sclk_toggle.diff
trunk/data/xkb-data/debian/rules
Log:
Make sure that rules/base{,.lst,.xml} files are rebuilt.
Upload xkeyboard-config 0.8-7 into unstable
Modified: trunk/data/xkb-data/debian/changelog
===================================================================
--- trunk/data/xkb-data/debian/changelog 2006-08-14 14:15:06 UTC (rev 2793)
+++ trunk/data/xkb-data/debian/changelog 2006-08-14 14:28:53 UTC (rev 2794)
@@ -1,4 +1,4 @@
-xkeyboard-config (0.8-7) UNRELEASED; urgency=low
+xkeyboard-config (0.8-7) unstable; urgency=low
* debian/patches/macintosh-gb.diff: New patch to fix <LSGT> and <TLDE> keys.
Closes: #379148 Thanks Roger Leigh
@@ -9,8 +9,10 @@
* debian/patches/update-bt.diff: New patch to update the Bhutanese layout.
Closes: #378309 Thanks Christian Perrier
- -- Denis Barbier <barbier@debian.org> Fri, 21 Jul 2006 22:50:11 +0200
+ * debian/rules: Make sure that rules/base{,.lst,.xml} files are rebuilt.
+ -- Denis Barbier <barbier@debian.org> Mon, 14 Aug 2006 16:10:41 +0200
+
xkeyboard-config (0.8-6) unstable; urgency=low
* debian/control: Move debhelper from Build-Depends-Indep to Build-Depends.
Modified: trunk/data/xkb-data/debian/patches/cvs.diff
===================================================================
--- trunk/data/xkb-data/debian/patches/cvs.diff 2006-08-14 14:15:06 UTC (rev 2793)
+++ trunk/data/xkb-data/debian/patches/cvs.diff 2006-08-14 14:28:53 UTC (rev 2794)
@@ -65276,197 +65276,6 @@
mx1998 mx2500 mx2750 \
microsoftinet microsoftpro microsoftprousb microsoftprooem microsoftprose \
microsoftoffice microsoftmult \
-Index: xkb-data/rules/base.lst
-===================================================================
---- xkb-data.orig/rules/base.lst
-+++ xkb-data/rules/base.lst
-@@ -4,6 +4,7 @@
- pc104 Generic 104-key PC
- pc105 Generic 105-key (Intl) PC
- dell101 Dell 101-key PC
-+ latitude Dell Latitude series laptop
- everex Everex STEPnote
- flexpro Keytronic FlexPro
- microsoft Microsoft Natural
-@@ -13,6 +14,7 @@
- pc98 PC-98xx Series
- a4techKB21 A4Tech KB-21
- a4techKBS8 A4Tech KBS-8
-+ a4_rfkb23 A4Tech Wireless Desktop RFKB-23
- abnt2 Brazilian ABNT2
- airkey Acer AirKey V
- acpi ACPI Standard
-@@ -49,6 +51,7 @@
- genius Genius Comfy KB-16M / Genius MM Keyboard KWD-910
- geniuscomfy Genius Comfy KB-12e
- geniuscomfy2 Genius Comfy KB-21e-Scroll
-+ genius_kb19e_nb Genius KB-19e NB
- gyration Gyration
- hpi6 Hewlett-Packard Internet Keyboard
- hp2501 Hewlett-Packard SK-2501 Multimedia Keyboard
-@@ -68,21 +71,21 @@
- logiaccess Logitech Access Keyboard
- ltcd Logitech Cordless Desktop
- logicdit Logitech Cordless Desktop iTouch
-+ logiclx300 Logitech Cordless Desktop LX-300
- logicdp Logitech Cordless Desktop Pro
- logicdpa Logitech Cordless Desktop Pro (alternate option)
- logicdpa2 Logitech Cordless Desktop Pro (alternate option2)
- logicdo Logitech Cordless Desktop Optical
- logicfn Logitech Cordless Freedom/Desktop Navigator
- logicdn Logitech Cordless Desktop Navigator
-- logidak Logitech Deluxe Access Keyboard
- logiitc Logitech iTouch Cordless Keyboard (model Y-RB6)
- logiik Logitech Internet Keyboard
- itouch Logitech iTouch
-- logiitc Logitech iTouch Cordless Keyboard (model Y-RB6)
-- logiik Logitech Internet Keyboard
-- logiink Logitech Internet Navigator Keyboard
-- itouchin Logitech iTouch keyboard Internet Navigator
-+ logicink Logitech Internet Navigator Keyboard
-+ logiinkse Logitech iTouch Internet Navigator Keyboard SE
-+ logiinkseusb Logitech iTouch Internet Navigator Keyboard SE (USB)
- logiultrax Logitech Ultra-X Keyboard
-+ dinovo Logitech diNovo Keyboard
- mx1998 Memorex MX1998
- mx2500 Memorex MX2500 EZ-Access Keyboard
- mx2750 Memorex MX2750
-@@ -113,9 +116,13 @@
- macintosh_old Macintosh Old
- powerpcps2 PowerPC PS/2
- acer_tm_800 Acer TravelMate 800
-+ acer_ferrari4k Acer Ferrari 4000
- power_g5 Power G5
-+ apple Apple
-+ apple_laptop Apple Laptop
- silvercrest SILVERCREST Multimedia Wireless Keyboard
- emachines Laptop/notebook eMachines m68xx
-+ kr106 Korean 106-key
-
- ! layout
- us U.S. English
-@@ -134,6 +141,7 @@
- bg Bulgaria
- mm Myanmar
- ca Canada
-+ cd Congo, Democratic Republic of the
- hr Croatia
- cz Czechia
- dk Denmark
-@@ -141,6 +149,7 @@
- bt Bhutan
- ee Estonia
- ir Iran
-+ iq Iraq
- fo Faroe Islands
- fi Finland
- fr France
-@@ -184,12 +193,14 @@
- gb United Kingdom
- uz Uzbekistan
- vn Vietnam
-- nec_vndr/jp PC-98xx Series
-+ kr Korea, Republic of
-+ nec_vndr/jp Japan (PC-98xx Series)
- ie Ireland
- pk Pakistan
- mv Maldives
- za South Africa
- epo Esperanto
-+ np Nepal
-
- ! variant
- intl us: International (with dead keys)
-@@ -212,6 +223,7 @@
- iso-alternate be: ISO Alternate
- nodeadkeys be: Eliminate dead keys
- sundeadkeys be: Sun dead keys
-+ wang be: Wang model 724 azerty
- probhat bd: Probhat
- ben in: Bengali
- ben_probhat in: Bengali Probhat
-@@ -252,9 +264,16 @@
- pro ir: Pro
- keypad ir: Keypad
- pro_keypad ir: Pro Keypad
-+ ku ir: Kurdish, Latin Q
-+ ku_f ir: Kurdish, (F)
-+ ku_alt ir: Kurdish, Latin Alt-Q
-+ ku iq: Kurdish, Latin Q
-+ ku_f iq: Kurdish, (F)
-+ ku_alt iq: Kurdish, Latin Alt-Q
- nodeadkeys fo: Eliminate dead keys
- nodeadkeys fi: Eliminate dead keys
- smi fi: Northern Saami
-+ kotoistus fi: Kotoistus
- nodeadkeys fr: Eliminate dead keys
- sundeadkeys fr: Sun dead keys
- latin9 fr: Alternative
-@@ -275,6 +294,7 @@
- ro_nodeadkeys de: Romanian keyboard with German letters, eliminate dead keys
- dvorak de: Dvorak
- sundeadkeys de: Sun dead keys
-+ neo de: Neostyle
- extended gr: Extended
- nodeadkeys gr: Eliminate dead keys
- polytonic gr: Polytonic
-@@ -300,7 +320,6 @@
- Sundeadkeys is: Sun dead keys
- nodeadkeys is: Eliminate dead keys
- lyx il: lyx
-- si1452 il: si1452
- phonetic il: Phonetic
- nodeadkeys it: Eliminate dead keys
- ruskaz kz: Russian with Kazakh
-@@ -313,7 +332,7 @@
- tilde lv: Tilde (~) variant
- fkey lv: F-letter (F) variant
- nodeadkeys mk: Eliminate dead keys
-- us mt: US keyboard with Maltian letters
-+ us mt: Maltese keyboard with US layout
- nodeadkeys no: Eliminate dead keys
- dvorak no: Dvorak
- smi no: Northern Saami
-@@ -358,8 +377,13 @@
- fr ch: French
- fr_nodeadkeys ch: French, eliminate dead keys
- fr_sundeadkeys ch: French, Sun dead keys
-+ fr_mac ch: French (Macintosh)
-+ de_mac ch: German (Macintosh)
- syc sy: Syriac
- syc_phonetic sy: Syriac phonetic
-+ ku sy: Kurdish, Latin Q
-+ ku_f sy: Kurdish, (F)
-+ ku_alt sy: Kurdish, Latin Alt-Q
- tam_unicode lk: Tamil Unicode
- tam_TAB lk: Tamil TAB Typewriter
- tis th: TIS-820.2538
-@@ -367,6 +391,9 @@
- f tr: (F)
- alt tr: Alt-Q
- sundeadkeys tr: Sun dead keys
-+ ku tr: Kurdish, Latin Q
-+ ku_f tr: Kurdish, (F)
-+ ku_alt tr: Kurdish, Latin Alt-Q
- phonetic ua: Phonetic
- typewriter ua: Typewriter
- winkeys ua: Winkeys
-@@ -374,6 +401,7 @@
- rstu_ru ua: Standard RSTU on Russian layout
- intl gb: International (with dead keys)
- dvorak gb: Dvorak
-+ kr104 kr: 101/104 key Compatible
- CloGaelach ie: CloGaelach
- UnicodeExpert ie: UnicodeExpert
- ogam ie: Ogham
-@@ -441,6 +469,7 @@
- altwin:alt_super_win Alt is mapped to the right Win-key and Super to Menu.
- Compose key Compose key position
- compose:ralt Right Alt is Compose.
-+ compose:lwin Left Win-key is Compose.
- compose:rwin Right Win-key is Compose.
- compose:menu Menu is Compose.
- compose:rctrl Right Ctrl is Compose.
Index: xkb-data/rules/base.m_g.part
===================================================================
--- xkb-data.orig/rules/base.m_g.part
Modified: trunk/data/xkb-data/debian/patches/sclk_toggle.diff
===================================================================
--- trunk/data/xkb-data/debian/patches/sclk_toggle.diff 2006-08-14 14:15:06 UTC (rev 2793)
+++ trunk/data/xkb-data/debian/patches/sclk_toggle.diff 2006-08-14 14:28:53 UTC (rev 2794)
@@ -60,15 +60,3 @@
</group>
<group allowMultipleSelection="true">
<!-- The key combination used to choose the 3rd (and 4th, together with Shift)
-Index: xkb-data/rules/base.lst
-===================================================================
---- xkb-data.orig/rules/base.lst
-+++ xkb-data/rules/base.lst
-@@ -436,6 +436,7 @@
- grp:rshift_toggle Right Shift key changes group.
- grp:lctrl_toggle Left Ctrl key changes group.
- grp:rctrl_toggle Right Ctrl key changes group.
-+ grp:sclk_toggle ScrollLock key changes group.
- lv3 Third level choosers
- lv3:switch Press Right Ctrl to choose 3rd level.
- lv3:menu_switch Press Menu key to choose 3rd level.
Modified: trunk/data/xkb-data/debian/rules
===================================================================
--- trunk/data/xkb-data/debian/rules 2006-08-14 14:15:06 UTC (rev 2793)
+++ trunk/data/xkb-data/debian/rules 2006-08-14 14:28:53 UTC (rev 2794)
@@ -64,6 +64,8 @@
$(stamp)build: $(stamp)configure
dh_testdir
+ # Remove these files to ensure that they are rebuilt
+ cd rules && rm -f base base.xml base.lst
# Files kept so that xkbcomp is not needed
for d in compat geometry keycodes keymap semantics symbols types; \
do cp debian/$$d.dir $$d/; done
Reply to: