diff -u xkeyboard-config-1.3/debian/patches/series xkeyboard-config-1.3/debian/patches/series
--- xkeyboard-config-1.3/debian/patches/series
+++ xkeyboard-config-1.3/debian/patches/series
@@ -17,0 +18 @@
+us-mac.diff
diff -u xkeyboard-config-1.3/debian/changelog xkeyboard-config-1.3/debian/changelog
--- xkeyboard-config-1.3/debian/changelog
+++ xkeyboard-config-1.3/debian/changelog
@@ -1,3 +1,11 @@
+xkeyboard-config (1.3-1ubuntu2) intrepid; urgency=low
+
+  [ Daniel Gimpelevich ]
+  * debian/patches/us-mac.diff:
+     + Fix for the USA - Macintosh layout. (Closes: #246834)
+
+ -- Артём Попов <artfwo@gmail.com>  Wed, 09 Jul 2008 14:25:18 +0700
+
 xkeyboard-config (1.3-1ubuntu1) intrepid; urgency=low
 
   [ Артём Попов ]
only in patch2:
unchanged:
--- xkeyboard-config-1.3.orig/debian/patches/us-mac.diff
+++ xkeyboard-config-1.3/debian/patches/us-mac.diff
@@ -0,0 +1,72 @@
+Index: xkeyboard-config-1.3/symbols/us
+===================================================================
+--- xkeyboard-config-1.3.orig/symbols/us	2008-07-09 14:14:24.000000000 +0700
++++ xkeyboard-config-1.3/symbols/us	2008-07-09 14:14:35.000000000 +0700
+@@ -601,8 +601,66 @@
+ partial alphanumeric_keys
+ xkb_symbols "mac" {
+ 
+-    include "us"
++    include "us(basic)"
+     name[Group1]= "USA - Macintosh";
++    key.type[group1]="FOUR_LEVEL";
++
++    // Slightly improvised from http://homepage.mac.com/thgewecke/kblayout.jpg
++    key <LSGT> { [   section,  plusminus,       section,        plusminus ] };
++    key <TLDE> { [     grave, asciitilde,    dead_grave,        dead_horn ] };
++    key <AE01> { [	   1,     exclam,    exclamdown,            U2044 ] };
++    key <AE02> { [	   2,         at,     trademark,         EuroSign ] };
++    key <AE03> { [	   3, numbersign,      sterling,            U2039 ] };
++    key <AE04> { [	   4,     dollar,          cent,            U203A ] };
++    key <AE05> { [	   5,    percent,      infinity,            UFB01 ] };
++    key <AE06> { [         6,asciicircum,       section,            UFB02 ] };
++    key <AE07> { [	   7,  ampersand,     paragraph,     doubledagger ] };
++    key <AE08> { [	   8,   asterisk, enfilledcircbullet,      degree ] };
++    key <AE09> { [	   9,  parenleft,   ordfeminine,   periodcentered ] };
++    key <AE10> { [	   0, parenright,     masculine,singlelowquotemark] };
++    key <AE11> { [     minus, underscore,        endash,           emdash ] };
++    key <AE12> { [     equal,       plus,      notequal,        plusminus ] };
++
++    key <AD01> { [	   q,          Q,            oe,               OE ] };
++    key <AD02> { [	   w,          W,         U2211,doublelowquotemark] };
++    key <AD03> { [	   e,          E,    dead_acute,            acute ] };
++    key <AD04> { [	   r,          R,    registered,            U2030 ] };
++    key <AD05> { [	   t,          T,        dagger,       dead_caron ] };
++    key <AD06> { [	   y,          Y,           yen,       onequarter ] };
++    key <AD07> { [	   u,        U,  dead_diaeresis,        diaeresis ] };
++    key <AD08> { [	   i,        I, dead_circumflex,            U02C6 ] };
++    key <AD09> { [	   o,          O,        oslash,         Ooblique ] };
++    key <AD10> { [	   p,          P,      Greek_pi,            U220F ] };
++    key <AD11> { [ bracketleft,  braceleft, leftdoublequotemark, rightdoublequotemark ] };
++    key <AD12> { [bracketright, braceright, leftsinglequotemark, rightsinglequotemark ] };
++    key <BKSL> { [ backslash,        bar, guillemotleft,   guillemotright ] };
++
++    key <AC01> { [	   a,          A,         aring,            Aring ] };
++    key <AC02> { [	   s,          S,        ssharp,      dead_stroke ] };
++    key <AC03> { [	   d,          D, partialderivative,          eth ] };
++    key <AC04> { [	   f,          F,      function,        dead_hook ] };
++    key <AC05> { [	   g,          G,     copyright, dead_doubleacute ] };
++    key <AC06> { [	   h,          H, dead_abovedot,    dead_belowdot ] };
++    key <AC07> { [	   j,          J,         U2206,          onehalf ] };
++    key <AC08> { [	   k,          K,dead_abovering,            UF8FF ] };
++
++    key <AC09> { [	   l,          L,       notsign,            THORN ] };
++    key <AC10> { [ semicolon,      colon,         U2026,            thorn ] };
++    key <AC11> { [apostrophe,   quotedbl,            ae,               AE ] };
++
++    key <AB01> { [	   z,          Z,   Greek_OMEGA,     dead_cedilla ] };
++    key <AB02> { [	   x,          X,         U2248,      dead_ogonek ] };
++				// unclear whether "approxeq" is 2248 or 2245
++    key <AB03> { [	   c,          C,      ccedilla,         Ccedilla ] };
++    key <AB04> { [	   v,          V,    squareroot,            U25CA ] };
++    key <AB05> { [	   b,          B,      integral,         idotless ] };
++    key <AB06> { [	   n,          N,    dead_tilde,            U02DC ] };
++    key <AB07> { [	   m,          M,            mu,    threequarters ] };
++    key <AB08> { [     comma,       less, lessthanequal,      dead_macron ] };
++    key <AB09> { [    period,    greater, greaterthanequal,    dead_breve ] };
++    key <AB10> { [     slash,   question,      division,     questiondown ] };
++
++    include "level3(ralt_switch)"
+ };
+  
+ // Colemak symbols for xkb on X.Org Server 7.x