Merge lp:~bac/launchpad/bug-487793 into lp:launchpad

[Brad Crittenden]

Add a portlet on the distroseries index page showing the packages most recently linked to an upstream and those that need linking.

[Brad Crittenden (bac)]

= Summary =

A new portlet to show information about a distroseries' upstream packaging
associations is shown on the distroseries-index page.

== Proposed fix ==

Create a new portlet showing the most recently linked packages and those that most
need attention, either linking or providing additional information like bug tracker
location, etc.

== Pre-implementation notes ==

Talks with Curtis.

== Implementation details ==

As above.

== Tests ==

bin/test -vvm lp.registry -t distroseries.txt -t xx-distroseries-index.txt

== Demo and Q/A ==

https://launchpad.dev/ubuntu/warty
https://launchpad.dev/ubuntu/warty
https://launchpad.net/ubuntu/lucid

= Launchpad lint =

Checking for conflicts. and issues in doctests and templates.
Running jslint, xmllint, pyflakes, and pylint.
Using normal rules.

Linting changed files:
  lib/lp/registry/browser/configure.zcml
  lib/lp/registry/templates/distroseries-portlet-packaging.pt
  lib/lp/registry/templates/distroseries-index.pt
  lib/lp/blueprints/browser/specificationtarget.py
  lib/lp/registry/doc/distroseries.txt
  lib/lp/registry/interfaces/distroseries.py
  BRANCH.TODO
  lib/lp/registry/stories/distroseries/xx-distroseries-index.txt
  lib/lp/registry/model/distroseries.py
  lib/lp/registry/browser/distroseries.py
  lib/lp/soyuz/templates/distroseries-portlet-latestuploads.pt

== Pylint notices ==

lib/lp/registry/interfaces/distroseries.py
    23: [F0401] Unable to import 'lazr.enum' (No module named enum)
    50: [F0401] Unable to import 'lazr.restful.fields' (No module named restful)
    51: [F0401] Unable to import 'lazr.restful.declarations' (No module named restful)
    116: [E1002, DistroSeriesVersionField._validate] Use super on an old style class
    452: [C0322, IDistroSeriesPublic.getPackageUploads] Operator not preceded by a space
    description=_("Return items that are more recent than this "
    ^
    "timestamp."),
    required=False),
    status=Choice(

    vocabulary=DBEnumeratedType,
    title=_("Package Upload Status"),
    description=_("Return only items that have this status."),
    required=False),
    archive=Reference(

    schema=Interface,
    title=_("Archive"),
    description=_("Return only items for this archive."),
    required=False),
    pocket=Choice(

    vocabulary=DBEnumeratedType,
    title=_("Pocket"),
    description=_("Return only items targeted to this pocket"),
    required=False),
    custom_type=Choice(

    vocabulary=DBEnumeratedType,
    title=_("Custom Type"),
    description=_("Return only items with custom files of this "
    "type."),
    required=False),
    )

    @operation_returns_collection_of(Interface)
    @export_read_operation()
    def getPackageUploads(created_since_date, status, archive, pocket,
    custom_type):

lib/lp/registry/model/distroseries.py
    478: [W0105, DistroSeries.getMostRecentlyLinkedPackagings] String statement has
no effect

The last lint issue will be fixed before landing.

Also a number of drive-by typos will be fixed before landing. The diff is at:
http://pastebin.ubuntu.com/379696/

Priorized -> Prioritized (in two method names)
prioritised -> prioritzed (use en_US)
pakage -> package

[Abel Deuring (adeuring)]

Hi Brad,

a nice branch! Thanks for all the drve-by cleanups!

I have just one minor suggestion, see below.

Abel

> === modified file 'lib/lp/registry/model/distroseries.py'
> --- lib/lp/registry/model/distroseries.py 2010-01-21 18:09:05 +0000
> +++ lib/lp/registry/model/distroseries.py 2010-02-19 12:22:16 +0000
> @@ -315,9 +315,9 @@
> result += self.distribution.name + self.name
> return result
>
> - @property
> - def packagings(self):
> - """See `IDistroSeries`."""
> + @cachedproperty
> + def _all_packagings(self):
> + """Get an unordered list of all packagings."""
> # We join to SourcePackageName, ProductSeries, and Product to cache
> # the objects that are implicitly needed to work with a
> # Packaging object.
> @@ -338,6 +338,12 @@
> ProductSeries.product == Product.id)]
> condition = [Packaging.distroseries == self.id]
> results = IStore(self).using(*origin).find(find_spec, *condition)
> + return results

Since the list 'condition' will never change in this method, I think this can be simplified to

          condition = Packaging.distroseries == self.id
          results = IStore(self).using(*origin).find(find_spec, condition)

review: Approve

[Brad Crittenden (bac)]

Abel thanks for your suggestion. Unfortunately the condition has to be a sequence. Since it is immutable I could make it a tuple instead of a list but that would look like:

condition = (Packaging.distroseries == self.id, )

which I personally to be more distracting than just using a list. So unless you have strong objections I'd prefer to leave the code as is.

[Abel Deuring (adeuring)]

On 19.02.2010 16:35, Brad Crittenden wrote:
> Abel thanks for your suggestion. Unfortunately the condition has to be a sequence. Since it is immutable I could make it a tuple instead of a list but that would look like:
>
> condition = (Packaging.distroseries == self.id, )
>
> which I personally to be more distracting than just using a list. So unless you have strong objections I'd prefer to leave the code as is.

Sure, having a tuple there would be more distracting. But, well, perhaps
I am a bit thick today, and out of curiosity -- what is wrong with

        condition = Packaging.distroseries == self.id
        results = IStore(self).using(*origin).find(find_spec, condition)
        return results

I just tried the tests with this variant -- it passed just fine.

Abel

[Brad Crittenden (bac)]

Abel thanks for the follow up. It was me being dense, not you!

When I'd attempted to make the change earlier I failed to remove the * from *condition when passing the parameter.

I've made the improvement now as you suggest.

[Curtis Hovey (sinzui)]

Hi Brad.

Thanks for working on this. Thanks for finalising my mistmatched suggestions.

There is a link problem. I see (i) Show uploads in the new portlet. It should have remained with the Latest uploads portlet that was moved below the milestones. We expect the user to see the latest uploads, then use the (i) Show uploads link to see the uploads that are not listed.

The new portlet is showing linked and unlinked packagings, and each has its own report. We want the new portlet to link to these reports: (i) Needs upstream links (i) All upstream links. Note that each report links to its counterpart so that the user does not need to return to the portlet.

This is fine to land after to reconcile the links.

Oh wow, I just used Edwin's link source package to upstream project multi-step form. That was nice. That is much faster than the series picker. I see that users are shown when they set the package...sample data sucks.

review: Approve (ui)

=== modified file 'lib/canonical/launchpad/tour/bugs'
--- lib/canonical/launchpad/tour/bugs	2010-01-31 15:25:37 +0000
+++ lib/canonical/launchpad/tour/bugs	2010-02-22 13:15:31 +0000
@@ -96,7 +96,7 @@
                         <p>
                         Manage bug reports entirely through your mail client, using the Launchpad Bugs email interface.
 <br /><br />
-						Report, subscribe, comment on, assign, prioritise and make just about any other update to bugs tracked in Launchpad using email. Launchpad will also mail you with updates on any bug you're interested in, whether an individual bug or all the bugs associated with a particular project or package. Read more about <a href="https://help.launchpad.net/Bugs/EmailInterface">the bug tracker's e-mail interface &gt;</a><br /><br />
+						Report, subscribe, comment on, assign, prioritize and make just about any other update to bugs tracked in Launchpad using email. Launchpad will also mail you with updates on any bug you're interested in, whether an individual bug or all the bugs associated with a particular project or package. Read more about <a href="https://help.launchpad.net/Bugs/EmailInterface">the bug tracker's e-mail interface &gt;</a><br /><br />
 						And, if you prefer, you can also subscribe to bug information in your feed reader with our Atom feeds. <img src="https://edge.launchpad.net/@@/rss" alt="Feed logo" />
                         </p>
                     </div>

=== modified file 'lib/lp/answers/interfaces/questionenums.py'
--- lib/lp/answers/interfaces/questionenums.py	2009-06-24 23:10:46 +0000
+++ lib/lp/answers/interfaces/questionenums.py	2010-02-22 13:15:31 +0000
@@ -127,7 +127,7 @@
 class QuestionPriority(DBEnumeratedType):
     """The Priority with a Question must be handled.
 
-    This enum is used to prioritise work done in the Launchpad Answert Tracker
+    This enum is used to prioritize work done in the Launchpad Answert Tracker
     management system.
     """
 
