Updated to xkeyboard-config-1.8

8 files changed, 376 insertions, 77 deletions

diff --git a/xorg-server/xkbdata.src/geometry/Makefile.am b/xorg-server/xkbdata.src/geometry/Makefile.am
index ff1f8c758..84619fb96 100644
--- a/xorg-server/xkbdata.src/geometry/Makefile.am
+++ b/xorg-server/xkbdata.src/geometry/Makefile.am
@@ -6,7 +6,7 @@ dist_geom_DATA = \
 amiga ataritt chicony \
 dell everex fujitsu \
 hhk hp keytronic kinesis \
-macintosh microsoft nec \
+macintosh microsoft nec nokia \
 northgate pc sony thinkpad \
 sun typematrix winbook README
 
diff --git a/xorg-server/xkbdata.src/geometry/Makefile.in b/xorg-server/xkbdata.src/geometry/Makefile.in
index ac6a41475..fdd635186 100644
--- a/xorg-server/xkbdata.src/geometry/Makefile.in
+++ b/xorg-server/xkbdata.src/geometry/Makefile.in
@@ -124,6 +124,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 POFILES = @POFILES@
@@ -187,7 +188,7 @@ dist_geom_DATA = \
 amiga ataritt chicony \
 dell everex fujitsu \
 hhk hp keytronic kinesis \
-macintosh microsoft nec \
+macintosh microsoft nec nokia \
 northgate pc sony thinkpad \
 sun typematrix winbook README
 
@@ -207,9 +208,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  geometry/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  geometry/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  geometry/Makefile
+	  $(AUTOMAKE) --foreign  geometry/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/xorg-server/xkbdata.src/geometry/digital_vndr/Makefile.in b/xorg-server/xkbdata.src/geometry/digital_vndr/Makefile.in
index 82b3b990b..6ab8a8ad6 100644
--- a/xorg-server/xkbdata.src/geometry/digital_vndr/Makefile.in
+++ b/xorg-server/xkbdata.src/geometry/digital_vndr/Makefile.in
@@ -106,6 +106,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 POFILES = @POFILES@
@@ -179,9 +180,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  geometry/digital_vndr/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  geometry/digital_vndr/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  geometry/digital_vndr/Makefile
+	  $(AUTOMAKE) --foreign  geometry/digital_vndr/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/xorg-server/xkbdata.src/geometry/geometry.dir b/xorg-server/xkbdata.src/geometry/geometry.dir
index fb1c401a3..f2259ed8c 100644
--- a/xorg-server/xkbdata.src/geometry/geometry.dir
+++ b/xorg-server/xkbdata.src/geometry/geometry.dir
@@ -1,31 +1,8 @@
+-d------ -------- everex(STEPnote)
 -d------ -------- macintosh(macintosh)
 -------- -------- macintosh(applepro)
 -------- -------- macintosh(macbook78)
 -------- -------- macintosh(macbook79)
--d------ -------- winbook(XP5)
--d------ -------- kinesis(model100)
--------- -------- typematrix(tm2020)
--------- -------- typematrix(tm2030_shape)
--------- -------- typematrix(tm2030_MiscDiod_dvk)
--------- -------- typematrix(tm2030_MiscDiod_102)
--------- -------- typematrix(tm2030_MiscDiod_106)
--------- -------- typematrix(tm2030_MiscDiod_off)
--------- -------- typematrix(tm2030_MiscDiod_on)
--------- -------- typematrix(tm2030USB_func)
--------- -------- typematrix(tm2030USB_alpha)
--------- -------- typematrix(tm2030USB_ctrl)
--------- -------- typematrix(tm2030PS2)
--------- -------- typematrix(tm2030USB)
--------- -------- typematrix(tm2030USB-102)
--------- -------- typematrix(tm2030USB-106)
--d------ -------- northgate(omnikey101)
--d------ -------- sony(nwp5461)
--------- -------- thinkpad(common)
--------- -------- thinkpad(us)
--------- -------- thinkpad(intl)
--------- -------- thinkpad(60)
--d------ -------- fujitsu(138)
--------- -------- fujitsu(140)
 -------- -------- sun(type4)
 -------- -------- sun(type4tuv)
 -------- -------- sun(type4_ca)
@@ -59,14 +36,8 @@
 -------- -------- sun(x86)
 -------- -------- sun(MS_x86)
 -------- -------- sun(x86tuv)
