← Back to branch summary

~ubuntu-branches/ubuntu/trusty/eglibc/trusty

« back to all changes in this revision

Viewing changes to .pc/localedata/first_weekday.diff/localedata/locales/zh_CN

  • Committer: Package Import Robot
  • Author(s): Adam Conrad
  • Date: 2013-01-10 18:39:35 UTC
  • mfrom: (1.5.2) (4.4.24 experimental)
  • Revision ID: package-import@ubuntu.com-20130110183935-afsgfxkmg7wk5eaj
Tags: 2.17-0ubuntu1
https://launchpad.net/bugs/1085342
https://launchpad.net/bugs/613662
* Merge with Debian, bringing in a new upstream and many small fixes:
  - patches/any/cvs-malloc-deadlock.diff: Dropped, merged upstream.
  - patches/ubuntu/lddebug-scopes.diff: Rebase for upstream changes.
  - patches/ubuntu/local-CVE-2012-3406.diff: Rebased against upstream.
  - patches/ubuntu/no-asm-mtune-i686.diff: Fixed in recent binutils.
* This upstream merge fixes a nasty hang in pulseaudio (LP: #1085342)
* Bump MIN_KERNEL_SUPPORTED to 2.6.32 on ARM, now that we no longer
  have to support shonky 2.6.31 kernels on imx51 babbage builders.
* Drop patches/ubuntu/local-disable-nscd-host-caching.diff, as these
  issues were apparently resolved upstream a while ago (LP: #613662)
* Fix the compiled-in bug URL to point to launchpad.net, not Debian.

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/localedata/first_weekday.diff/localedata/locales/zh_CN
108
108
        "<U661F><U671F><U4E94>";/
109
109
        "<U661F><U671F><U516D>"
110
110
 
111
 
abmon   "<U0020><U0031><U6708>";"<U0020><U0032><U6708>";/
112
 
        "<U0020><U0033><U6708>";"<U0020><U0034><U6708>";/
113
 
        "<U0020><U0035><U6708>";"<U0020><U0036><U6708>";/
114
 
        "<U0020><U0037><U6708>";"<U0020><U0038><U6708>";/
115
 
        "<U0020><U0039><U6708>";"<U0031><U0030><U6708>";/
 
111
abmon   "<U0031><U6708>";"<U0032><U6708>";/
 
112
        "<U0033><U6708>";"<U0034><U6708>";/
 
113
        "<U0035><U6708>";"<U0036><U6708>";/
 
114
        "<U0037><U6708>";"<U0038><U6708>";/
 
115
        "<U0039><U6708>";"<U0031><U0030><U6708>";/
116
116
        "<U0031><U0031><U6708>";"<U0031><U0032><U6708>"
117
117
 
118
118
mon     "<U4E00><U6708>";"<U4E8C><U6708>";"<U4E09><U6708>";/