[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

X Strike Force X.Org X11 SVN commit: r3084 - in trunk/data/xkb-data/debian: . patches



Author: barbier
Date: 2006-08-28 17:31:55 -0400 (Mon, 28 Aug 2006)
New Revision: 3084

Added:
   trunk/data/xkb-data/debian/patches/microsoft.diff
Modified:
   trunk/data/xkb-data/debian/changelog
   trunk/data/xkb-data/debian/patches/series
Log:
* debian/patches/microsoft.diff: New patch to enable again the
  'microsoft' model, it had been disabled by error in previous uploads.
  Closes: #379917 Thanks Phil Armstrong


Modified: trunk/data/xkb-data/debian/changelog
===================================================================
--- trunk/data/xkb-data/debian/changelog	2006-08-28 21:20:31 UTC (rev 3083)
+++ trunk/data/xkb-data/debian/changelog	2006-08-28 21:31:55 UTC (rev 3084)
@@ -23,6 +23,10 @@
     lv3:ralt_switch_multikey which had been dropped from xkeyboard-config.
     Closes: #364435  Thanks Klaus Ethgen
 
+  * debian/patches/microsoft.diff: New patch to enable again the
+    'microsoft' model, it had been disabled by error in previous uploads.
+    Closes: #379917 Thanks Phil Armstrong
+
  -- Denis Barbier <barbier@debian.org>  Sat, 26 Aug 2006 14:54:51 +0200
 
 xkeyboard-config (0.8-7) unstable; urgency=low

Added: trunk/data/xkb-data/debian/patches/microsoft.diff
===================================================================
--- trunk/data/xkb-data/debian/patches/microsoft.diff	2006-08-28 21:20:31 UTC (rev 3083)
+++ trunk/data/xkb-data/debian/patches/microsoft.diff	2006-08-28 21:31:55 UTC (rev 3084)
@@ -0,0 +1,11 @@
+This line has been erroneously removed from CVS 1.5
+
+Index: xkb-data/rules/base.m_g.part
+===================================================================
+--- xkb-data.orig/rules/base.m_g.part
++++ xkb-data/rules/base.m_g.part
+@@ -1,3 +1,4 @@
++  microsoft	=	microsoft(natural)
+   microsoftpro	=	microsoft(natural)
+   microsoftprousb =	microsoft(natural)
+   microsoftprose =	microsoft(natural)

Modified: trunk/data/xkb-data/debian/patches/series
===================================================================
--- trunk/data/xkb-data/debian/patches/series	2006-08-28 21:20:31 UTC (rev 3083)
+++ trunk/data/xkb-data/debian/patches/series	2006-08-28 21:31:55 UTC (rev 3084)
@@ -6,4 +6,5 @@
 fix_symbols_hr.diff -p0
 mac_fnkeys.diff -p0
 ralt_switch_multikey.diff
+microsoft.diff
 #mac_level3.diff



Reply to: