X Strike Force XFree86 SVN commit: r1911 - in trunk/debian: . patches
Author: fabbione
Date: 2004-10-04 02:23:31 -0500 (Mon, 04 Oct 2004)
New Revision: 1911
Modified:
trunk/debian/CHANGESETS
trunk/debian/changelog
trunk/debian/patches/000_stolen_from_HEAD_xkb_data.diff
Log:
Fix Imakefile to ship pc/us_intl layout.
Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS 2004-10-04 06:51:44 UTC (rev 1910)
+++ trunk/debian/CHANGESETS 2004-10-04 07:23:31 UTC (rev 1911)
@@ -12,9 +12,10 @@
(Closes: #274101)
1905
-List /etc/X11/xkb/symbols/pc/us_intl into xlibs.install and MANIFEST
-files so that this keymap gets shipped. (Closes: #271326, #274513)
- 1906, 1907
+List /etc/X11/xkb/symbols/pc/us_intl into xlibs.install, MANIFEST
+files and xc/programs/xkbcomp/symbols/pc/Imakefile so that this
+keymap gets shipped. (Closes: #271326, #274513)
+ 1906, 1907, 1911
Add FAQ entry: Why does composing characters work in some applications but
not others?
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-10-04 06:51:44 UTC (rev 1910)
+++ trunk/debian/changelog 2004-10-04 07:23:31 UTC (rev 1911)
@@ -10,8 +10,9 @@
Changes by Denis Barbier:
- * List /etc/X11/xkb/symbols/pc/us_intl into xlibs.install and MANIFEST
- files so that this keymap gets shipped. (Closes: #271326, #274513)
+ * List /etc/X11/xkb/symbols/pc/us_intl into xlibs.install, MANIFEST
+ files and xc/programs/xkbcomp/symbols/pc/Imakefile so that this keymap
+ gets shipped. (Closes: #271326, #274513)
-- Branden Robinson <branden@debian.org> Mon, 4 Oct 2004 01:22:37 -0500
Modified: trunk/debian/patches/000_stolen_from_HEAD_xkb_data.diff
===================================================================
--- trunk/debian/patches/000_stolen_from_HEAD_xkb_data.diff 2004-10-04 06:51:44 UTC (rev 1910)
+++ trunk/debian/patches/000_stolen_from_HEAD_xkb_data.diff 2004-10-04 07:23:31 UTC (rev 1911)
@@ -191,6 +191,9 @@
- Add to 'us' keymap backslash key that can be rewritten in other layouts
(Bugzilla #976, B?rre Gaup).
+xc/programs/xkbcomp/symbols/pc/Imakefile
+ - Stolen from XOrg CVS @ 1.14: ship us_intl.
+
Index: xc/programs/xkbcomp/compat/iso9995
===================================================================
RCS file: /cvs/xc/programs/xkbcomp/compat/iso9995,v
@@ -4858,3 +4861,15 @@
+ include "level3(ralt_switch_multikey)"
};
-
+diff -Naurd xc.orig/programs/xkbcomp/symbols/pc/Imakefile xc/programs/xkbcomp/symbols/pc/Imakefile
+--- xc.orig/programs/xkbcomp/symbols/pc/Imakefile 2004-10-04 05:57:48.000000000 +0000
++++ xc/programs/xkbcomp/symbols/pc/Imakefile 2004-10-04 06:03:48.000000000 +0000
+@@ -20,7 +20,7 @@
+ ro ru \
+ sapmi se si sk sk_qwerty sr syr syr_phonetic \
+ tel th th_tis th_pat tj tml tr \
+- ua us \
++ ua us us_intl \
+ yu
+
+ all::
Reply to: