Merge lp://qastaging/~ubuntu-branches/ubuntu/natty/fontconfig/natty-201011231512 into lp://qastaging/ubuntu/natty/fontconfig
| Status: | Work in progress |
|---|---|
| Proposed branch: | lp://qastaging/~ubuntu-branches/ubuntu/natty/fontconfig/natty-201011231512 |
| Merge into: | lp://qastaging/ubuntu/natty/fontconfig |
| Diff against target: |
287 lines (+275/-0) (has conflicts) 2 files modified
debian/po/sv.po (+145/-0) debian/po/vi.po (+130/-0) Path conflict: <deleted> / .gitignore Contents conflict in debian/po/sv.po Contents conflict in debian/po/vi.po |
| To merge this branch: | bzr merge lp://qastaging/~ubuntu-branches/ubuntu/natty/fontconfig/natty-201011231512 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu branches | Pending | ||
|
Review via email:
|
|||
Description of the change
The package history in the archive and the history in the bzr branch differ. As the archive is authoritative the history of lp:ubuntu/natty/fontconfig now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/natty/fontconfig/natty-201011231512. A merge should be performed if necessary.
Unmerged revisions
- 43. By Martin Pitt
-
releasing version 2.8.0-2.1ubuntu1
- 42. By Martin Pitt
-
* Merge from Debian unstable, remaining changes: (LP: #680236)
- fix buildd bustage by ignoring errors in postinst and prerm (taken
from debian NMU by Riku Voipio <email address hidden>)
- add debian/fontconfig. prerm
- update debian/fontconfig. postinst
- debian/fontconfig- config. postinst: drop debconf transition;
we remove conf.d links for hinting, subpixel and bitmap configs
and stop looking at debconf, excluding 70-no-bitmaps.conf.
- debian/fontconfig- config. postinst: also exclude 70-no-bitmaps.conf
from "drop debconf transition" to ensure that it doesn't get removed
automatically
- keep adding it in CONF_FILES through 07_no_bitmaps.patch as well.
- debian/patches/ 00_old_ diff_gz. patch:
- add MgOpen Moderna family to 40-nonlatin.conf
- reorder Bitstream Vera and DejaVu families in 60-latin.conf
- debian/patches/ 00_old_ diff_gz. patch,
debian/patches/ 04_ubuntu_ monospace_ lcd_filter_ conf.patch,
debian/patches/ 05_ubuntu_ add_hinting_ and_antialiasin g_confs. patch:
- add extra config files:
- antialias and hinting.
- 52-languageselector.conf
- 53-monospace-lcd-filter. conf
- debian/patches/ 05_lcdfilterleg acy.patch: Recognize const value
"lcdfilterlegacy", introduced before upstream did introduce "lcdlegacy"
- debian/patches/ 06_ubuntu_ lcddefault. patch: set lcddefault as default
- drop debian/fontconfig- config. templates, debian/ fontconfig- config. config,
and associtated po files.
- purge debconf database when upgrading from previous versions.
* Non-maintainer upload.
* Fix pending l10n issues. Debconf translations:
- Swedish (Martin Bagge). Closes: #533566
- Vietnamese (Clytie Siddall). Closes: #568985