@@ -150,7 +150,7 @@
         High
 
         This question has been flagged as being of higher than normal
-        priority. It should always be prioritised over a "normal" question.
+        priority. It should always be prioritized over a "normal" question.
         """)
 
     EMERGENCY = DBItem(90, """

=== modified file 'lib/lp/blueprints/browser/specificationtarget.py'
--- lib/lp/blueprints/browser/specificationtarget.py	2010-02-17 12:13:47 +0000
+++ lib/lp/blueprints/browser/specificationtarget.py	2010-02-22 13:15:31 +0000
@@ -349,7 +349,7 @@
         """
         categories = {}
         for spec in self.specs:
-            if categories.has_key(spec.definition_status):
+            if spec.definition_status in categories:
                 category = categories[spec.definition_status]
             else:
                 category = {}
@@ -361,8 +361,10 @@
         return sorted(categories, key=itemgetter('definition_status'))
 
     def getLatestSpecifications(self, quantity=5):
-        """Return <quantity> latest specs created for this target. This
-        is used by the +portlet-latestspecs view.
+        """Return <quantity> latest specs created for this target.
+
+        Only ACCEPTED specifications are returned.  This list is used by the
+        +portlet-latestspecs view.
         """
         return self.context.specifications(sort=SpecificationSort.DATE,
             quantity=quantity, prejoin_people=False)
@@ -425,4 +427,3 @@
 class BlueprintsVHostBreadcrumb(Breadcrumb):
     rootsite = 'blueprints'
     text = 'Blueprints'
-

