diff -u libx11-1.2.2/debian/changelog libx11-1.2.2/debian/changelog
--- libx11-1.2.2/debian/changelog
+++ libx11-1.2.2/debian/changelog
@@ -1,3 +1,10 @@
+libx11 (2:1.2.2-1ubuntu1) karmic; urgency=low
+
+  * Merge from debian unstable, remaining changes: LP: #401656
+    - Fix 'locale not supported by XLib' errors for la locales.
+
+ -- Bhavani Shankar <right2bhavi@gmail.com>  Mon, 20 Jul 2009 16:19:25 +0530
+
 libx11 (2:1.2.2-1) unstable; urgency=low
 
   [ Julien Cristau ]
@@ -13,6 +20,12 @@
 
  -- Brice Goglin <bgoglin@debian.org>  Sun, 19 Jul 2009 19:21:16 +0200
 
+libx11 (2:1.2.1-1ubuntu1) karmic; urgency=low
+
+  * Fix 'locale not supported by XLib' errors for la locales.
+
+ -- Robert Collins <robert@ubuntu.com>  Sun, 24 May 2009 02:33:17 +1000
+
 libx11 (2:1.2.1-1) unstable; urgency=low
 
   * New upstream release.
@@ -562,0 +576 @@
+
diff -u libx11-1.2.2/debian/control libx11-1.2.2/debian/control
--- libx11-1.2.2/debian/control
+++ libx11-1.2.2/debian/control
@@ -1,7 +1,8 @@
 Source: libx11
 Section: x11
 Priority: optional
-Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
+Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
 Uploaders: David Nusinow <dnusinow@debian.org>, Josh Triplett <josh@freedesktop.org>, Jamey Sharp <sharpone@debian.org>, Julien Cristau <jcristau@debian.org>, Brice Goglin <bgoglin@debian.org>
 Build-Depends:
  debhelper (>= 5.0.0),
diff -u libx11-1.2.2/debian/patches/series libx11-1.2.2/debian/patches/series
--- libx11-1.2.2/debian/patches/series
+++ libx11-1.2.2/debian/patches/series
@@ -7,0 +8 @@
+016_latin_locale_alias.diff
only in patch2:
unchanged:
--- libx11-1.2.2.orig/debian/patches/016_latin_locale_alias.diff
+++ libx11-1.2.2/debian/patches/016_latin_locale_alias.diff
@@ -0,0 +1,36 @@
+Index: libx11-1.2.1/nls/compose.dir.pre
+===================================================================
+--- libx11-1.2.1.orig/nls/compose.dir.pre	2009-05-24 02:38:09.000000000 +1000
++++ libx11-1.2.1/nls/compose.dir.pre	2009-05-24 02:38:35.000000000 +1000
+@@ -421,6 +421,7 @@
+ en_US.UTF-8/Compose:		ko_KR.UTF-8
+ en_US.UTF-8/Compose:		kw_GB.UTF-8
+ en_US.UTF-8/Compose:		ky_KG.UTF-8
++en_US.UTF-8/Compose:		la_AU.UTF-8
+ en_US.UTF-8/Compose:		lo_LA.UTF-8
+ en_US.UTF-8/Compose:		lt_LT.UTF-8
+ en_US.UTF-8/Compose:		lv_LV.UTF-8
+Index: libx11-1.2.1/nls/locale.alias.pre
+===================================================================
+--- libx11-1.2.1.orig/nls/locale.alias.pre	2009-05-24 02:38:10.000000000 +1000
++++ libx11-1.2.1/nls/locale.alias.pre	2009-05-24 02:40:35.000000000 +1000
+@@ -769,6 +769,7 @@
+ ky_KG:							ky_KG.UTF-8
+ ky_KG.utf8:						ky_KG.UTF-8
+ ky_KG.UTF-8:					ky_KG.UTF-8
++la_AU.utf8:					la_AU.UTF-8
+ lo:						lo_LA.MULELAO-1
+ lo_LA:						lo_LA.MULELAO-1
+ lo_LA.cp1133:					lo_LA.IBM-CP1133
+Index: libx11-1.2.1/nls/locale.dir.pre
+===================================================================
+--- libx11-1.2.1.orig/nls/locale.dir.pre	2009-05-24 02:38:10.000000000 +1000
++++ libx11-1.2.1/nls/locale.dir.pre	2009-05-24 02:40:49.000000000 +1000
+@@ -411,6 +411,7 @@
+ ko_KR.UTF-8/XLC_LOCALE:			ko_KR.UTF-8
+ en_US.UTF-8/XLC_LOCALE:			kw_GB.UTF-8
+ en_US.UTF-8/XLC_LOCALE:			ky_KG.UTF-8
++en_US.UTF-8/XLC_LOCALE:			la_AU.UTF-8
+ en_US.UTF-8/XLC_LOCALE:			lo_LA.UTF-8
+ en_US.UTF-8/XLC_LOCALE:			lt_LT.UTF-8
+ en_US.UTF-8/XLC_LOCALE:			lv_LV.UTF-8