Merge lp://qastaging/~laney/ubuntu/quantal/language-selector/remove-fontconfig-voodoo into lp://qastaging/ubuntu/quantal/language-selector
Proposed by
Iain Lane
| Status: | Merged |
|---|---|
| Merged at revision: | 220 |
| Proposed branch: | lp://qastaging/~laney/ubuntu/quantal/language-selector/remove-fontconfig-voodoo |
| Merge into: | lp://qastaging/ubuntu/quantal/language-selector |
| Diff against target: |
748 lines (+109/-299) 20 files modified
LanguageSelector/FontConfig.py (+0/-151) LanguageSelector/LocaleInfo.py (+1/-5) dbus_backend/ls-dbus-backend (+0/-10) debian/changelog (+13/-0) debian/control (+1/-1) debian/language-selector-common.install (+0/-1) debian/language-selector-common.links (+6/-0) debian/language-selector-common.postinst (+2/-2) debian/language-selector-common.postrm (+2/-0) debian/language-selector-common.preinst (+11/-0) fontconfig-voodoo (+0/-103) fontconfig/69-language-selector-ja-jp.conf (+18/-0) fontconfig/69-language-selector-ka-ge.conf (+0/-22) fontconfig/69-language-selector-zh-cn.conf (+9/-0) fontconfig/69-language-selector-zh-hk.conf (+9/-0) fontconfig/69-language-selector-zh-mo.conf (+9/-0) fontconfig/69-language-selector-zh-sg.conf (+9/-0) fontconfig/69-language-selector-zh-tw.conf (+18/-0) po/POTFILES.in (+0/-2) setup.py (+1/-2) |
| To merge this branch: | bzr merge lp://qastaging/~laney/ubuntu/quantal/language-selector/remove-fontconfig-voodoo |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Martin Pitt | Approve | ||
| Ubuntu branches | Pending | ||
|
Review via email:
|
|||
Description of the change
Remove fontconfig-voodoo. Now unconditionally install the hacks but guard them by <test name="lang"
https:/
I'm not aware of anything external which calls fontconfig-voodoo, so it's being removed completely.
There's a preinst change to remove any installed voodoo snippets, since these should be gone before dpkg tries to symlink all of the new ones.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Many thanks for getting rid of this 'orrible 'ack! This looks good to me, please merge!