=== modified file 'lib/lp/blueprints/interfaces/specification.py'
--- lib/lp/blueprints/interfaces/specification.py	2010-02-17 11:19:42 +0000
+++ lib/lp/blueprints/interfaces/specification.py	2010-02-22 13:15:31 +0000
@@ -199,7 +199,7 @@
 class SpecificationPriority(DBEnumeratedType):
     """The Priority with a Specification must be implemented.
 
-    This enum is used to prioritise work.
+    This enum is used to prioritize work.
     """
 
     NOTFORUS = DBItem(0, """
@@ -218,7 +218,7 @@
         Undefined
 
         This feature has recently been proposed and has not yet been
-        evaluated and prioritised by the project leaders.
+        evaluated and prioritized by the project leaders.
         """)
 
     LOW = DBItem(10, """

=== modified file 'lib/lp/blueprints/stories/sprints/01-sprint-overview.txt'
--- lib/lp/blueprints/stories/sprints/01-sprint-overview.txt	2009-08-21 21:43:42 +0000
+++ lib/lp/blueprints/stories/sprints/01-sprint-overview.txt	2010-02-22 13:15:31 +0000
@@ -3,7 +3,7 @@
 
 Launchpad lets us register a meeting, and then keep track of which specs are
 due to be discussed at that meeting. As a result we can schedule and
-prioritise BOF's at the meeting, using an as-yet-undeveloped
+prioritize BOF's at the meeting, using an as-yet-undeveloped
 schedul-o-matic.
 
 Let's start by viewing the list of sprints registered.

=== modified file 'lib/lp/bugs/doc/externalbugtracker.txt'
--- lib/lp/bugs/doc/externalbugtracker.txt	2010-01-20 15:58:04 +0000
+++ lib/lp/bugs/doc/externalbugtracker.txt	2010-02-22 13:15:31 +0000
@@ -955,7 +955,7 @@
 
 == Prioritisation of watches ==
 
-_getRemoteIdsToCheck() prioritises the IDs it returns. Bug watches which have
+_getRemoteIdsToCheck() prioritizes the IDs it returns. Bug watches which have
 comments to push or which have never been checked will always be returned in
 the remote_ids_to_check list, limited only by the batch_size of the bug
 tracker (see "Batched BugWatch Updating" in doc/checkwatches.txt).

=== modified file 'lib/lp/bugs/scripts/checkwatches.py'
--- lib/lp/bugs/scripts/checkwatches.py	2010-02-12 15:48:39 +0000
+++ lib/lp/bugs/scripts/checkwatches.py	2010-02-22 13:15:31 +0000
@@ -637,7 +637,7 @@
 
         if batch_size is not None:
             # We'll recreate our remote_ids_to_check list so that it's
-            # prioritised. We always include remote ids with comments.
+            # prioritized. We always include remote ids with comments.
             actual_remote_ids_to_check = sorted(
                 remote_ids_with_comments[:batch_size])
 

=== modified file 'lib/lp/registry/browser/configure.zcml'
--- lib/lp/registry/browser/configure.zcml	2010-02-17 11:19:42 +0000
+++ lib/lp/registry/browser/configure.zcml	2010-02-22 13:15:31 +0000
@@ -91,6 +91,10 @@
             name="+portlet-details"
             facet="overview"
             template="../templates/distroseries-details.pt"/>
+        <browser:page
+            name="+portlet-package-summary"
+            facet="overview"
+            template="../templates/distroseries-portlet-packaging.pt"/>
     </browser:pages>
     <browser:page
         for="lp.registry.interfaces.distroseries.IDistroSeries"

=== modified file 'lib/lp/registry/browser/distroseries.py'
--- lib/lp/registry/browser/distroseries.py	2010-02-18 20:44:30 +0000
+++ lib/lp/registry/browser/distroseries.py	2010-02-22 13:15:31 +0000
@@ -179,12 +179,12 @@
 
     def packaging(self):
         text = 'All upstream links'
-        summary = 'A listing of source pakages and their upstream projects'
+        summary = 'A listing of source packages and their upstream projects'
         return Link('+packaging', text, summary=summary, icon='info')
 
     def needs_packaging(self):
         text = 'Needs upstream links'
-        summary = 'A listing of source pakages without upstream projects'
+        summary = 'A listing of source packages without upstream projects'
         return Link('+needs-packaging', text, summary=summary, icon='info')
 
     # A search link isn't needed because the distro series overview
@@ -332,6 +332,31 @@
         See `BuildRecordsView` for further details."""
         return True
 
+    @cachedproperty
+    def num_linked_packages(self):
+        """The number of linked packagings for this distroseries."""
+        return len(self.context.packagings)
+
+    @cachedproperty
+    def _unlinked_packages(self):
+        """Get a prioritized list of unlinked source packages."""
+        return self.context.getPrioritizedUnlinkedSourcePackages()
+
+    @property
+    def num_unlinked_packages(self):
+        """The number of unlinked packagings for this distroseries."""
+        return len(self._unlinked_packages)
+
+    @cachedproperty
+    def recently_linked(self):
+        """Return the packages that were most recently linked upstream."""
+        return self.context.getMostRecentlyLinkedPackagings()
+
+    @property
+    def needs_linking(self):
+        """Return a list of 10 packages most in need of upstream linking."""
+        return self._unlinked_packages[:10]
+
     milestone_can_release = False
 
 
@@ -474,7 +499,7 @@
     @cachedproperty
     def cached_packagings(self):
         """The batched upstream packaging links."""
-        packagings = self.context.getPriorizedlPackagings()
+        packagings = self.context.getPrioritizedlPackagings()
         navigator = BatchNavigator(packagings, self.request, size=20)
         navigator.setHeadings('packaging', 'packagings')
         return navigator
@@ -489,7 +514,7 @@
     @cachedproperty
     def cached_unlinked_packages(self):
         """The batched `ISourcePackage`s that needs packaging links."""
-        packages = self.context.getPriorizedUnlinkedSourcePackages()
+        packages = self.context.getPrioritizedUnlinkedSourcePackages()
         navigator = BatchNavigator(packages, self.request, size=20)
         navigator.setHeadings('package', 'packages')
         return navigator

=== modified file 'lib/lp/registry/doc/distroseries.txt'
--- lib/lp/registry/doc/distroseries.txt	2010-01-21 14:53:29 +0000
+++ lib/lp/registry/doc/distroseries.txt	2010-02-22 13:15:31 +0000
@@ -503,13 +503,13 @@
 Packages that need linking and packagings that need upstream information
 -----------------------------------------------------------------------
 
-The distroseries getPriorizedUnlinkedSourcePackages() method that returns
+The distroseries getPrioritizedUnlinkedSourcePackages() method returns
 a prioritized list of `ISourcePackage` objects that need a packaging link to
 an `IProductSeries` to provide the the upstream information to share bugs,
 translations, and code. Each item in the list is a dict with the 'package',
 total_bugs, and total_messages (translatable messages).
 
-    >>> for summary in hoary.getPriorizedUnlinkedSourcePackages():
+    >>> for summary in hoary.getPrioritizedUnlinkedSourcePackages():
     ...     print  summary['package'].name
     ...     print '%(total_bugs)s %(total_messages)s' % summary
     pmount  0  64
@@ -519,16 +519,47 @@
     linux-source-2.6.15  1  0
 
 
-The distroseries getPriorizedlPackagings() method that returns a prioritized
+The distroseries getPrioritizedlPackagings() method that returns a prioritized
 list of `IPackaging` that need more information about the upstream project to
 share bugs, translations, and code.
 
-    >>> for packaging in hoary.getPriorizedlPackagings():
+    >>> for packaging in hoary.getPrioritizedlPackagings():
     ...     print packaging.sourcepackagename.name
     netapplet
     evolution
 
 
+Most recently linked packagings
+-------------------------------
+
+The distroseries getMostRecentlyLinkedPackagings() method returns a
+list of up to five packages that are the most recently linked to an
+upstream.
+
+    >>> distribution = factory.makeDistribution()
+    >>> distroseries = factory.makeDistroRelease(distribution=distribution)
+    >>> pkgs = distroseries.getMostRecentlyLinkedPackagings()
+    >>> print len(pkgs)
+    0
+
+    >>> for name in ['aaron', 'bjorn', 'chex', 'deryck', 'edwin', 'francis']:
+    ...     product = factory.makeProduct(name=name)
+    ...     productseries = factory.makeProductSeries(product=product)
+    ...     spn = factory.makeSourcePackageName(name=name)
+    ...     package = factory.makeSourcePackage(sourcepackagename=spn,
+    ...                                         distroseries=distroseries)
+    ...     package.setPackaging(productseries, product.owner)
+
+
+    >>> pkgs = distroseries.getMostRecentlyLinkedPackagings()
+    >>> for packaging in pkgs:
+    ...     print packaging.sourcepackagename.name
+    francis
+    edwin
+    deryck
+    chex
+    bjorn
+
 DistroSeries can build meta objects for packages
 ------------------------------------------------
 

=== modified file 'lib/lp/registry/interfaces/distroseries.py'
--- lib/lp/registry/interfaces/distroseries.py	2010-01-21 17:49:38 +0000
+++ lib/lp/registry/interfaces/distroseries.py	2010-02-22 13:15:31 +0000
@@ -389,7 +389,7 @@
     def getDistroArchSeriesByProcessor(processor):
         """Return the distroarchseries for this distroseries with the
         given architecturetag from a `IProcessor`.
-        
+
         :param processor: An `IProcessor`
         :return: An `IDistroArchSeries` or None when none was found.
         """
@@ -429,16 +429,23 @@
         that can be translated.
         """
 
-    def getPriorizedUnlinkedSourcePackages():
+    def getPrioritizedUnlinkedSourcePackages():
         """Return a list of package summaries that need packaging links.
 
         A summary is a dict of package (`ISourcePackage`), total_bugs,
         and total_messages (translatable messages).
         """
 
-    def getPriorizedlPackagings():
+    def getPrioritizedlPackagings():
         """Return a list of packagings that need more upstream information."""
 
+    def getMostRecentlyLinkedPackagings():
+        """Return a list of packagings that are the most recently linked.
+
+        At most five packages are returned of those most recently linked to an
+    upstream.
+    """
+
     @operation_parameters(
         created_since_date=Datetime(
             title=_("Created Since Timestamp"),

=== modified file 'lib/lp/registry/model/distroseries.py'
--- lib/lp/registry/model/distroseries.py	2010-01-21 18:09:05 +0000
+++ lib/lp/registry/model/distroseries.py	2010-02-22 13:15:31 +0000
@@ -315,9 +315,9 @@
         result += self.distribution.name + self.name
         return result
 
-    @property
-    def packagings(self):
-        """See `IDistroSeries`."""
+    @cachedproperty
+    def _all_packagings(self):
+        """Get an unordered list of all packagings."""
         # We join to SourcePackageName, ProductSeries, and Product to cache
         # the objects that are implicitly needed to work with a
         # Packaging object.
@@ -336,14 +336,20 @@
             Join(
                 Product,
                 ProductSeries.product == Product.id)]
-        condition = [Packaging.distroseries == self.id]
-        results = IStore(self).using(*origin).find(find_spec, *condition)
+        condition = Packaging.distroseries == self.id
+        results = IStore(self).using(*origin).find(find_spec, condition)
+        return results
+
+    @property
+    def packagings(self):
+        """See `IDistroSeries`."""
+        results = self._all_packagings
         results = results.order_by(SourcePackageName.name)
         return [
             packaging
             for (packaging, spn, product_series, product) in results]
 
-    def getPriorizedUnlinkedSourcePackages(self):
+    def getPrioritizedUnlinkedSourcePackages(self):
         """See `IDistroSeries`.
 
         The prioritization is a heuristic rule using bug heat,
@@ -368,7 +374,7 @@
                  'total_messages': total_messages}
                 for (spn, score, total_bugs, total_messages) in results]
 
