merge libx11_1.1.5-2 from debian unstable

[Timo Aaltonen]

There is a memory leak in libx11, and the new version fixes that. Freedesktop bug #17616.

libx11 (2:1.1.5-2) unstable; urgency=medium

   * Cherry-picked from upstream git: Fix an XCB leak when the client has a
     non-fatal error handler.

 -- Julien Cristau <email address hidden> Thu, 25 Sep 2008 17:45:25 +0200

[Steve Langasek (vorlon)]

There has been an Ubuntu upload of libx11 2:1.1.5-1ubuntu1 in the meantime since this sync request was filed. This is fine as far as a freeze exception, but you'll need to do a merge now rather than a sync.

[Timo Aaltonen (tjaalton)]

ok, will do.

[Launchpad Janitor (janitor)]

This bug was fixed in the package libx11 - 2:1.1.5-2ubuntu1

---------------
libx11 (2:1.1.5-2ubuntu1) intrepid; urgency=low

  * Merge from debian unstable (LP: #274708), remaining changes:
    - 020_th_TH_iso8859-11_ct.diff: Fix Thai charset-to-compoundtext
      conversion under th_TH locales. (Freedesktop #16475)
    - 021_Thai_xim_num_caps.diff: Fix Thai XIM key filter when
      CapsLock/NumLock is on. (Freedesktop #12517)
    - 022_Thai_xim_surr_conv.diff: Convert text returned from
      StringConversionCallback properly. (Freedesktop #12759)

 -- Timo Aaltonen <email address hidden> Wed, 08 Oct 2008 12:14:02 +0300