Merge lp:~cjwatson/launchpad/multiarch-translations into lp:launchpad
Status: | Merged |
---|---|
Approved by: | Jeroen T. Vermeulen |
Approved revision: | no longer in the source branch. |
Merged at revision: | 13909 |
Proposed branch: | lp:~cjwatson/launchpad/multiarch-translations |
Merge into: | lp:launchpad |
Diff against target: |
282 lines (+55/-2) 10 files modified
lib/lp/archivepublisher/model/ftparchive.py (+9/-1) lib/lp/archivepublisher/tests/apt-data/apt.conf (+14/-0) lib/lp/archivepublisher/tests/apt-data/apt_conf_single_empty_suite_test (+1/-0) lib/lp/archivepublisher/tests/test_ftparchive.py (+7/-0) lib/lp/registry/configure.zcml (+2/-1) lib/lp/registry/interfaces/distroseries.py (+15/-0) lib/lp/registry/model/distroseries.py (+1/-0) lib/lp/registry/stories/webservice/xx-distroseries.txt (+1/-0) lib/lp/soyuz/scripts/initialize_distroseries.py (+3/-0) lib/lp/soyuz/scripts/tests/test_initialize_distroseries.py (+2/-0) |
To merge this branch: | bzr merge lp:~cjwatson/launchpad/multiarch-translations |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Henning Eggers | Pending | ||
Stuart Bishop | db | Pending | |
Robert Collins | db | Pending | |
Review via email: mp+74743@code.launchpad.net |
This proposal supersedes a proposal from 2011-07-11.
Commit message
[r=jtv][bug=845475] Set LongDescription "true" in apt.conf for series that want it.
Description of the change
(Resubmitted against devel now that multiarch-
Summary: https:/
Proposed fix: Move the long descriptions from the Packages files (which are in practice common across architectures) out to the Translation-en file. apt-ftparchive already knows how to do this with a configuration option, and apt-get already knows to fetch the Translation-* files, so all we need is a small change to Launchpad to start doing this for Ubuntu Oneiric and beyond.
Pre-implementation notes: I discussed this with William Grant, and agreed that we could follow much the same path as he took recently with the NotAutomatic flag for backports: add a new column to DistroSeries and make the new behaviour depend on that, so that we don't change older series. He also suggested that I export DistroSeries.
Tests: 'testr run -- -t archivepublisher; testr run -- -t soyuz' should cover it. I adjusted lib/lp/
QA: On a dogfood Soyuz instance, use the API to set include_
lint: Nothing introduced by my branch as far as I can see.
DB patch looks fine. Please add a short description of the new column to database/ schema/ comments. sql ('Split long descriptions out of Packages into Translations-en' is fine per the Interface).