-    def getPriorizedlPackagings(self):
+    def getPrioritizedlPackagings(self):
         """See `IDistroSeries`.
 
         The prioritization is a heuristic rule using the branch, bug heat,
@@ -405,7 +411,7 @@
 
     @property
     def _current_sourcepackage_joins_and_conditions(self):
-        """The SQL joins and conditions to prioritise source packages."""
+        """The SQL joins and conditions to prioritize source packages."""
         heat_score = ("""
             LEFT JOIN (
                 SELECT
@@ -467,11 +473,23 @@
                 primary=ArchivePurpose.PRIMARY))
         return (joins, conditions)
 
+    def getMostRecentlyLinkedPackagings(self):
+        """See `IDistroSeries`."""
+        results = self._all_packagings
+        # Order by creation date with a secondary ordering by sourcepackage
+        # name to ensure the ordering for test data where many packagings have
+        # identical creation dates.
+        results = results.order_by(Desc(Packaging.datecreated),
+                                   SourcePackageName.name)[:5]
+        return [
+            packaging
+            for (packaging, spn, product_series, product) in results]
+
     @property
     def supported(self):
         return self.status in [
             SeriesStatus.CURRENT,
-            SeriesStatus.SUPPORTED
+            SeriesStatus.SUPPORTED,
             ]
 
     @property