--d------ -------- amiga(usa1)
--------- -------- amiga(de)
--d------ -------- microsoft(natural)
--------- -------- microsoft(elite)
--d------ -------- hp(pc101)
--------- -------- hp(hil)
--------- -------- hp(omnibook)
--------- -------- hp(omnibook_intl)
+-d------ -------- fujitsu(138)
+-------- -------- fujitsu(140)
 -d------ -------- pc(pc101)
 -------- -------- pc(pc102)
 -------- -------- pc(pc104)
@@ -77,7 +48,6 @@
 -------- -------- pc(kr106)
 -------- -------- pc(latitude)
 -------- -------- pc(pc104alt)
--d------ -------- chicony(us)
 -d------ -------- hhk(win1)
 -------- -------- hhk(win2)
 -------- -------- hhk(win3)
@@ -87,27 +57,39 @@
 -------- -------- hhk(jp3)
 -------- -------- hhk(jp4)
 h-p----- -------- hhk(basic)
+-d------ -------- kinesis(model100)
+-d------ -------- hp(pc101)
+-------- -------- hp(hil)
+-------- -------- hp(omnibook)
+-------- -------- hp(omnibook_intl)
+-------- -------- hp(mini110)
+-------- -------- hp(dv5)
+-d------ -------- microsoft(natural)
+-------- -------- microsoft(elite)
+-d------ -------- keytronic(FlexPro)
+-d------ -------- northgate(omnikey101)
+-d------ -------- sgi_vndr/indy(pc101)
+-------- -------- sgi_vndr/indy(pc102)
+-------- -------- sgi_vndr/indy(jp106)
 -d------ -------- sgi_vndr/O2(pc101)
 -------- -------- sgi_vndr/O2(pc102)
 -------- -------- sgi_vndr/O2(jp106)
 -d------ -------- sgi_vndr/indigo(pc101)
 -------- -------- sgi_vndr/indigo(pc102)
--d------ -------- sgi_vndr/indy(pc101)
--------- -------- sgi_vndr/indy(pc102)
--------- -------- sgi_vndr/indy(jp106)
--d------ -------- keytronic(FlexPro)
+-d------ -------- sony(nwp5461)
+-d------ -------- winbook(XP5)
+-d------ -------- ataritt(us)
+-------- -------- ataritt(de)
+-------- -------- thinkpad(common)
+-------- -------- thinkpad(us)
+-------- -------- thinkpad(intl)
+-------- -------- thinkpad(60)
+-d------ -------- nokia(nokiarx51)
 -d------ -------- dell(dell101)
 -------- -------- dell(dell65)
 -------- -------- dell(dell65x)
 -------- -------- dell(dellm65)
 -------- -------- dell(latitude)
--d------ -------- everex(STEPnote)
--d------ -------- nec(pc98)
--------- -------- digital_vndr/lk(lk201)
--------- -------- digital_vndr/lk(lk401)
--------- -------- digital_vndr/lk(lk450)
--------- -------- digital_vndr/lk(lk401bj)
--------- -------- digital_vndr/lk(lk401jj)
 --p----- -------- digital_vndr/pc(common)
 --p----- -------- digital_vndr/pc(leds_on_keys)
 --p----- -------- digital_vndr/pc(leds_alone)
@@ -116,5 +98,26 @@ h-p----- -------- hhk(basic)
 -------- -------- digital_vndr/pc(pcxaj)
 -------- -------- digital_vndr/unix(unix)
 -------- -------- digital_vndr/unix(lk421jj)
--d------ -------- ataritt(us)
--------- -------- ataritt(de)
+-------- -------- digital_vndr/lk(lk201)
+-------- -------- digital_vndr/lk(lk401)
+-------- -------- digital_vndr/lk(lk450)
+-------- -------- digital_vndr/lk(lk401bj)
+-------- -------- digital_vndr/lk(lk401jj)
+-------- -------- typematrix(tm2020)
+-------- -------- typematrix(tm2030_shape)
+-------- -------- typematrix(tm2030_MiscDiod_dvk)
+-------- -------- typematrix(tm2030_MiscDiod_102)
+-------- -------- typematrix(tm2030_MiscDiod_106)
+-------- -------- typematrix(tm2030_MiscDiod_off)
+-------- -------- typematrix(tm2030_MiscDiod_on)
+-------- -------- typematrix(tm2030USB_func)
+-------- -------- typematrix(tm2030USB_alpha)
+-------- -------- typematrix(tm2030USB_ctrl)
+-------- -------- typematrix(tm2030PS2)
+-------- -------- typematrix(tm2030USB)
+-------- -------- typematrix(tm2030USB-102)
+-------- -------- typematrix(tm2030USB-106)
+-d------ -------- chicony(us)
+-d------ -------- nec(pc98)
+-d------ -------- amiga(usa1)
+-------- -------- amiga(de)
diff --git a/xorg-server/xkbdata.src/geometry/hp b/xorg-server/xkbdata.src/geometry/hp
index c93cb0cd1..62e4d8a18 100644
--- a/xorg-server/xkbdata.src/geometry/hp
+++ b/xorg-server/xkbdata.src/geometry/hp
@@ -454,3 +454,249 @@ xkb_geometry "omnibook_intl" {
 	};
     }; // End of "Alpha" section
 };