=== modified file 'lib/lp/registry/stories/distroseries/xx-distroseries-index.txt'
--- lib/lp/registry/stories/distroseries/xx-distroseries-index.txt	2009-11-07 07:46:54 +0000
+++ lib/lp/registry/stories/distroseries/xx-distroseries-index.txt	2010-02-22 13:15:31 +0000
@@ -80,3 +80,24 @@
     Subscribe to Bugs in The Warty Warthog Release
 
 
+Upstream packaging portlet
+--------------------------
+
+The distroseries page contains a portlet with information on the
+upstream packaging.
+
+    >>> anon_browser.open('http://launchpad.dev/ubuntu/warty')
+    >>> print extract_text(
+    ...     find_portlet(anon_browser.contents, 'Upstream packaging'))
+    Upstream packaging
+    5 source packages are linked to registered upstream projects.
+    3 need linking.
+    Recently linked to upstream:
+    alsa-utils linked...
+    a52dec linked...
+    evolution linked...
+    mozilla-firefox linked...
+    netapplet linked...
+    Needs more information or linking to upstream:
+    linux-source-2.6.15 cdrkit iceweasel
+    Needs upstream links All upstream links

=== modified file 'lib/lp/registry/templates/distroseries-index.pt'
--- lib/lp/registry/templates/distroseries-index.pt	2010-02-11 20:59:29 +0000
+++ lib/lp/registry/templates/distroseries-index.pt	2010-02-22 13:15:31 +0000
@@ -55,7 +55,7 @@
         </div>
 
         <div class="yui-u">
-          <div tal:replace="structure context/@@+portlet-latestuploads" />
+          <div tal:replace="structure context/@@+portlet-package-summary" />
         </div>
       </div>
 
@@ -74,14 +74,15 @@
       <div class="yui-g">
         <div class="yui-u first">
           <div
+            tal:replace="structure context/@@+portlet-architectures" />
+          <div
             tal:content="structure context/@@+portlet-latestbugs"
             tal:condition="context/@@+get-involved/official_malone" />
-
-          <div
-            tal:replace="structure context/@@+portlet-architectures" />
         </div>
 
         <div class="yui-u">
+          <div tal:replace="structure context/@@+portlet-latestuploads" />
+
           <div
             tal:content="structure context/@@+portlet-latestspecs"
             tal:condition="context/@@+get-involved/official_blueprints" />

=== added file 'lib/lp/registry/templates/distroseries-portlet-packaging.pt'
--- lib/lp/registry/templates/distroseries-portlet-packaging.pt	1970-01-01 00:00:00 +0000
+++ lib/lp/registry/templates/distroseries-portlet-packaging.pt	2010-02-22 13:15:31 +0000
@@ -0,0 +1,78 @@
+<div
+  xmlns:tal="http://xml.zope.org/namespaces/tal"
+  xmlns:metal="http://xml.zope.org/namespaces/metal"
+  xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+  id="series-packaging" class="portlet"
+  tal:define="overview_menu context/menu:overview">
+  <h2>Upstream packaging</h2>
+
+  <p id="packaging-summary"
+     tal:define="count view/num_linked_packages;
+                 singular string:source package is;
+                 plural string:source packages are">
+    <strong tal:content="view/num_linked_packages"/>&nbsp;
+    <tal:plural
+       metal:use-macro="context/@@+base-layout-macros/plural-message"/>
+    linked to
+    registered upstream projects.
+    <strong tal:content="view/num_unlinked_packages"/>&nbsp;
+    <tal:needs define="singular string:needs;
+                       plural string:need">
+      <tal:plural
+         metal:use-macro="context/@@+base-layout-macros/plural-message"/>
+    </tal:needs>
+    linking.
+  </p>
+
+  <dl>
+    <dt id="recently-linked"
+        tal:condition="view/recently_linked">
+      Recently linked to upstream:
+    </dt>
+    <dd>
+      <tal:package repeat="package view/recently_linked">
+        <p>
+          <a class="sprite package-source"
+             tal:attributes="href package/sourcepackage/fmt:url"
+             tal:content="package/sourcepackage/name">evolution</a>
+          <tal:owner condition="package/owner">
+            <span class="discreet greyed-out">linked by</span>
+            <a tal:replace="structure package/owner/fmt:link" />
+          </tal:owner>
+          <tal:no_owner condition="not:package/owner">
+            <span class="discreet greyed-out">linked</span>
+          </tal:no_owner>
+            <span class="discreet greyed-out"
+              tal:attributes="title package/datecreated/fmt:datetime"
+              tal:content="package/datecreated/fmt:approximatedate" />
+        </p>
+      </tal:package>
+    </dd>
+
+    <dt id="needs-linking"
+        tal:condition="view/needs_linking">
+      Needs more information or linking to upstream:
+    </dt>
+    <dd>
+      <ul class="horizontal">
+        <tal:package repeat="package view/needs_linking">
+          <li>
+            <a class="sprite package-source"
+               tal:attributes="href package/package/fmt:url"
+               tal:content="package/package/name">evolution</a>
+          </li>
+        </tal:package>
+      </ul>
+    </dd>
+  </dl>
+
+  <ul class="horizontal">
+    <li>
+      <a tal:replace="structure context/menu:overview/needs_packaging/fmt:link" />
+    </li>
+    <li>
+      <a tal:replace="structure context/menu:overview/packaging/fmt:icon-link" />
+    </li>
+  </ul>
+
+</div>

=== modified file 'lib/lp/registry/tests/test_distroseries.py'
--- lib/lp/registry/tests/test_distroseries.py	2010-01-21 17:49:38 +0000
+++ lib/lp/registry/tests/test_distroseries.py	2010-02-22 13:15:31 +0000
@@ -253,47 +253,47 @@
             self.series, self.packages[name].sourcepackagename, self.user)
         return product_series
 
-    def test_getPriorizedUnlinkedSourcePackages(self):
+    def test_getPrioritizedUnlinkedSourcePackages(self):
         # Verify the ordering of source packages that need linking.