+
+xkb_geometry "mini110" {
+
+	description= "HP Mini 110";
+	width= 262;
+	height= 106;
+
+	shape.cornerRadius = 0;
+	shape "FN0"  { { [ 14, 10 ] } , { [ 14, 10 ] } };
+	shape "NORM" { { [ 16.7, 16 ] }   , { [ 16.7, 16 ] } };
+	shape "TLDE" { { [ 12, 16 ] } , { [ 12, 16 ] } };
+	shape "ONE"  { { [ 14, 16 ] }   , { [ 14, 16 ] } };
+	shape "BKSP" { { [ 31.3, 16 ] }   , { [ 31.3, 16 ] } };
+	shape "BKSL" { { [ 23.9, 16 ] } , { [ 23.9, 16 ] } };
+	shape "CAPS" { { [ 22, 16 ] }   , { [ 22, 16 ] } };
+	shape "RTRN" { { [ 36.3, 16 ] } , { [ 36.3, 16 ] } };
+	shape "LFSH" { { [ 31, 16 ] }   , { [ 31, 16 ] } };
+	shape "RTSH" { { [ 45, 16 ] } , { [ 45, 16 ] } };
+	shape "CTLS" { { [ 16.5, 19 ] }   , { [ 16.5, 19 ] } };
+	shape "SPCE" { { [ 78.4, 19 ] } , { [ 78.4, 19 ] } };
+	shape "ARRW" { { [ 16.7, 9 ] }  , { [ 16.7, 9 ] } };
+
+	key.gap=1;
+
+	section "Function" {
+		top=4;
+		left=3;
+		key.shape="FN0";
+		row {
+			keys {
+				<ESC>, <FK01>, <FK02>, <FK03>, <FK04>, <FK05>,
+				<FK06>, <FK07>, <FK08>, <FK09>, <FK10>, <FK11>,
+				<FK12>, <PAUS>, <SCLK>, <INS>, <DELE>
+			};
+		};
+	};
+
+	section "Alphanum" {
+		top=15;
+		left=3;
+		key.shape="NORM";
+        row {
+            top= 0;
+            keys { { <TLDE>, "TLDE" } , { <AE01>, "ONE" }, <AE02>, <AE03>, <AE04>,
+                   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+                   <AE10>, <AE11>, <AE12>,
+                   { <BKSP>, "BKSP" }
+            };
+        };
+        row {
+            top= 17;
+            keys { <TAB>, <AD01>, <AD02>, <AD03>, <AD04>, <AD05>,
+                   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>,
+                   <AD11>, <AD12>, { <BKSL>, "BKSL" }
+            };
+        };
+        row {
+            top= 34;
+            keys { { <CAPS>, "CAPS" } ,
+                   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>,
+                   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>,
+                   <AC11>, { <RTRN>, "RTRN" }
+            };
+        };
+        row {
+            top= 51;
+            keys { { <LFSH>, "LFSH" },
+                    <AB01>, <AB02>, <AB03>, <AB04>, <AB05>,
+                    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>,
+                    { <RTSH>, "RTSH" }
+            };
+        };
+
+	};
+
+	section "Control" {
+		top=83;
+		left=3;
+		key.shape="CTLS";
+		row {
+			keys {
+				<LCTL>, <FN>, <LWIN>, <LALT>, { <SPCE>, "SPCE" }, <RALT>, <MENU>, <RCTL>
+			};
+		};
+	};
+
+	section "Arrows" {
+		top=83;
+		left=204.9;
+		key.shape="ARRW";
+		row {
+			left= 17.7;
+			keys {
+				<UP>
+			};
+		};
+		row {
+			top = 10;
+			keys {
+				<LEFT>, <DOWN>, <RGHT>
+			};
+		};
+	};
+
+};
+
+xkb_geometry "dv5" {
+
+	height=118.4;
+	width=310.6;
+
+    description = "HP Pavilion dv5";
+
+	shape.cornerRadius = 1;
+
+	shape "ESC"  { { [20.0, 12.5] }, { [2.2, 1], [17.8, 10.5] } };
+	shape "FN0"  { { [15.9, 12.5] }, { [2.2, 1], [13.7, 10.5] } };
+	shape "DELE" { { [19.4, 12.5] }, { [2.2, 1], [17.2, 10.5] } };
+
+	shape "NORM" { { [17.9, 18.3] }, { [2.2, 1], [15.7, 16.3] } };
+
+	shape "BKSP" { { [36.1, 18.3] }, { [2.4, 1], [33.7, 16.3] } };
+
+	shape "TABK" { { [26.8, 18.3] }, { [2.4, 1], [24.4, 16.3] } };
+	shape "BKSL" { { [27.1, 18.3] }, { [2.4, 1], [24.7, 16.3] } };
+
+	shape "CAPS" { { [31.6, 18.3] }, { [2.4, 1], [29.2, 16.3] } };
+	shape "RTRN" { { [41.2, 18.3] }, { [2.4, 1], [39.3, 16.3] } };
+
+	shape "LFSH" { { [41.5, 18.3] }, { [2.4, 1], [38.8, 16.3] } };
+	shape "RTSH" { { [31.5, 18.3] }, { [2.4, 1], [29.1, 16.3] } };
+
+	shape "LCTL" { { [22.4, 18.3] }, { [2.2, 1], [20.2, 16.3] } };
+	shape "RCTL" { { [22.6, 18.3] }, { [2.2, 1], [20.4, 16.3] } };
+	shape "CTLS" { { [17.9, 18.3] }, { [2.2, 1], [15.7, 16.3] } };
+	shape "SPCE" { { [94.3, 18.3] }, { [2.5, 1], [91.8, 16.3] } };
+
+	shape "ARRW" { { [17.9, 18.3] }, { [2.2, 1], [15.7, 16.3] } };
+
+	shape "EDIT" { { [16.6, 18.3] }, { [2.2, 1], [14.4, 16.3] } };
+
+	key.gap = 1.2;
+
+	section "Function" {
+		top=4.2;
+		left=3;
+		row {
+			key.shape = "FN0";
+			keys {
+				{<ESC>, "ESC"},
+				{2.9, <FK01>}, <FK02>, <FK03>, <FK04>,
+				{2.9, <FK05>}, <FK06>, <FK07>, <FK08>,
+				{2.9, <FK09>}, <FK10>, <FK11>, <FK12>,
+				{2.9, <NMLK>}, <PAUS>, <INS>, {<DELE>, "DELE"}
+			};
+		};
+	};
+
+    section "Alpha" {
+		top = 17.9;
+		key.shape = "NORM";
+	    left = 3;
+
+		row {
+		    top = 0;
+		    keys { <TLDE>, <AE01>, <AE02>, <AE03>, <AE04>,
+			   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+			   <AE10>, <AE11>, <AE12>, { <BKSP>, "BKSP" }
+		    };
+		};
+		row {
+		    top = 19.5;
+		    keys { { <TAB>, "TABK" },
+			   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+			   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+			   <AD11>, <AD12>, { <BKSL>, "BKSL" }
+		    };
+		};
+		row {
+		    top = 39;
+		    keys { { <CAPS>, "CAPS" },
+			   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+			   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, 
+			   <AC11>, { <RTRN>, "RTRN" }
+		    };
+		};
+		row {
+		    top = 58.5;
+		    keys { { <LFSH>, "LFSH" },
+			   <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+			   <AB06>, <AB07>, <AB08>, <AB09>, <AB10>,
+			   { <RTSH>, "RTSH" }
+		    };
+		};
+    }; // End of "Alpha" section
+
+    section "Controls" {
+		top = 95.9;
+		key.shape = "CTLS";
+	    left = 3;
+
+		row {
+		    top = 0;
+		    keys { {<LCTL>, "LCTL"}, <FN>, <LWIN>, <LALT>, {<SPCE>, "SPCE"},
+			   <RALT>, <MENU>, {<RCTL>, "RCTL"}
+		    };
+		};
+    };
+
+	section "Edition" {
+		top = 16.5;
+	    left = 289.9;
+		key.shape = "EDIT";
+		key.gap = 1.4;
+		row {
+		    top = 0;
+			vertical = true;
+		    keys {
+				<HOME>, <PGUP>, <PGDN>, <END>
+		    };
+		};
+	};
+
+	section "Arrows" {
+		top = 76.4;
+		key.shape = "ARRW";
+		left = 249.3;
+		row {
+			top = 0;
+			left = 19.1;
+			keys {
+				<UP>
+			};
+		};
+		row {
+			top = 19.5;
+			left = 0;
+			keys {
+				<LEFT>, <DOWN>, <RGHT>
+			};
+		};
+	};
+};
+
+
+
diff --git a/xorg-server/xkbdata.src/geometry/nokia b/xorg-server/xkbdata.src/geometry/nokia
new file mode 100644
index 000000000..5132840ca
--- /dev/null
+++ b/xorg-server/xkbdata.src/geometry/nokia
@@ -0,0 +1,53 @@
+// Zoomed 3x because of text size
+
+default xkb_geometry "nokiarx51" {
+
+    description= "Nokia RX-51";
+    width= 273; // 13x6mm + 2x1.5mm border + 2x5mm border
+    height= 54; // 3x5mm + 2x1.5mm border
+
+    shape.cornerRadius= 1.5;
+    shape "NORM"  { { [18,15] } };
+    shape "SPCE"  { { [36,15] } };
+    shape "FRAME" { cornerRadius= 2.5, { [243,54] } };
+
+    solid "FRAME" {
+	shape= "FRAME";
+	color= "white";
+	top= 0;
+	left= 15;
+    };
+
+    section.left= 15;
+    row.left= 4.5;
+    key.shape= "NORM";
+    key.gap= 0;
+    section "Keys" {
+	top= 0;
+	row {
+	    top= 4.5;
+	    keys { { <LCTL>, "NORM", color="grey20" },
+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>,
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, <AB08>,
+		   { <BKSP>, "NORM", color="grey20" }
+	    };
+	};
+	row {
+	    top= 19.5;
+	    keys { { <RALT>, "NORM", color="grey20" },
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>,
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AB09>, <UP>,
+		   { <RTRN>, "NORM", color="grey20" }
+	    };
+	};
+	row {
+	    top= 34.5;
+	    keys { { <LFSH>, "NORM", color="grey20" },
+		   <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, <AB06>, <AB07>,
+		   { <SPCE>, "SPCE", color="white" },
+		   <LEFT>, <DOWN>, <RGHT>
+	    };
+	};
+    }; // End of "Keys" section
+
+}; // End of "rx51" geometry
diff --git a/xorg-server/xkbdata.src/geometry/sgi_vndr/Makefile.in b/xorg-server/xkbdata.src/geometry/sgi_vndr/Makefile.in
index d50ee7bcf..113281768 100644
--- a/xorg-server/xkbdata.src/geometry/sgi_vndr/Makefile.in
+++ b/xorg-server/xkbdata.src/geometry/sgi_vndr/Makefile.in
@@ -106,6 +106,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 POFILES = @POFILES@
@@ -179,9 +180,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  geometry/sgi_vndr/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  geometry/sgi_vndr/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  geometry/sgi_vndr/Makefile
+	  $(AUTOMAKE) --foreign  geometry/sgi_vndr/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/xorg-server/xkbdata.src/geometry/sun b/xorg-server/xkbdata.src/geometry/sun
index 633077ac7..585eb2615 100644
--- a/xorg-server/xkbdata.src/geometry/sun
+++ b/xorg-server/xkbdata.src/geometry/sun
@@ -29,29 +29,23 @@
 // Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, provided that the above
-// copyright notice(s) and this permission notice appear in all copies of
-// the Software and that both the above copyright notice(s) and this
-// permission notice appear in supporting documentation.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR 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.
-// 
-// Except as contained in this notice, the name of a copyright holder
-// shall not be used in advertising or otherwise to promote the sale, use
-// or other dealings in this Software without prior written authorization
-// of the copyright holder.
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice (including the next
+// paragraph) shall be included in all copies or substantial portions of the
+// Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
 //
 // ---------------------------------------------------------------------------
 //