-        package_summaries = self.series.getPriorizedUnlinkedSourcePackages()
+        package_summaries = self.series.getPrioritizedUnlinkedSourcePackages()
         names = [summary['package'].name for summary in package_summaries]
         expected = [
             u'main', u'hot-translatable', u'hot', u'translatable', u'normal']
         self.assertEqual(expected, names)
 
-    def test_getPriorizedlPackagings(self):
+    def test_getPrioritizedlPackagings(self):
         # Verify the ordering of packagings that need more upstream info.
         for name in ['main', 'hot-translatable', 'hot', 'translatable']:
             self.linkPackage(name)
-        packagings = self.series.getPriorizedlPackagings()
+        packagings = self.series.getPrioritizedlPackagings()
         names = [packaging.sourcepackagename.name for packaging in packagings]
         expected = [
             u'main', u'hot-translatable', u'hot', u'translatable', u'linked']
         self.assertEqual(expected, names)
 
-    def test_getPriorizedlPackagings_bug_tracker(self):
+    def test_getPrioritizedlPackagings_bug_tracker(self):
         # Verify the ordering of packagings with and without a bug tracker.
         self.linkPackage('hot')
         self.makeSeriesPackage('cold')
         product_series = self.linkPackage('cold')
         product_series.product.bugtraker = self.factory.makeBugTracker()
-        packagings = self.series.getPriorizedlPackagings()
+        packagings = self.series.getPrioritizedlPackagings()
         names = [packaging.sourcepackagename.name for packaging in packagings]
         expected = [u'hot', u'linked', u'cold']
         self.assertEqual(expected, names)
 
-    def test_getPriorizedlPackagings_branch(self):
+    def test_getPrioritizedlPackagings_branch(self):
         # Verify the ordering of packagings with and without a branch.
         self.linkPackage('translatable')
         self.makeSeriesPackage('withbranch')
         product_series = self.linkPackage('withbranch')
         product_series.branch = self.factory.makeBranch()
-        packagings = self.series.getPriorizedlPackagings()
+        packagings = self.series.getPrioritizedlPackagings()
         names = [packaging.sourcepackagename.name for packaging in packagings]
         expected = [u'translatable', u'linked', u'withbranch']
         self.assertEqual(expected, names)
 
-    def test_getPriorizedlPackagings_translation(self):
+    def test_getPrioritizedlPackagings_translation(self):
         # Verify the ordering of translatable packagings that are and are not
         # configured to import.
         self.linkPackage('translatable')
@@ -302,7 +302,7 @@
         product_series.branch = self.factory.makeBranch()
         product_series.translations_autoimport_mode = (
             TranslationsBranchImportMode.IMPORT_TEMPLATES)
-        packagings = self.series.getPriorizedlPackagings()
+        packagings = self.series.getPrioritizedlPackagings()
         names = [packaging.sourcepackagename.name for packaging in packagings]
         expected = [u'translatable', u'linked', u'importabletranslatable']
         self.assertEqual(expected, names)

=== modified file 'lib/lp/soyuz/templates/distroseries-portlet-latestuploads.pt'
--- lib/lp/soyuz/templates/distroseries-portlet-latestuploads.pt	2009-12-05 03:14:51 +0000
+++ lib/lp/soyuz/templates/distroseries-portlet-latestuploads.pt	2010-02-22 13:15:31 +0000
@@ -32,8 +32,5 @@
     <li>
       <a tal:replace="structure context/menu:overview/queue/fmt:link" />
     </li>
-    <li>
-      <a tal:replace="structure context/menu:overview/packaging/fmt:icon-link" />
-    </li>
   </ul>
 </div>

=== modified file 'lib/lp/translations/help/imported-upload.html'
--- lib/lp/translations/help/imported-upload.html	2010-01-12 13:48:24 +0000
+++ lib/lp/translations/help/imported-upload.html	2010-02-22 13:15:31 +0000
@@ -19,10 +19,10 @@
       the externally generated translations from time to time.
     </p>
 
-    <h2>How Launchpad prioritises imported translation strings</h2>
+    <h2>How Launchpad prioritizes imported translation strings</h2>
 
     <p>To help ensure the best quality translations, Launchpad
-       prioritises translation strings differently depending on where
+       prioritizes translation strings differently depending on where
        they were made.
     </p>