Merge lp:~edwin-grubbs/launchpad/all-downloads-link-sprite into lp:launchpad

[Edwin Grubbs]

[Edwin Grubbs (edwin-grubbs)]

Summary
-------

In a previous branch, I removed the stylesheet for a.info, since it
was interfering with the "info" class for sprites. This broke a couple
of links. This was corrected by setting class="sprite info".

See the "All downloads" link on https://edge.launchpad.net/bzr

BTW, I also merged devel into db-devel, so that I won't have
to worry about conflicts when pqm is finally working.

Demo and Q/A
------------

* Open https://launchpad.dev/firefox

The other page where this occurs is difficult to view, since
you must be subscribed to a Private PPA. You can subscribe
the name16 (foo.bar) user on launchpad.dev with the following
sql statements.

UPDATE Archive SET private = TRUE, buildd_secret = 'foo' WHERE id = 13;

INSERT INTO ArchiveSubscriber (archive, registrant, subscriber, status)
VALUES (13, 1, 16, 1);

INSERT INTO ArchiveAuthToken (archive, person, token)
VALUES (13, 16, 'asdf');

* https://launchpad.dev/~name16/+archivesubscriptions

[Edwin Grubbs (edwin-grubbs)]

Here is the real diff:

{{{
=== modified file 'lib/lp/registry/templates/product-index.pt'
--- lib/lp/registry/templates/product-index.pt 2009-10-08 15:54:09 +0000
+++ lib/lp/registry/templates/product-index.pt 2009-11-02 21:44:55 +0000
@@ -219,7 +219,7 @@
         </tal:release>

         <p class="alternate">
- <a class="sprint info"
+ <a class="sprite info"
             tal:define="link overview_menu/downloads"
             tal:condition="release"
             tal:attributes="href link/fmt:url;

=== modified file 'lib/lp/soyuz/templates/person-archive-subscriptions.pt'
--- lib/lp/soyuz/templates/person-archive-subscriptions.pt 2009-09-18 07:46:03 +0000
+++ lib/lp/soyuz/templates/person-archive-subscriptions.pt 2009-11-02 21:44:55 +0000
@@ -34,7 +34,7 @@
                 </td>
                 <td>
                   <tal:active condition="token">
- <a tal:attributes="href subscription/fmt:url" class="info">
+ <a tal:attributes="href subscription/fmt:url" class="sprite info">
                       View
                     </a>
                   </tal:active>
}}}

[Curtis Hovey (sinzui)]

This looks good to land. Thanks for fixing the typo and adding the missing class.

review: Approve (code)

[Michael Nelson (michael.nelson)]

Approved for the 'real' diff that you've listed. As you said, it'd be great to wait until the last devel changes hit db-devel so you can verify the real diff.

review: Approve (release-critical)

=== modified file 'database/sampledata/current-dev.sql'
--- database/sampledata/current-dev.sql	2009-09-07 01:46:23 +0000
+++ database/sampledata/current-dev.sql	2009-11-03 18:13:40 +0000
@@ -969,18 +969,18 @@
 
 ALTER TABLE archive DISABLE TRIGGER ALL;
 
-INSERT INTO archive (id, owner, description, enabled, authorized_size, distribution, purpose, private, sources_cached, binaries_cached, package_description_cache, fti, buildd_secret, require_virtualized, name, publish, date_updated, total_count, pending_count, succeeded_count, failed_count, building_count, date_created, signing_key, removed_binary_retention_days, num_old_versions_published, displayname, relative_build_score) VALUES (1, 17, NULL, true, NULL, 1, 1, false, NULL, NULL, NULL, NULL, NULL, false, 'primary', true, '2008-05-27 18:15:12.241774', 15, 1, 8, 5, 1, '2008-09-23 17:29:03.442606', NULL, NULL, NULL, 'Primary Archive for Ubuntu Linux', 0);
-INSERT INTO archive (id, owner, description, enabled, authorized_size, distribution, purpose, private, sources_cached, binaries_cached, package_description_cache, fti, buildd_secret, require_virtualized, name, publish, date_updated, total_count, pending_count, succeeded_count, failed_count, building_count, date_created, signing_key, removed_binary_retention_days, num_old_versions_published, displayname, relative_build_score) VALUES (2, 1, NULL, true, NULL, 2, 1, false, NULL, NULL, NULL, NULL, NULL, false, 'primary', true, '2008-05-27 18:15:15.863812', 0, 0, 0, 0, 0, '2008-09-23 17:29:03.445921', NULL, NULL, NULL, 'Primary Archive for Redhat Advanced Server', 0);
-INSERT INTO archive (id, owner, description, enabled, authorized_size, distribution, purpose, private, sources_cached, binaries_cached, package_description_cache, fti, buildd_secret, require_virtualized, name, publish, date_updated, total_count, pending_count, succeeded_count, failed_count, building_count, date_created, signing_key, removed_binary_retention_days, num_old_versions_published, displayname, relative_build_score) VALUES (3, 1, NULL, true, NULL, 3, 1, false, NULL, NULL, NULL, NULL, NULL, false, 'primary', true, '2008-05-27 18:15:15.864941', 0, 0, 0, 0, 0, '2008-09-23 17:29:03.446557', NULL, NULL, NULL, 'Primary Archive for Debian GNU/Linux', 0);
-INSERT INTO archive (id, owner, description, enabled, authorized_size, distribution, purpose, private, sources_cached, binaries_cached, package_description_cache, fti, buildd_secret, require_virtualized, name, publish, date_updated, total_count, pending_count, succeeded_count, failed_count, building_count, date_created, signing_key, removed_binary_retention_days, num_old_versions_published, displayname, relative_build_score) VALUES (4, 1, NULL, true, NULL, 4, 1, false, NULL, NULL, NULL, NULL, NULL, false, 'primary', true, '2008-05-27 18:15:15.865502', 0, 0, 0, 0, 0, '2008-09-23 17:29:03.44689', NULL, NULL, NULL, 'Primary Archive for The Gentoo Linux', 0);
-INSERT INTO archive (id, owner, description, enabled, authorized_size, distribution, purpose, private, sources_cached, binaries_cached, package_description_cache, fti, buildd_secret, require_virtualized, name, publish, date_updated, total_count, pending_count, succeeded_count, failed_count, building_count, date_created, signing_key, removed_binary_retention_days, num_old_versions_published, displayname, relative_build_score) VALUES (5, 1, NULL, true, NULL, 5, 1, false, NULL, NULL, NULL, NULL, NULL, false, 'primary', true, '2008-05-27 18:15:15.866015', 0, 0, 0, 0, 0, '2008-09-23 17:29:03.447202', NULL, NULL, NULL, 'Primary Archive for Kubuntu - Free KDE-based Linux', 0);
-INSERT INTO archive (id, owner, description, enabled, authorized_size, distribution, purpose, private, sources_cached, binaries_cached, package_description_cache, fti, buildd_secret, require_virtualized, name, publish, date_updated, total_count, pending_count, succeeded_count, failed_count, building_count, date_created, signing_key, removed_binary_retention_days, num_old_versions_published, displayname, relative_build_score) VALUES (7, 4, NULL, true, NULL, 7, 1, false, NULL, NULL, NULL, NULL, NULL, false, 'primary', true, '2008-05-27 18:15:15.866529', 0, 0, 0, 0, 0, '2008-09-23 17:29:03.447515', NULL, NULL, NULL, 'Primary Archive for GuadaLinex: Linux for Andalucia', 0);
-INSERT INTO archive (id, owner, description, enabled, authorized_size, distribution, purpose, private, sources_cached, binaries_cached, package_description_cache, fti, buildd_secret, require_virtualized, name, publish, date_updated, total_count, pending_count, succeeded_count, failed_count, building_count, date_created, signing_key, removed_binary_retention_days, num_old_versions_published, displayname, relative_build_score) VALUES (8, 17, NULL, true, NULL, 8, 1, false, NULL, NULL, NULL, NULL, NULL, false, 'primary', true, '2008-05-27 18:15:15.867154', 0, 0, 0, 0, 0, '2008-09-23 17:29:03.447851', NULL, NULL, NULL, 'Primary Archive for Ubuntu Test', 0);
-INSERT INTO archive (id, owner, description, enabled, authorized_size, distribution, purpose, private, sources_cached, binaries_cached, package_description_cache, fti, buildd_secret, require_virtualized, name, publish, date_updated, total_count, pending_count, succeeded_count, failed_count, building_count, date_created, signing_key, removed_binary_retention_days, num_old_versions_published, displayname, relative_build_score) VALUES (9, 28, 'packages to help my friends.', true, 1024, 1, 2, false, 3, 3, NULL, NULL, NULL, true, 'ppa', true, '2008-05-27 18:15:15.867684', 4, 0, 3, 1, 0, '2008-09-23 17:29:03.448178', NULL, NULL, NULL, 'PPA for Celso Providelo', 0);
-INSERT INTO archive (id, owner, description, enabled, authorized_size, distribution, purpose, private, sources_cached, binaries_cached, package_description_cache, fti, buildd_secret, require_virtualized, name, publish, date_updated, total_count, pending_count, succeeded_count, failed_count, building_count, date_created, signing_key, removed_binary_retention_days, num_old_versions_published, displayname, relative_build_score) VALUES (10, 1, 'packages to help the humanity (you know, ubuntu)', true, 1024, 1, 2, false, 1, 1, NULL, NULL, NULL, true, 'ppa', true, '2008-05-27 18:15:15.868202', 0, 0, 0, 0, 0, '2008-09-23 17:29:03.448488', NULL, NULL, NULL, 'PPA for Mark Shuttleworth', 0);
-INSERT INTO archive (id, owner, description, enabled, authorized_size, distribution, purpose, private, sources_cached, binaries_cached, package_description_cache, fti, buildd_secret, require_virtualized, name, publish, date_updated, total_count, pending_count, succeeded_count, failed_count, building_count, date_created, signing_key, removed_binary_retention_days, num_old_versions_published, displayname, relative_build_score) VALUES (11, 52, 'I am not allowed to say, I have no privs.', true, 1024, 1, 2, false, 0, 0, NULL, NULL, NULL, true, 'ppa', true, '2008-05-27 18:15:15.868709', 1, 0, 0, 1, 0, '2008-09-23 17:29:03.448797', NULL, NULL, NULL, 'PPA for No Privileges Person', 0);
-INSERT INTO archive (id, owner, description, enabled, authorized_size, distribution, purpose, private, sources_cached, binaries_cached, package_description_cache, fti, buildd_secret, require_virtualized, name, publish, date_updated, total_count, pending_count, succeeded_count, failed_count, building_count, date_created, signing_key, removed_binary_retention_days, num_old_versions_published, displayname, relative_build_score) VALUES (12, 17, 'Partner archive', true, NULL, 1, 4, false, NULL, NULL, NULL, NULL, NULL, false, 'partner', true, '2008-05-27 18:15:15.869209', 1, 0, 1, 0, 0, '2008-09-23 17:29:03.449157', NULL, NULL, NULL, 'Partner Archive for Ubuntu Linux', 0);
-INSERT INTO archive (id, owner, description, enabled, authorized_size, distribution, purpose, private, sources_cached, binaries_cached, package_description_cache, fti, buildd_secret, require_virtualized, name, publish, date_updated, total_count, pending_count, succeeded_count, failed_count, building_count, date_created, signing_key, removed_binary_retention_days, num_old_versions_published, displayname, relative_build_score) VALUES (13, 17, 'Partner archive', true, NULL, 8, 4, false, NULL, NULL, NULL, NULL, NULL, false, 'partner', true, '2008-05-27 18:15:15.869732', 0, 0, 0, 0, 0, '2008-09-23 17:29:03.449471', NULL, NULL, NULL, 'Partner Archive for Ubuntu Test', 0);
+INSERT INTO archive (id, owner, description, enabled, authorized_size, distribution, purpose, private, sources_cached, binaries_cached, package_description_cache, fti, buildd_secret, require_virtualized, name, publish, date_updated, total_count, pending_count, succeeded_count, failed_count, building_count, date_created, signing_key, removed_binary_retention_days, num_old_versions_published, displayname, relative_build_score, external_dependencies) VALUES (1, 17, NULL, true, NULL, 1, 1, false, NULL, NULL, NULL, NULL, NULL, false, 'primary', true, '2008-05-27 18:15:12.241774', 15, 1, 8, 5, 1, '2008-09-23 17:29:03.442606', NULL, NULL, NULL, 'Primary Archive for Ubuntu Linux', 0, NULL);
+INSERT INTO archive (id, owner, description, enabled, authorized_size, distribution, purpose, private, sources_cached, binaries_cached, package_description_cache, fti, buildd_secret, require_virtualized, name, publish, date_updated, total_count, pending_count, succeeded_count, failed_count, building_count, date_created, signing_key, removed_binary_retention_days, num_old_versions_published, displayname, relative_build_score, external_dependencies) VALUES (2, 1, NULL, true, NULL, 2, 1, false, NULL, NULL, NULL, NULL, NULL, false, 'primary', true, '2008-05-27 18:15:15.863812', 0, 0, 0, 0, 0, '2008-09-23 17:29:03.445921', NULL, NULL, NULL, 'Primary Archive for Redhat Advanced Server', 0, NULL);
+INSERT INTO archive (id, owner, description, enabled, authorized_size, distribution, purpose, private, sources_cached, binaries_cached, package_description_cache, fti, buildd_secret, require_virtualized, name, publish, date_updated, total_count, pending_count, succeeded_count, failed_count, building_count, date_created, signing_key, removed_binary_retention_days, num_old_versions_published, displayname, relative_build_score, external_dependencies) VALUES (3, 1, NULL, true, NULL, 3, 1, false, NULL, NULL, NULL, NULL, NULL, false, 'primary', true, '2008-05-27 18:15:15.864941', 0, 0, 0, 0, 0, '2008-09-23 17:29:03.446557', NULL, NULL, NULL, 'Primary Archive for Debian GNU/Linux', 0, NULL);
+INSERT INTO archive (id, owner, description, enabled, authorized_size, distribution, purpose, private, sources_cached, binaries_cached, package_description_cache, fti, buildd_secret, require_virtualized, name, publish, date_updated, total_count, pending_count, succeeded_count, failed_count, building_count, date_created, signing_key, removed_binary_retention_days, num_old_versions_published, displayname, relative_build_score, external_dependencies) VALUES (4, 1, NULL, true, NULL, 4, 1, false, NULL, NULL, NULL, NULL, NULL, false, 'primary', true, '2008-05-27 18:15:15.865502', 0, 0, 0, 0, 0, '2008-09-23 17:29:03.44689', NULL, NULL, NULL, 'Primary Archive for The Gentoo Linux', 0, NULL);
+INSERT INTO archive (id, owner, description, enabled, authorized_size, distribution, purpose, private, sources_cached, binaries_cached, package_description_cache, fti, buildd_secret, require_virtualized, name, publish, date_updated, total_count, pending_count, succeeded_count, failed_count, building_count, date_created, signing_key, removed_binary_retention_days, num_old_versions_published, displayname, relative_build_score, external_dependencies) VALUES (5, 1, NULL, true, NULL, 5, 1, false, NULL, NULL, NULL, NULL, NULL, false, 'primary', true, '2008-05-27 18:15:15.866015', 0, 0, 0, 0, 0, '2008-09-23 17:29:03.447202', NULL, NULL, NULL, 'Primary Archive for Kubuntu - Free KDE-based Linux', 0, NULL);
+INSERT INTO archive (id, owner, description, enabled, authorized_size, distribution, purpose, private, sources_cached, binaries_cached, package_description_cache, fti, buildd_secret, require_virtualized, name, publish, date_updated, total_count, pending_count, succeeded_count, failed_count, building_count, date_created, signing_key, removed_binary_retention_days, num_old_versions_published, displayname, relative_build_score, external_dependencies) VALUES (7, 4, NULL, true, NULL, 7, 1, false, NULL, NULL, NULL, NULL, NULL, false, 'primary', true, '2008-05-27 18:15:15.866529', 0, 0, 0, 0, 0, '2008-09-23 17:29:03.447515', NULL, NULL, NULL, 'Primary Archive for GuadaLinex: Linux for Andalucia', 0, NULL);
+INSERT INTO archive (id, owner, description, enabled, authorized_size, distribution, purpose, private, sources_cached, binaries_cached, package_description_cache, fti, buildd_secret, require_virtualized, name, publish, date_updated, total_count, pending_count, succeeded_count, failed_count, building_count, date_created, signing_key, removed_binary_retention_days, num_old_versions_published, displayname, relative_build_score, external_dependencies) VALUES (8, 17, NULL, true, NULL, 8, 1, false, NULL, NULL, NULL, NULL, NULL, false, 'primary', true, '2008-05-27 18:15:15.867154', 0, 0, 0, 0, 0, '2008-09-23 17:29:03.447851', NULL, NULL, NULL, 'Primary Archive for Ubuntu Test', 0, NULL);
+INSERT INTO archive (id, owner, description, enabled, authorized_size, distribution, purpose, private, sources_cached, binaries_cached, package_description_cache, fti, buildd_secret, require_virtualized, name, publish, date_updated, total_count, pending_count, succeeded_count, failed_count, building_count, date_created, signing_key, removed_binary_retention_days, num_old_versions_published, displayname, relative_build_score, external_dependencies) VALUES (9, 28, 'packages to help my friends.', true, 1024, 1, 2, false, 3, 3, NULL, NULL, NULL, true, 'ppa', true, '2008-05-27 18:15:15.867684', 4, 0, 3, 1, 0, '2008-09-23 17:29:03.448178', NULL, NULL, NULL, 'PPA for Celso Providelo', 0, NULL);
+INSERT INTO archive (id, owner, description, enabled, authorized_size, distribution, purpose, private, sources_cached, binaries_cached, package_description_cache, fti, buildd_secret, require_virtualized, name, publish, date_updated, total_count, pending_count, succeeded_count, failed_count, building_count, date_created, signing_key, removed_binary_retention_days, num_old_versions_published, displayname, relative_build_score, external_dependencies) VALUES (10, 1, 'packages to help the humanity (you know, ubuntu)', true, 1024, 1, 2, false, 1, 1, NULL, NULL, NULL, true, 'ppa', true, '2008-05-27 18:15:15.868202', 0, 0, 0, 0, 0, '2008-09-23 17:29:03.448488', NULL, NULL, NULL, 'PPA for Mark Shuttleworth', 0, NULL);
+INSERT INTO archive (id, owner, description, enabled, authorized_size, distribution, purpose, private, sources_cached, binaries_cached, package_description_cache, fti, buildd_secret, require_virtualized, name, publish, date_updated, total_count, pending_count, succeeded_count, failed_count, building_count, date_created, signing_key, removed_binary_retention_days, num_old_versions_published, displayname, relative_build_score, external_dependencies) VALUES (11, 52, 'I am not allowed to say, I have no privs.', true, 1024, 1, 2, false, 0, 0, NULL, NULL, NULL, true, 'ppa', true, '2008-05-27 18:15:15.868709', 1, 0, 0, 1, 0, '2008-09-23 17:29:03.448797', NULL, NULL, NULL, 'PPA for No Privileges Person', 0, NULL);
+INSERT INTO archive (id, owner, description, enabled, authorized_size, distribution, purpose, private, sources_cached, binaries_cached, package_description_cache, fti, buildd_secret, require_virtualized, name, publish, date_updated, total_count, pending_count, succeeded_count, failed_count, building_count, date_created, signing_key, removed_binary_retention_days, num_old_versions_published, displayname, relative_build_score, external_dependencies) VALUES (12, 17, 'Partner archive', true, NULL, 1, 4, false, NULL, NULL, NULL, NULL, NULL, false, 'partner', true, '2008-05-27 18:15:15.869209', 1, 0, 1, 0, 0, '2008-09-23 17:29:03.449157', NULL, NULL, NULL, 'Partner Archive for Ubuntu Linux', 0, NULL);
+INSERT INTO archive (id, owner, description, enabled, authorized_size, distribution, purpose, private, sources_cached, binaries_cached, package_description_cache, fti, buildd_secret, require_virtualized, name, publish, date_updated, total_count, pending_count, succeeded_count, failed_count, building_count, date_created, signing_key, removed_binary_retention_days, num_old_versions_published, displayname, relative_build_score, external_dependencies) VALUES (13, 17, 'Partner archive', true, NULL, 8, 4, false, NULL, NULL, NULL, NULL, NULL, false, 'partner', true, '2008-05-27 18:15:15.869732', 0, 0, 0, 0, 0, '2008-09-23 17:29:03.449471', NULL, NULL, NULL, 'Partner Archive for Ubuntu Test', 0, NULL);
 
 
 ALTER TABLE archive ENABLE TRIGGER ALL;

=== modified file 'database/schema/Makefile'
--- database/schema/Makefile	2009-08-04 22:16:48 +0000
+++ database/schema/Makefile	2009-11-03 18:13:41 +0000
@@ -113,7 +113,7 @@
 	@ echo "* eg. sudo -u postgres make create"
 	@ echo
 	@ echo "* Creating database \"$(EMPTY_DBNAME)\"."
-	@ ${CREATEDB} template1 ${EMPTY_DBNAME}
+	@ ${CREATEDB} template0 ${EMPTY_DBNAME}
 	@ if ! `createlang -l ${EMPTY_DBNAME} | grep -qs plpythonu`; then \
 		echo "* Installing PL/PythonU"; \
 		createlang -d ${EMPTY_DBNAME} plpythonu; \
@@ -142,12 +142,12 @@
 
 	@ echo "* Creating session databases '${SESSION_DBNAME}' (if necessary)"
 	@if [ "$$((`psql -l | grep -w ${SESSION_DBNAME} | wc -l`))" = '0' ]; \
-	    then ${CREATEDB} template1 ${SESSION_DBNAME} ; \
+	    then ${CREATEDB} template0 ${SESSION_DBNAME} ; \
 	    createlang plpgsql ${SESSION_DBNAME}; \
 	    psql -q -d ${SESSION_DBNAME} -f launchpad_session.sql ; \
 	fi
 	@ echo "* Creating session database '${TEST_SESSION_DBNAME}'"
-	@ ${CREATEDB} template1 ${TEST_SESSION_DBNAME}
+	@ ${CREATEDB} template0 ${TEST_SESSION_DBNAME}
 	@ createlang plpgsql ${TEST_SESSION_DBNAME}
 	@ psql -q -d ${TEST_SESSION_DBNAME} -f launchpad_session.sql
 

=== modified file 'database/schema/comments.sql'
--- database/schema/comments.sql	2009-08-30 01:41:38 +0000
+++ database/schema/comments.sql	2009-11-03 18:13:41 +0000
@@ -763,8 +763,11 @@
 
 -- SprintAttendance
 COMMENT ON TABLE SprintAttendance IS 'The record that someone will be attending a particular sprint or meeting.';
+COMMENT ON COLUMN SprintAttendance.attendee IS 'The person attending the sprint.';
+COMMENT ON COLUMN SprintAttendance.sprint IS 'The sprint the person is attending.';
 COMMENT ON COLUMN SprintAttendance.time_starts IS 'The time from which the person will be available to participate in meetings at the sprint.';
 COMMENT ON COLUMN SprintAttendance.time_ends IS 'The time of departure from the sprint or conference - this is the last time at which the person is available for meetings during the sprint.';
+COMMENT ON COLUMN SprintAttendance.is_physical IS 'Is the person physically attending the sprint';
 
 
 -- SprintSpecification
@@ -1862,6 +1865,7 @@
 COMMENT ON COLUMN Archive.removed_binary_retention_days IS 'The number of days before superseded or deleted binary files are expired in the librarian, or zero for never.';
 COMMENT ON COLUMN Archive.num_old_versions_published IS 'The number of versions of a package to keep published before older versions are superseded.';
 COMMENT ON COLUMN Archive.relative_build_score IS 'A delta to the build score that is applied to all builds in this archive.';
+COMMENT ON COLUMN Archive.external_dependencies IS 'Newline-separated list of repositories to be used to retrieve any external build dependencies when building packages in this archive, in the format: deb http[s]://[user:pass@]<host>[/path] %(series)s[-pocket] [components]  The series variable is replaced with the series name of the context build.  This column is specifically and only intended for OEM migration to Launchpad and should be re-examined in October 2010 to see if it is still relevant.';
 
 -- ArchiveAuthToken
 
@@ -2235,11 +2239,20 @@
 
 -- Packageset
 
-COMMENT ON TABLE Packageset IS 'Package sets facilitate the grouping of packages for purposes like the control of upload permissions, et.';
+COMMENT ON TABLE Packageset IS 'Package sets facilitate the grouping of packages (in a given distro series) for purposes like the control of upload permissions, etc.';
 COMMENT ON COLUMN Packageset.date_created IS 'Date and time of creation.';
 COMMENT ON COLUMN Packageset.owner IS 'The Person or team who owns the package set';
 COMMENT ON COLUMN Packageset.name IS 'The name for the package set on hand.';
 COMMENT ON COLUMN Packageset.description IS 'The description for the package set on hand.';
+COMMENT ON COLUMN Packageset.packagesetgroup IS 'The group this package set is affiliated with.';
+COMMENT ON COLUMN Packageset.distroseries IS 'The distro series this package set belongs to.';
+
+-- PackagesetGroup
+
+COMMENT ON TABLE PackagesetGroup IS 'Package set groups keep track of equivalent package sets across distro series boundaries.';
+COMMENT ON COLUMN Packageset.date_created IS 'Date and time of creation.';
+COMMENT ON COLUMN Packageset.owner IS 'The Person or team who owns the package
+set group.';
 
 -- PackagesetSources
 
@@ -2256,3 +2269,9 @@
 COMMENT ON TABLE FlatPackagesetInclusion IS 'In order to facilitate the querying of set-subset relationships an expanded or flattened representation of the set-subset hierarchy is provided by this table.';
 COMMENT ON COLUMN FlatPackagesetInclusion.parent IS 'The package set that is (directly or indirectly) including a subset.';
 COMMENT ON COLUMN FlatPackagesetInclusion.child IS 'The package set that is being included as a subset.';
+
+-- SourcePackageFormatSelection
+COMMENT ON TABLE SourcePackageFormatSelection IS 'Allowed source package formats for a given distroseries.';
+COMMENT ON COLUMN SourcePackageFormatSelection.distroseries IS 'Refers to the distroseries in question.';
+COMMENT ON COLUMN SourcePackageFormatSelection.format IS 'The SourcePackageFormat to allow.';
+

=== modified file 'database/schema/fti.py'
--- database/schema/fti.py	2009-06-24 21:17:33 +0000
+++ database/schema/fti.py	2009-11-03 18:13:42 +0000
@@ -13,6 +13,7 @@
 
 import _pythonpath
 
+from distutils.version import LooseVersion
 import sys
 import os.path
 from optparse import OptionParser
@@ -287,9 +288,9 @@
     """Setup and install tsearch2 if isn't already"""
 
     # tsearch2 is out-of-the-box in 8.3+
-    v83 = get_pgversion(con).startswith('8.3')
-
-    assert v83, 'This script only supports PostgreSQL 8.3'
+    required = LooseVersion('8.3.0')
+    assert get_pgversion(con) >= required, (
+        'This script only supports PostgreSQL 8.3+')
 
     schema_exists = bool(execute(
         con, "SELECT COUNT(*) FROM pg_namespace WHERE nspname='ts2'",
@@ -608,18 +609,13 @@
 
 def get_pgversion(con):
     rows = execute(con, r"show server_version", results=True)
-    return rows[0][0]
+    return LooseVersion(rows[0][0])
 
 
 def get_tsearch2_sql_path(con):
-    pgversion = get_pgversion(con)
-    if pgversion.startswith('8.2.'):
-        path = os.path.join(PGSQL_BASE, '8.2', 'contrib', 'tsearch2.sql')
-    elif pgversion.startswith('8.3.'):
-        path = os.path.join(PGSQL_BASE, '8.3', 'contrib', 'tsearch2.sql')
-    else:
-        raise RuntimeError('Unknown version %s' % pgversion)
-
+    major, minor = get_pgversion(con).version[:2]
+    path = os.path.join(
+        PGSQL_BASE, '%d.%d' % (major, minor), 'contrib', 'tsearch2.sql')
     assert os.path.exists(path), '%s does not exist' % path
     return path
 

=== modified file 'database/schema/patch-2207-00-3.sql'
--- database/schema/patch-2207-00-3.sql	2009-09-18 04:13:18 +0000
+++ database/schema/patch-2207-00-3.sql	2009-11-03 18:13:41 +0000
@@ -1,7 +1,12 @@
 SET client_min_messages TO ERROR;
 
 UPDATE BugActivity SET person=(SELECT id FROM Person WHERE name='janitor')
-WHERE person NOT IN (SELECT id FROM Person);
+FROM (
+    SELECT BugActivity.id
+    FROM BugActivity LEFT OUTER JOIN Person ON BugActivity.person = Person.id
+    WHERE Person.id IS NULL
+    ) AS Whatever
+WHERE Whatever.id = BugActivity.id;
 
 ALTER TABLE BugActivity
     ADD CONSTRAINT bugactivity__person__fk

=== added file 'database/schema/patch-2207-04-0.sql'
--- database/schema/patch-2207-04-0.sql	1970-01-01 00:00:00 +0000
+++ database/schema/patch-2207-04-0.sql	2009-11-03 18:13:39 +0000
@@ -0,0 +1,13 @@
+-- Copyright 2009 Canonical Ltd.  This software is licensed under the
+-- GNU Affero General Public License version 3 (see the file LICENSE).
+
+SET client_min_messages=ERROR;
+
+
+-- Add a column to indicate that the attendee is physically attending
+-- the sprint.
+ALTER TABLE SprintAttendance
+  ADD COLUMN is_physical BOOLEAN NOT NULL DEFAULT FALSE;
+
+
+INSERT INTO LaunchpadDatabaseRevision VALUES (2207, 04, 0);

=== added file 'database/schema/patch-2207-05-0.sql'
--- database/schema/patch-2207-05-0.sql	1970-01-01 00:00:00 +0000
+++ database/schema/patch-2207-05-0.sql	2009-11-03 18:13:40 +0000
@@ -0,0 +1,12 @@
+-- Copyright 2009 Canonical Ltd.  This software is licensed under the
+-- GNU Affero General Public License version 3 (see the file LICENSE).
+
+SET client_min_messages=ERROR;
+
+
+-- Add a column for external archive dependencies.
+ALTER TABLE Archive
+  ADD COLUMN external_dependencies text DEFAULT NULL;
+
+
+INSERT INTO LaunchpadDatabaseRevision VALUES (2207, 05, 0);

=== added file 'database/schema/patch-2207-06-0.sql'
--- database/schema/patch-2207-06-0.sql	1970-01-01 00:00:00 +0000
+++ database/schema/patch-2207-06-0.sql	2009-11-03 18:13:43 +0000
@@ -0,0 +1,122 @@
+-- Copyright 2009 Canonical Ltd.  This software is licensed under the
+-- GNU Affero General Public License version 3 (see the file LICENSE).
+
+SET client_min_messages=ERROR;
+
+-- ** PART 1 ** Create the 'packagesetgroup' table and the
+--              'packageset.packagesetgroup' foreign key,
+--              populate the 'packagesetgroup' table
+
+-- This table keeps track of package sets that are equivalent across
+-- distro series boundaries.
+CREATE SEQUENCE packagesetgroup_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+CREATE TABLE packagesetgroup (
+    id integer NOT NULL DEFAULT nextval('packagesetgroup_id_seq'),
+    date_created timestamp without time zone DEFAULT timezone('UTC'::text, now()) NOT NULL,
+    owner integer NOT NULL,
+    -- Please note: the 'name' column is only here to ease the data migration
+    -- and will be dropped at the end of this patch.
+    name text NOT NULL
+);
+ALTER SEQUENCE packagesetgroup_id_seq OWNED BY packagesetgroup.id;
+ALTER TABLE ONLY packagesetgroup
+    ADD CONSTRAINT packagesetgroup_pkey PRIMARY KEY (id);
+ALTER TABLE ONLY packagesetgroup
+    ADD CONSTRAINT packagesetgroup__owner__fk
+    FOREIGN KEY (owner) REFERENCES person(id);
+
+-- Package sets and their clones belong to the same package set group.
+ALTER TABLE ONLY packageset ADD COLUMN packagesetgroup integer;
+ALTER TABLE ONLY packageset
+  ADD CONSTRAINT packageset__packagesetgroup__fk
+  FOREIGN KEY (packagesetgroup) REFERENCES packagesetgroup(id);
+
+-- Create a group for each of the original (karmic koala) package sets.
+INSERT INTO packagesetgroup(owner, name)
+SELECT packageset.owner, packageset.name
+FROM packageset WHERE NOT packageset.name LIKE('lucid-%');
+
+
+-- ** PART 2 ** Associate the karmic koala package sets and their lucid lynx
+--              clones with the appropriate package set groups
+
+-- Update the karmic koala package sets so they reference their groups.
+UPDATE packageset SET packagesetgroup = packagesetgroup.id
+FROM packagesetgroup WHERE packageset.name = packagesetgroup.name;
+
+-- Update the lucid lynx package set *clones* so they reference their groups
+-- as well.
+UPDATE packageset SET packagesetgroup = packagesetgroup.id
+FROM packagesetgroup WHERE packageset.name = 'lucid-' || packagesetgroup.name;
+
+-- ** PART 3 ** Add the 'packageset.distroseries' foreign key and
+--              initialise it for the existing package sets.
+
+-- A package set lives in a distro series context.
+ALTER TABLE ONLY packageset ADD COLUMN distroseries integer;
+
+-- Define the foreign key constraint.
+ALTER TABLE ONLY packageset
+  ADD CONSTRAINT packageset__distroseries__fk
+  FOREIGN KEY (distroseries) REFERENCES distroseries(id);
+
+-- First migrate the original package sets created for the karmic koala.
+UPDATE packageset SET distroseries = distroseries.id FROM distroseries
+WHERE distroseries.name = 'karmic' AND NOT packageset.name LIKE('lucid-%');
+
+-- Migrate the lucid lynx package sets next.
+UPDATE packageset SET distroseries = distroseries.id FROM distroseries
+WHERE distroseries.name = 'lucid' AND packageset.name LIKE('lucid-%');
+
+-- Make the 'distroseries' foreign key mandatory.
+ALTER TABLE ONLY packageset ALTER COLUMN distroseries SET NOT NULL;
+
+-- The package set name is now only unique in conjunction with a distro series.
+ALTER TABLE ONLY packageset
+    DROP CONSTRAINT packageset_name_key;
+ALTER TABLE ONLY packageset
+    ADD CONSTRAINT packageset__name__distroseries__key UNIQUE (name, distroseries);
+
+-- ** PART 4 ** Strip off the 'lucid-' prefix of the lucid lynx
+--              package set names
+UPDATE packageset SET name = substring(name FROM length('lucid-')+1)
+WHERE name LIKE('lucid-%');
+
+-- ** PART 5 ** Create package set groups for package sets that were added in
+--              lucid lynx but do not exist in the karmic koala,
+--              associate these package sets with their newly created groups
+INSERT INTO packagesetgroup(owner, name)
+SELECT packageset.owner, packageset.name
+FROM packageset, distroseries WHERE
+    packageset.packagesetgroup IS NULL
+    AND packageset.distroseries = distroseries.id
+    AND distroseries.name = 'lucid';
+
+UPDATE packageset SET packagesetgroup = packagesetgroup.id
+FROM packagesetgroup, distroseries
+WHERE
+    packageset.packagesetgroup IS NULL
+    AND packageset.distroseries = distroseries.id
+    AND distroseries.name = 'lucid'
+    AND packageset.name = packagesetgroup.name;
+
+-- ** PART 6 ** Make the 'packageset.packagesetgroup' foreign key mandatory
+ALTER TABLE ONLY packageset ALTER COLUMN packagesetgroup SET NOT NULL;
+
+-- ** PART 7 ** Drop the 'packagesetgroup.name' column that was only added
+--              for data migration purposes.
+ALTER TABLE ONLY packagesetgroup DROP COLUMN name;
+
+-- Define indices on the newly added foreign keys.
+CREATE INDEX packageset__packagesetgroup__idx
+    ON packageset(packagesetgroup);
+CREATE INDEX packageset__distroseries__idx
+    ON packageset(distroseries);
+CREATE INDEX packagesetgroup__owner__idx ON PackageSetGroup(owner);
+
+INSERT INTO LaunchpadDatabaseRevision VALUES (2207, 06, 0);

=== added file 'database/schema/patch-2207-08-0.sql'
--- database/schema/patch-2207-08-0.sql	1970-01-01 00:00:00 +0000
+++ database/schema/patch-2207-08-0.sql	2009-11-03 18:13:40 +0000
@@ -0,0 +1,20 @@
+-- Copyright 2009 Canonical Ltd.  This software is licensed under the
+-- GNU Affero General Public License version 3 (see the file LICENSE).
+
+SET client_min_messages=ERROR;
+
+CREATE TABLE sourcepackageformatselection (
+  id serial PRIMARY KEY,
+  distroseries integer NOT NULL
+    CONSTRAINT sourceformatselection__distroseries__fk
+    REFERENCES distroseries,
+  format integer NOT NULL,
+  CONSTRAINT sourceformatselection__distroseries__format__key
+    UNIQUE (distroseries, format)
+);
+
+-- Allow all series to accept format 1.0 by default.
+INSERT INTO sourcepackageformatselection (distroseries, format)
+  SELECT id, 0 AS format FROM distroseries;
+
+INSERT INTO LaunchpadDatabaseRevision VALUES (2207, 08, 0);

=== modified file 'database/schema/security.cfg'
--- database/schema/security.cfg	2009-10-31 01:41:29 +0000
+++ database/schema/security.cfg	2009-11-03 18:13:41 +0000
@@ -227,6 +227,7 @@
 public.packagediff                      = SELECT, INSERT, UPDATE, DELETE
 public.packagediff                      = SELECT, INSERT, UPDATE, DELETE
 public.packageset                       = SELECT, INSERT, UPDATE, DELETE
+public.packagesetgroup                  = SELECT, INSERT, UPDATE, DELETE
 public.packagesetsources                = SELECT, INSERT, UPDATE, DELETE
 public.packagesetinclusion              = SELECT, INSERT, UPDATE, DELETE
 public.flatpackagesetinclusion          = SELECT, INSERT, UPDATE, DELETE
@@ -649,6 +650,7 @@
 public.messagechunk                     = SELECT, INSERT
 # Merge notifications
 public.codereviewvote                   = SELECT
+public.codereviewmessage                = SELECT
 
 [branch-distro]
 type=user
@@ -785,6 +787,7 @@
 public.packagecopyrequest                       = SELECT, INSERT, UPDATE
 public.packagediff                              = SELECT, INSERT, UPDATE
 public.packageset                               = SELECT
+public.packagesetgroup                          = SELECT
 public.packagesetsources                        = SELECT, INSERT, UPDATE, DELETE
 public.packagesetinclusion                      = SELECT, INSERT, UPDATE, DELETE
 public.flatpackagesetinclusion                  = SELECT, INSERT, UPDATE, DELETE
@@ -862,6 +865,7 @@
 public.teammembership                           = SELECT
 public.gpgkey                                   = SELECT
 public.packageset                               = SELECT
+public.packagesetgroup                          = SELECT
 public.packagesetsources                        = SELECT
 public.packagesetinclusion                      = SELECT
 public.flatpackagesetinclusion                  = SELECT
@@ -917,7 +921,7 @@
 public.bugpackageinfestation            = SELECT, INSERT, UPDATE
 public.bugproductinfestation            = SELECT, INSERT, UPDATE
 public.bugsubscription                  = SELECT, INSERT, UPDATE, DELETE
-public.bugtask                          = SELECT, INSERT, UPDATE
+public.bugtask                          = SELECT, INSERT, UPDATE, DELETE
 public.bugtracker                       = SELECT, INSERT, UPDATE, DELETE
 public.bugtrackeralias                  = SELECT, INSERT, UPDATE, DELETE
 public.bugwatch                         = SELECT, INSERT, UPDATE, DELETE
@@ -1062,6 +1066,7 @@
 public.archive                          = SELECT, INSERT, UPDATE
 public.archivearch                      = SELECT, INSERT, UPDATE
 public.packageset                       = SELECT
+public.packagesetgroup                  = SELECT
 public.packagesetsources                = SELECT
 public.packagesetinclusion              = SELECT
 public.flatpackagesetinclusion          = SELECT
@@ -1250,6 +1255,7 @@
 public.personlanguage                   = SELECT
 public.structuralsubscription           = SELECT
 public.packageset                       = SELECT
+public.packagesetgroup                  = SELECT
 public.packagesetsources                = SELECT
 public.packagesetinclusion              = SELECT
 public.flatpackagesetinclusion          = SELECT
@@ -1702,6 +1708,7 @@
 public.productseries                    = SELECT
 public.revision                         = SELECT
 public.revisionauthor                   = SELECT, INSERT
+public.seriessourcepackagebranch        = SELECT
 public.sourcepackagename                = SELECT
 public.staticdiff                       = SELECT, INSERT
 public.teammembership                   = SELECT
@@ -1807,6 +1814,7 @@
 type=user
 public.libraryfilecontent               = SELECT
 public.openidrpconfig                   = SELECT
+public.branch                           = SELECT
 
 [modified-branches]
 type=user

=== modified file 'database/schema/trusted.sql'
--- database/schema/trusted.sql	2009-08-19 15:35:13 +0000
+++ database/schema/trusted.sql	2009-11-03 18:13:42 +0000
@@ -1029,7 +1029,22 @@
     DECLARE
         parent_name text;
         child_name text;
+        parent_distroseries text;
+        child_distroseries text;
     BEGIN
+        -- Make sure that the package sets being associated here belong
+        -- to the same distro series.
+        IF (SELECT parent.distroseries != child.distroseries
+            FROM packageset parent, packageset child
+            WHERE parent.id = NEW.parent AND child.id = NEW.child)
+        THEN
+            SELECT name INTO parent_name FROM packageset WHERE id = NEW.parent;
+            SELECT name INTO child_name FROM packageset WHERE id = NEW.child;
+            SELECT ds.name INTO parent_distroseries FROM packageset ps, distroseries ds WHERE ps.id = NEW.parent AND ps.distroseries = ds.id;
+            SELECT ds.name INTO child_distroseries FROM packageset ps, distroseries ds WHERE ps.id = NEW.child AND ps.distroseries = ds.id;
+            RAISE EXCEPTION 'Package sets % and % belong to different distro series (to % and % respectively) and thus cannot be associated.', child_name, parent_name, child_distroseries, parent_distroseries;
+        END IF;
+
         IF EXISTS(
             SELECT * FROM flatpackagesetinclusion
             WHERE parent = NEW.child AND child = NEW.parent LIMIT 1)

=== modified file 'database/schema/unautovacuumable.py'
--- database/schema/unautovacuumable.py	2009-06-24 21:17:33 +0000
+++ database/schema/unautovacuumable.py	2009-11-03 18:13:43 +0000
@@ -19,6 +19,7 @@
 # pylint: disable-msg=W0403
 import _pythonpath
 
+from distutils.version import LooseVersion
 from optparse import OptionParser
 import sys
 import time
@@ -44,14 +45,31 @@
     con.set_isolation_level(0) # Autocommit
     cur = con.cursor()
 
+    cur.execute('show server_version')
+    pg_version = LooseVersion(cur.fetchone()[0])
+
     log.debug("Disabling autovacuum on all tables in the database.")
-    cur.execute("""
-        INSERT INTO pg_autovacuum
-        SELECT pg_class.oid, FALSE, -1,-1,-1,-1,-1,-1,-1,-1
-        FROM pg_class
-        WHERE relkind in ('r','t')
-            AND pg_class.oid NOT IN (SELECT vacrelid FROM pg_autovacuum)
-        """)
+    if pg_version < LooseVersion('8.4.0'):
+        cur.execute("""
+            INSERT INTO pg_autovacuum
+            SELECT pg_class.oid, FALSE, -1,-1,-1,-1,-1,-1,-1,-1
+            FROM pg_class
+            WHERE relkind in ('r','t')
+                AND pg_class.oid NOT IN (SELECT vacrelid FROM pg_autovacuum)
+            """)
+    else:
+        cur.execute("""
+            SELECT nspname,relname
+            FROM pg_namespace, pg_class
+            WHERE relnamespace = pg_namespace.oid
+                AND relkind = 'r' AND nspname <> 'pg_catalog'
+            """)
+        for namespace, table in list(cur.fetchall()):
+            cur.execute("""
+                ALTER TABLE ONLY "%s"."%s" SET (
+                    autovacuum_enabled=false,
+                    toast.autovacuum_enabled=false)
+                """ % (namespace, table))
 
     log.debug("Killing existing autovacuum processes")
     num_autovacuums = -1

=== modified file 'lib/canonical/config/schema-lazr.conf'
--- lib/canonical/config/schema-lazr.conf	2009-10-29 05:50:08 +0000
+++ lib/canonical/config/schema-lazr.conf	2009-11-03 18:13:40 +0000
@@ -1436,13 +1436,6 @@
 
 
 [ppa.master]
-# Line-separated repository lines to be used as build dependencies, in
-# the following format:
-#   deb [user:pass@]<host>[/path] %(series)s[-pocket] [components]
-# 'series' variable is replaced with the series name of the context build.
-# datatype: string
-dependencies: none
-
 
 [poimport]
 # The database user which will be used by this process.

=== modified file 'lib/canonical/ftests/pgsql.py'
--- lib/canonical/ftests/pgsql.py	2009-06-25 05:30:52 +0000
+++ lib/canonical/ftests/pgsql.py	2009-11-03 18:13:40 +0000
@@ -144,6 +144,13 @@
     host = None
     port = None
 
+    # Class attributes. With PostgreSQL 8.4, pg_shdepend bloats
+    # hugely when we drop and create databases, because this
+    # operation cancels any autovacuum process maintaining it.
+    # To cope, we need to manually vacuum it ourselves occasionally.
+    vacuum_shdepend_every = 10
+    _vacuum_shdepend_counter = 0
+
     # (template, name) of last test. Class attribute.
     _last_db = (None, None)
     # Class attribute. True if we should destroy the DB because changes made.
@@ -308,6 +315,10 @@
                     if 'does not exist' in str(x):
                         break
                     raise
+                PgTestSetup._vacuum_shdepend_counter += 1
+                if (PgTestSetup._vacuum_shdepend_counter
+                    % PgTestSetup.vacuum_shdepend_every) == 0:
+                    cur.execute('VACUUM pg_catalog.pg_shdepend')
             finally:
                 con.close()
 

=== modified file 'lib/canonical/launchpad/emailtemplates/branch-merge-proposal-created.txt'
--- lib/canonical/launchpad/emailtemplates/branch-merge-proposal-created.txt	2009-08-05 19:27:17 +0000
+++ lib/canonical/launchpad/emailtemplates/branch-merge-proposal-created.txt	2009-11-03 18:13:39 +0000
@@ -1,4 +1,4 @@
-%(proposal_registrant)s has proposed merging %(source_branch)s into %(target_branch)s.
+%(proposal_registrant)s has proposed merging %(source_branch)s into %(target_branch)s%(prerequisite)s.
 
 %(reviews)s%(related_bugs)s%(gap)s%(comment)s%(diff_cutoff_warning)s
 -- 

=== modified file 'lib/canonical/launchpad/icing/style-3-0.css'
--- lib/canonical/launchpad/icing/style-3-0.css	2009-10-29 21:39:12 +0000
+++ lib/canonical/launchpad/icing/style-3-0.css	2009-11-03 18:13:42 +0000
@@ -466,6 +466,9 @@
     padding: 0 1.5em 0 0;
     }
 .subordinate {
+    margin-left: 2em;
+    }
+ol.subordinate {
     margin-left: 4em;
     }
 .two-column-list li,

=== modified file 'lib/canonical/launchpad/interfaces/_schema_circular_imports.py'
--- lib/canonical/launchpad/interfaces/_schema_circular_imports.py	2009-10-29 19:55:59 +0000
+++ lib/canonical/launchpad/interfaces/_schema_circular_imports.py	2009-11-03 18:13:43 +0000
@@ -234,6 +234,14 @@
     IArchive, 'getAllPublishedBinaries', 'status', PackagePublishingStatus)
 patch_choice_parameter_type(
     IArchive, 'getAllPublishedBinaries', 'pocket', PackagePublishingPocket)
+patch_plain_parameter_type(
+    IArchive, 'isSourceUploadAllowed', 'distroseries', IDistroSeries)
+patch_plain_parameter_type(
+    IArchive, 'newPackagesetUploader', 'packageset', IPackageset)
+patch_plain_parameter_type(
+    IArchive, 'getUploadersForPackageset', 'packageset', IPackageset)
+patch_plain_parameter_type(
+    IArchive, 'deletePackagesetUploader', 'packageset', IPackageset)
 
 # IDistribution
 IDistribution['serieses'].value_type.schema = IDistroSeries
@@ -283,6 +291,8 @@
     IPackageset, 'getSourcesSharedBy', 'other_package_set', IPackageset)
 patch_plain_parameter_type(
     IPackageset, 'getSourcesNotSharedBy', 'other_package_set', IPackageset)
+patch_collection_return_type(
+    IPackageset, 'relatedSets', IPackageset)
 
 # IPackageUpload
 IPackageUpload['pocket'].vocabulary = PackagePublishingPocket

=== modified file 'lib/canonical/launchpad/templates/launchpad-login.pt'
--- lib/canonical/launchpad/templates/launchpad-login.pt	2009-10-16 16:13:00 +0000
+++ lib/canonical/launchpad/templates/launchpad-login.pt	2009-11-03 18:13:39 +0000
@@ -171,13 +171,13 @@
             <p>
               Creating your Launchpad account is easy. Here's what to do:</p>
 
-              <ol class="subordinate">
-                 <li>Make sure cookies are enabled in your browser.</li>
-                 <li>Enter your e-mail address and answer our random question
-                 so we know that you're human.
-                 </li>
-                 <li>Follow the URL in the confirmation e-mail that Launchpad sends and you're done!</li>
-             </ol>
+            <ol class="subordinate">
+                <li>Make sure cookies are enabled in your browser.</li>
+                <li>Enter your e-mail address and answer our random question
+                    so we know that you're human.
+                </li>
+                <li>Follow the URL in the confirmation e-mail that Launchpad sends and you're done!</li>
+            </ol>
 
 
 

=== modified file 'lib/lp/bugs/doc/externalbugtracker-debbugs.txt'
--- lib/lp/bugs/doc/externalbugtracker-debbugs.txt	2009-10-06 07:38:29 +0000
+++ lib/lp/bugs/doc/externalbugtracker-debbugs.txt	2009-11-03 18:13:40 +0000
@@ -102,7 +102,7 @@
     >>> from lp.bugs.scripts.checkwatches import BugWatchUpdater
     >>> bug_watch_updater = BugWatchUpdater(txn)
     >>> external_debbugs.sync_comments = False
-    >>> bug_watch_ids = [bug_watch.id for bug_watch in bug_watches]
+    >>> bug_watch_ids = sorted([bug_watch.id for bug_watch in bug_watches])
     >>> bug_watch_updater.updateBugWatches(external_debbugs, bug_watches)
     INFO:...:Updating 5 watches for 5 bugs on http://...
 
@@ -110,10 +110,10 @@
     >>> for bug_watch_id in bug_watch_ids:
     ...     bug_watch = getUtility(IBugWatchSet).get(bug_watch_id)
     ...     print "%s: %s" % (bug_watch.remotebug, bug_watch.remotestatus)
+    280883: done grave woody security
     304014: open important
     327452: done critical patch security
     327549: open important security
-    280883: done grave woody security
     308994: open important
 
 The lastchecked attribute got updated for each bug watch, so no more

=== modified file 'lib/lp/code/browser/branch.py'
--- lib/lp/code/browser/branch.py	2009-10-11 02:33:30 +0000
+++ lib/lp/code/browser/branch.py	2009-11-03 18:13:40 +0000
@@ -575,7 +575,8 @@
                 BranchLifecycleStatus,
                 css_class_prefix='branchstatus'),
             'status_value': self.context.lifecycle_status.title,
-            'user_can_edit_status': check_permission('launchpad.Edit', self.context),
+            'user_can_edit_status': check_permission(
+                'launchpad.Edit', self.context),
             'branch_path': '/' + self.context.unique_name,
             })
 
@@ -1153,6 +1154,13 @@
         description=_(
             "The branch that the source branch will be merged into."))
 
+    prerequisite_branch = Choice(
+        title=_('Prerequisite Branch'),
+        vocabulary='Branch', required=False, readonly=False,
+        description=_(
+            'A branch that should be merged before this one.  (Its changes'
+            ' will not be shown in the diff.)'))
+
     comment = Text(
         title=_('Initial Comment'), required=False,
         description=_('Describe your change.'))
@@ -1206,6 +1214,7 @@
         registrant = self.user
         source_branch = self.context
         target_branch = data['target_branch']
+        prerequisite_branch = data.get('prerequisite_branch')
 
         review_requests = []
         reviewer = data.get('reviewer')
@@ -1217,7 +1226,8 @@
             # and an advanced expandable section.
             proposal = source_branch.addLandingTarget(
                 registrant=registrant, target_branch=target_branch,
-                needs_review=True, initial_comment=data.get('comment'),
+                prerequisite_branch=prerequisite_branch, needs_review=True,
+                initial_comment=data.get('comment'),
                 review_requests=review_requests)
 
             self.next_url = canonical_url(proposal)

=== modified file 'lib/lp/code/mail/branchmergeproposal.py'
--- lib/lp/code/mail/branchmergeproposal.py	2009-09-18 13:50:52 +0000
+++ lib/lp/code/mail/branchmergeproposal.py	2009-11-03 18:13:41 +0000
@@ -199,6 +199,7 @@
             'proposal_registrant': self.merge_proposal.registrant.displayname,
             'source_branch': self.merge_proposal.source_branch.bzr_identity,
             'target_branch': self.merge_proposal.target_branch.bzr_identity,
+            'prerequisite': '',
             'proposal_title': self.merge_proposal.title,
             'proposal_url': canonical_url(self.merge_proposal),
             'edit_subscription': '',
@@ -209,6 +210,10 @@
             'diff_cutoff_warning': '',
             }
 
+        if self.merge_proposal.prerequisite_branch is not None:
+            prereq_url = self.merge_proposal.prerequisite_branch.bzr_identity
+            params['prerequisite'] = ' with %s as a prerequisite' % prereq_url
+
         requested_reviews = []
         for review in self.requested_reviews:
             reviewer = review.reviewer

=== modified file 'lib/lp/code/mail/tests/test_branchmergeproposal.py'
--- lib/lp/code/mail/tests/test_branchmergeproposal.py	2009-09-18 13:50:52 +0000
+++ lib/lp/code/mail/tests/test_branchmergeproposal.py	2009-11-03 18:13:42 +0000
@@ -36,7 +36,7 @@
         super(TestMergeProposalMailing, self).setUp('[e-mail]')
 
     def makeProposalWithSubscriber(self, diff_text=None,
-                                   initial_comment=None):
+                                   initial_comment=None, prerequisite=False):
         if diff_text is not None:
             preview_diff = PreviewDiff.create(
                 diff_text,
@@ -49,9 +49,14 @@
         registrant = self.factory.makePerson(
             name='bazqux', displayname='Baz Qux', email='[e-mail]')
         product = self.factory.makeProduct(name='super-product')
+        if prerequisite:
+            prerequisite_branch = self.factory.makeProductBranch(product)
+        else:
+            prerequisite_branch = None
         bmp = self.factory.makeBranchMergeProposal(
-            registrant=registrant, product=product, preview_diff=preview_diff,
-            initial_comment=initial_comment)
+            registrant=registrant, product=product,
+            prerequisite_branch=prerequisite_branch,
+            preview_diff=preview_diff, initial_comment=initial_comment)
         subscriber = self.factory.makePerson(displayname='Baz Quxx',
             email='[e-mail]')
         bmp.source_branch.subscribe(subscriber,
@@ -133,6 +138,14 @@
             'Requested reviews:\n    Review-person (review-person)\n\n-- \n',
             ctrl.body)
 
+    def test_forCreation_with_prerequisite_branch(self):
+        """Correctly format list of reviewers."""
+        bmp, subscriber = self.makeProposalWithSubscriber(prerequisite=True)
+        mailer = BMPMailer.forCreation(bmp, bmp.registrant)
+        ctrl = mailer.generateEmail('[e-mail]', subscriber)
+        prereq = bmp.prerequisite_branch.bzr_identity
+        self.assertIn(' with %s as a prerequisite.' % prereq, ctrl.body)
+
     def test_to_addrs_includes_reviewers(self):
         """The addresses for the to header include requested reviewers"""
         request, requester = self.makeReviewRequest()

=== modified file 'lib/lp/code/stories/branches/xx-branch-merge-proposals.txt'
--- lib/lp/code/stories/branches/xx-branch-merge-proposals.txt	2009-10-23 02:36:17 +0000
+++ lib/lp/code/stories/branches/xx-branch-merge-proposals.txt	2009-11-03 18:13:42 +0000
@@ -57,6 +57,9 @@
     >>> nopriv_browser.getControl(
     ...     name='field.target_branch.target_branch').value = (
     ...         '~name12/gnome-terminal/main')
+    >>> nopriv_browser.getControl(
+    ...     name='field.prerequisite_branch').value = (
+    ...         '~name12/gnome-terminal/pushed')
 
 There is a cancel link shown with the buttons.
 
@@ -68,6 +71,20 @@
     >>> print nopriv_browser.url
     http://code.launchpad.dev/~name12/gnome-terminal/klingon/+merge/...
 
+The summary reflects the selected target and prerequisite.
+
+    >>> def print_summary(browser):
+    ...     print extract_text(find_tag_by_id(
+    ...         browser.contents, 'proposal-summary'))
+    >>> print_summary(nopriv_browser)
+    Status:...
+    Proposed branch:
+    lp://dev/~name12/gnome-terminal/klingon
+    Merge into:
+    lp://dev/~name12/gnome-terminal/main
+    Prerequisite:
+    lp://dev/~name12/gnome-terminal/pushed
+
 
 Editing a commit message
 ------------------------
@@ -83,9 +100,6 @@
     >>> print nopriv_browser.url
     http://code.launchpad.dev/~name12/gnome-terminal/klingon/+merge/1
 
-    >>> def print_summary(browser):
-    ...     print extract_text(find_tag_by_id(
-    ...         browser.contents, 'proposal-summary'))
     >>> print_tag_with_id(nopriv_browser.contents, 'edit-description')
     Commit Message
     Add more &lt;b&gt;mojo&lt;/b&gt;

=== modified file 'lib/lp/code/templates/branchmergeproposal-pagelet-summary.pt'
--- lib/lp/code/templates/branchmergeproposal-pagelet-summary.pt	2009-10-21 23:20:59 +0000
+++ lib/lp/code/templates/branchmergeproposal-pagelet-summary.pt	2009-11-03 18:13:43 +0000
@@ -105,6 +105,10 @@
       <th>Merge into:</th>
       <td tal:content="structure context/target_branch/fmt:bzr-link">lp:~foo/bar/baz</td>
     </tr>
+    <tr tal:condition="context/prerequisite_branch">
+      <th>Prerequisite:</th>
+      <td tal:content="structure context/prerequisite_branch/fmt:bzr-link">lp:~foo/bar/baz</td>
+    </tr>
     <tr tal:condition="context/preview_diff">
       <th>Diff against target:</th>
       <td>

=== modified file 'lib/lp/code/templates/branchmergeproposal-resubmit.pt'
--- lib/lp/code/templates/branchmergeproposal-resubmit.pt	2009-09-08 19:24:40 +0000
+++ lib/lp/code/templates/branchmergeproposal-resubmit.pt	2009-11-03 18:13:39 +0000
@@ -14,8 +14,9 @@
     <div metal:fill-slot="extra_info">
       <p>
         Resubmitting this proposal to merge will cause this proposal to be
-        marked as <strong>superseded</strong>.  Another proposal to merge with
-        the same source and target branches will be created.
+        marked as <strong>superseded</strong>.  Another merge proposal will
+        be created, with the same source, target and prerequisite branch
+        (if any).
       </p>
       <p>
         Everyone who has reviewed the previous proposal or was requested to

=== modified file 'lib/lp/registry/browser/__init__.py'
--- lib/lp/registry/browser/__init__.py	2009-09-22 16:21:12 +0000
+++ lib/lp/registry/browser/__init__.py	2009-11-03 18:13:42 +0000
@@ -18,6 +18,8 @@
 
 from zope.component import getUtility
 
+from storm.store import Store
+
 from lp.bugs.interfaces.bugtask import BugTaskSearchParams, IBugTaskSet
 from lp.registry.interfaces.productseries import IProductSeries
 from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities
@@ -136,15 +138,22 @@
         """The context's URL."""
         return canonical_url(self.context)
 
-    def _getBugtasks(self, milestone):
-        """Return the list `IBugTask`s targeted to the milestone."""
-        params = BugTaskSearchParams(milestone=milestone, user=None)
+    def _getBugtasks(self, target):
+        """Return the list `IBugTask`s associated with the target."""
+        if IProductSeries.providedBy(target):
+            params = BugTaskSearchParams(user=None)
+            params.setProductSeries(target)
+        else:
+            params = BugTaskSearchParams(milestone=target, user=None)
         bugtasks = getUtility(IBugTaskSet).search(params)
         return list(bugtasks)
 
-    def _getSpecifications(self, milestone):
-        """Return the list `ISpecification`s targeted to the milestone."""
-        return list(milestone.specifications)
+    def _getSpecifications(self, target):
+        """Return the list `ISpecification`s associated to the target."""
+        if IProductSeries.providedBy(target):
+            return list(target.all_specifications)
+        else:
+            return list(target.specifications)
 
     def _getProductRelease(self, milestone):
         """The `IProductRelease` associated with the milestone."""
@@ -158,10 +167,37 @@
         else:
             return []
 
+    def _unsubscribe_structure(self, structure):
+        """Removed the subscriptions from structure."""
+        for subscription in structure.getSubscriptions():
+            # The owner of the subscription or an admin are the only users
+            # that can destroy a subscription, but this rule cannot prevent
+            # the owner from removing the structure.
+            Store.of(subscription).remove(subscription)
+
+    def _remove_series_bugs_and_specifications(self, series):
+        """Untarget the associated bugs and subscriptions."""
+        for spec in self._getSpecifications(series):
+            spec.proposeGoal(None, self.user)
+        for bugtask in self._getBugtasks(series):
+            # Bugtasks cannot be deleted directly. In this case, the bugtask
+            # is already reported on the product, so the series bugtask has
+            # no purpose without a series.
+            Store.of(bugtask).remove(bugtask)
+
     def _deleteProductSeries(self, series):
-        """Remove the series and delete/unlink related objects."""
-        # Delete all milestones, releases, and files.
-        # Any associated bugtasks and specifications are untargeted.
+        """Remove the series and delete/unlink related objects.
+
+        All subordinate milestones, releases, and files will be deleted.
+        Milestone bugs and blueprints will be untargeted.
+        Series bugs and blueprints will be untargeted.
+        Series and milestone structural subscriptions are unsubscribed.
+        Series branches are unlinked.
+        """
+        self._unsubscribe_structure(series)
+        self._remove_series_bugs_and_specifications(series)
+        series.branch = None
+
         for milestone in series.all_milestones:
             self._deleteMilestone(milestone)
         # Series are not deleted because some objects like translations are
@@ -174,6 +210,7 @@
 
     def _deleteMilestone(self, milestone):
         """Delete a milestone and unlink related objects."""
+        self._unsubscribe_structure(milestone)
         for bugtask in self._getBugtasks(milestone):
             bugtask.milestone = None
         for spec in self._getSpecifications(milestone):
@@ -191,6 +228,7 @@
 
 class RegistryEditFormView(LaunchpadEditFormView):
     """A base class that provides consistent edit form behaviour."""
+
     @property
     def page_title(self):
         """The page title."""

=== modified file 'lib/lp/registry/browser/productseries.py'
--- lib/lp/registry/browser/productseries.py	2009-10-26 19:47:59 +0000
+++ lib/lp/registry/browser/productseries.py	2009-11-03 18:13:42 +0000
@@ -479,7 +479,7 @@
     @cachedproperty
     def bugtasks(self):
         """A list of all `IBugTask`s targeted to this series."""
-        all_bugtasks = []
+        all_bugtasks = self._getBugtasks(self.context)
         for milestone in self.milestones:
             all_bugtasks.extend(self._getBugtasks(milestone))
         return all_bugtasks
@@ -487,7 +487,7 @@
     @cachedproperty
     def specifications(self):
         """A list of all `ISpecification`s targeted to this series."""
-        all_specifications = []
+        all_specifications = self._getSpecifications(self.context)
         for milestone in self.milestones:
             all_specifications.extend(self._getSpecifications(milestone))
         return all_specifications
@@ -497,6 +497,11 @@
         """Does the series have any targeted bugtasks or specifications."""
         return len(self.bugtasks) > 0 or len(self.specifications) > 0
 
+    @property
+    def has_linked_branch(self):
+        """Is the series linked to a branch."""
+        return self.context.branch is not None
+
     @cachedproperty
     def product_release_files(self):
         """A list of all `IProductReleaseFile`s that belong to this series."""

=== modified file 'lib/lp/registry/browser/tests/milestone-views.txt'
--- lib/lp/registry/browser/tests/milestone-views.txt	2009-09-22 16:21:12 +0000
+++ lib/lp/registry/browser/tests/milestone-views.txt	2009-11-03 18:13:41 +0000
@@ -654,6 +654,9 @@
     >>> bug = factory.makeBug(product=firefox)
     >>> bugtask = bug.bugtasks[0]
     >>> bugtask.milestone = milestone
+    >>> subscription = milestone.addSubscription(owner, owner)
+    >>> [subscription for subscription in owner.structural_subscriptions]
+    [<StructuralSubscription ...>]
 
     >>> view = create_initialized_view(milestone, '+delete')
     >>> [bugtask.milestone.name for bugtask in view.bugtasks]
@@ -685,6 +688,9 @@
     >>> print bugtask.milestone
     None
 
+    >>> [subscription for subscription in owner.structural_subscriptions]
+    []
+
 No Privileges Person cannot access this view because he is neither the
 project owner or series driver..
 

=== modified file 'lib/lp/registry/browser/tests/productseries-views.txt'
--- lib/lp/registry/browser/tests/productseries-views.txt	2009-10-23 16:21:47 +0000
+++ lib/lp/registry/browser/tests/productseries-views.txt	2009-11-03 18:13:42 +0000
@@ -229,6 +229,8 @@
     []
     >>> view.product_release_files
     []
+    >>> view.has_linked_branch
+    False
 
 Most series that are deleted do not have any related objects, but a small
 portion do.
@@ -244,18 +246,38 @@
     >>> bugtask = bug.bugtasks[0]
     >>> bugtask.milestone = milestone_two
 
+    >>> owner = product.owner
+    >>> series_specification = factory.makeSpecification(product=product)
+    >>> series_specification.proposeGoal(productseries, owner)
+    >>> series_bugtask = factory.makeBugTask(bug=bug, target=productseries)
+    >>> subscription = productseries.addSubscription(owner, owner)
+    >>> productseries.branch = factory.makeBranch()
+
     >>> view = create_view(productseries, name='+delete')
     >>> [milestone.name for milestone in view.milestones]
     [u'0.2', u'0.1']
     >>> view.has_bugtasks_and_specifications
     True
-    >>> [bugtask.milestone.name for bugtask in view.bugtasks]
-    [u'0.2']
-    >>> [spec.milestone.name for spec in view.specifications]
-    [u'0.1']
-
-    # Listing and deleting product release files is done in the story
-    # because they require the Librarian to be running.
+    >>> for bugtask in view.bugtasks:
+    ...     if bugtask.milestone is not None:
+    ...         print bugtask.milestone.name
+    ...     else:
+    ...         print bugtask.target.name
+    rabbit
+    0.2
+    >>> for spec in view.specifications:
+    ...     if spec.milestone is not None:
+    ...         print spec.milestone.name
+    ...     else:
+    ...         print spec.goal.name
+    rabbit
+    0.1
+
+    >>> view.has_linked_branch
+    True
+
+    # Listing and deleting product release files is done in
+    # product-release-views because they require the Librarian to be running.
 
 Series that are the active focus of development cannot be deleted. The
 view's can_delete property checks this rule.
@@ -291,7 +313,8 @@
 Calling the view's delete action on a series that can be deleted will
 untarget the bugtasks and specifications that are targeted to the
 series' milestones. The milestones, releases, and release files are
-deleted.
+deleted. Bugs and blueprints targeted to the series are unassigned.
+Series structural subscriptions are removed. Branch links are removed.
 
     >>> view = create_initialized_view(productseries, '+delete', form=form)
     >>> for notification in view.request.response.notifications:
@@ -308,11 +331,17 @@
     None
     >>> print bugtask.milestone
     None
+    >>> bugtask.related_tasks
+    []
+    >>> print series_specification.milestone
+    None
+    >>> [subscription for subscription in owner.structural_subscriptions]
+    []
 
 The series was not actually deleted because there are problematic objects
 like translations. The series are assigned to the Obsolete Junk project.
 The series name is changed to 'product_name-series_name-date_created' to
-avoid conflicts.
+avoid conflicts. The linked branch is removed.
 
     >>> from zope.component import getUtility
     >>> from canonical.launchpad.interfaces.launchpad import (

=== modified file 'lib/lp/registry/doc/milestone.txt'
--- lib/lp/registry/doc/milestone.txt	2009-08-13 19:03:36 +0000
+++ lib/lp/registry/doc/milestone.txt	2009-11-03 18:13:40 +0000
@@ -496,3 +496,13 @@
     ...
     AssertionError: You cannot delete a milestone which has specifications
                     targeted to it.
+
+If a milestone has a structural subscription, it cannot be deleted.
+
+    >>> milestone = ff_onedotzero.newMilestone('1.0.14')
+    >>> subscription = milestone.addSubscription(owner, owner)
+    >>> milestone.destroySelf()
+    Traceback (most recent call last):
+    ...
+    AssertionError: You cannot delete a milestone which has structural
+                    subscriptions.

=== modified file 'lib/lp/registry/model/distribution.py'
--- lib/lp/registry/model/distribution.py	2009-10-23 16:20:14 +0000
+++ lib/lp/registry/model/distribution.py	2009-11-03 18:13:43 +0000
@@ -851,6 +851,7 @@
             SourcePackagePublishingHistory.dateremoved is NULL
             """ % sqlvalues(self, archive),
             distinct=True,
+            orderBy="name",
             clauseTables=['SourcePackagePublishingHistory', 'DistroSeries',
                 'SourcePackageRelease']))
 

=== modified file 'lib/lp/registry/model/milestone.py'
--- lib/lp/registry/model/milestone.py	2009-10-22 09:43:29 +0000
+++ lib/lp/registry/model/milestone.py	2009-11-03 18:13:43 +0000
@@ -188,6 +188,9 @@
         """See `IMilestone`."""
         params = BugTaskSearchParams(milestone=self, user=None)
         bugtasks = getUtility(IBugTaskSet).search(params)
+        assert len(self.getSubscriptions()) == 0, (
+            "You cannot delete a milestone which has structural "
+            "subscriptions.")
         assert bugtasks.count() == 0, (
             "You cannot delete a milestone which has bugtasks targeted "
             "to it.")
@@ -238,6 +241,7 @@
         """See lp.registry.interfaces.milestone.IMilestoneSet."""
         return Milestone.selectBy(active=True, orderBy='id')
 
+
 class ProjectMilestone(HasBugsBase):
     """A virtual milestone implementation for project.
 

=== modified file 'lib/lp/registry/templates/product-index.pt'
--- lib/lp/registry/templates/product-index.pt	2009-10-08 15:54:09 +0000
+++ lib/lp/registry/templates/product-index.pt	2009-11-03 18:13:40 +0000
@@ -219,7 +219,7 @@
         </tal:release>
 
         <p class="alternate">
-          <a class="sprint info"
+          <a class="sprite info"
             tal:define="link overview_menu/downloads"
             tal:condition="release"
             tal:attributes="href link/fmt:url;

=== modified file 'lib/lp/registry/templates/productseries-delete.pt'
--- lib/lp/registry/templates/productseries-delete.pt	2009-08-11 21:31:51 +0000
+++ lib/lp/registry/templates/productseries-delete.pt	2009-11-03 18:13:43 +0000
@@ -30,10 +30,12 @@
               </tal:no-files>
             </p>
 
-            <ul id="milestones" tal:condition="view/milestones">
+            <ul id="milestones" class="subordinate"
+              tal:condition="view/milestones">
               <li tal:repeat="milestone view/milestones">
                 <strong>
-                  <a tal:attributes="href milestone/fmt:url"><tal:name
+                  <a class="sprite milestone"
+                    tal:attributes="href milestone/fmt:url"><tal:name
                     content="milestone/name">0.9</tal:name><tal:codename
                       condition="milestone/code_name">
                         "<tal:name
@@ -42,9 +44,8 @@
               </li>
             </ul>
 
-
-
-            <ul id="files" tal:condition="view/product_release_files">
+            <ul id="files" class="subordinate"
+              tal:condition="view/product_release_files">
               <li tal:repeat="file view/product_release_files">
                 <strong tal:content="file/libraryfile/filename">foo.tgz</strong>
               </li>
@@ -54,7 +55,7 @@
               The following bugs and blueprints will be <em>untargeted</em>:
             </p>
 
-            <ul id="bugtasks-and-blueprints"
+            <ul id="bugtasks-and-blueprints" class="subordinate"
               tal:condition="view/has_bugtasks_and_specifications">
               <li tal:repeat="bugtask view/bugtasks"
                 tal:content="structure bugtask/bug/fmt:link">bug 1
@@ -64,6 +65,11 @@
               </li>
             </ul>
 
+            <p tal:condition="view/has_linked_branch">
+              The associated branch will be <em>unlinked</em>:
+              <a tal:replace="structure view/context/branch/fmt:link" />
+            </p>
+
             <p>
               Series deletion is permanent.
             </p>

=== modified file 'lib/lp/soyuz/adapters/archivedependencies.py'
--- lib/lp/soyuz/adapters/archivedependencies.py	2009-08-16 12:38:12 +0000
+++ lib/lp/soyuz/adapters/archivedependencies.py	2009-11-03 18:13:42 +0000
@@ -36,7 +36,6 @@
     'pocket_dependencies',
     ]
 
-from canonical.config import config
 from lp.registry.interfaces.pocket import (
     PackagePublishingPocket, pocketsuffix)
 from lp.soyuz.interfaces.archive import ArchivePurpose, ALLOW_RELEASE_BUILDS
@@ -161,11 +160,9 @@
 
     # Append external sources_list lines for this archive if it's
     # specified in the configuration.
-    archive_config_key = 'ppa.%s_%s' % (
-        build.archive.owner.name, build.archive.name)
-    if archive_config_key in config:
-        archive_config = config[archive_config_key]
-        for archive_dep in archive_config.dependencies.splitlines():
+    dependencies = build.archive.external_dependencies
+    if dependencies is not None:
+        for archive_dep in dependencies.splitlines():
             line = archive_dep % (
                 {'series': build.distroarchseries.distroseries.name})
             sources_list_lines.append(line)

=== modified file 'lib/lp/soyuz/browser/archive.py'
--- lib/lp/soyuz/browser/archive.py	2009-10-30 12:29:32 +0000
+++ lib/lp/soyuz/browser/archive.py	2009-11-03 18:13:43 +0000
@@ -28,6 +28,7 @@
 
 from datetime import datetime, timedelta
 import pytz
+from urlparse import urlparse
 
 from zope.app.form.browser import TextAreaWidget
 from zope.component import getUtility
@@ -1775,7 +1776,10 @@
 class ArchiveAdminView(BaseArchiveEditView):
 
     field_names = ['enabled', 'private', 'require_virtualized',
-                   'buildd_secret', 'authorized_size', 'relative_build_score']
+                   'buildd_secret', 'authorized_size', 'relative_build_score',
+                   'external_dependencies']
+
+    custom_widget('external_dependencies', TextAreaWidget, height=3)
 
     def validate_save(self, action, data):
         """Validate the save action on ArchiveAdminView.
@@ -1794,12 +1798,44 @@
             self.setFieldError(
                 'private',
                 'Private teams may not have public archives.')
-
         elif data.get('buildd_secret') is not None and not data['private']:
             self.setFieldError(
                 'buildd_secret',
                 'Do not specify for non-private archives')
 
+        # Check the external_dependencies field.
+        ext_deps =  data.get('external_dependencies')
+        if ext_deps is not None:
+            errors = self.validate_external_dependencies(ext_deps)
+            if len(errors) != 0:
+                error_text = "\n".join(errors)
+                self.setFieldError('external_dependencies', error_text)
+
+    def validate_external_dependencies(self, ext_deps):
+        """Validate the external_dependencies field.
+
+        :param ext_deps: The dependencies form field to check.
+        """
+        errors = []
+        # The field can consist of multiple entries separated by
+        # newlines, so process each in turn.
+        for dep in ext_deps.splitlines():
+            try:
+                deb, url, suite, components = dep.split(" ", 3)
+            except ValueError:
+                errors.append(
+                    "'%s' is not a complete and valid sources.list entry"
+                        % dep)
+                continue
+
+            if deb != "deb":
+                errors.append("%s: Must start with 'deb'" % dep)
+            url_components = urlparse(url)
+            if not url_components[0] or not url_components[1]:
+                errors.append("%s: Invalid URL" % dep)
+
+        return errors
+
     @property
     def owner_is_private_team(self):
         """Is the owner a private team?

=== modified file 'lib/lp/soyuz/browser/configure.zcml'
--- lib/lp/soyuz/browser/configure.zcml	2009-10-22 10:33:00 +0000
+++ lib/lp/soyuz/browser/configure.zcml	2009-11-03 18:13:42 +0000
@@ -783,7 +783,7 @@
         />
     <browser:url
         for="lp.soyuz.interfaces.packageset.IPackageset"
-        path_expression="name"
+        path_expression="string:${distroseries/name}/${name}"
         parent_utility="lp.soyuz.interfaces.packageset.IPackagesetSet"
         />
     <browser:url

=== modified file 'lib/lp/soyuz/browser/packageset.py'
--- lib/lp/soyuz/browser/packageset.py	2009-06-30 16:56:07 +0000
+++ lib/lp/soyuz/browser/packageset.py	2009-11-03 18:13:42 +0000
@@ -17,3 +17,22 @@
 class PackagesetSetNavigation(GetitemNavigation):
     """Navigation methods for PackagesetSet."""
     usedfor = IPackagesetSet
+
+    def traverse(self, distroseries):
+        """Traverse package sets in distro series context.
+
+        The URI fragment of interest is:
+
+            /package-sets/lucid/mozilla
+
+        where 'lucid' is the distro series and 'mozilla' is the package set
+        *name* respectively.
+        """
+        if self.request.stepstogo:
+            # The package set name follows after the distro series.
+            ps_name = self.request.stepstogo.consume()
+            return self.context.getByName(ps_name, distroseries=distroseries)
+
+        # Otherwise return None (to trigger a NotFound error).
+        return None
+        

=== modified file 'lib/lp/soyuz/browser/tests/archive-views.txt'
--- lib/lp/soyuz/browser/tests/archive-views.txt	2009-10-30 21:42:10 +0000
+++ lib/lp/soyuz/browser/tests/archive-views.txt	2009-11-03 18:13:41 +0000
@@ -1345,3 +1345,50 @@
 
     >>> print copy.status.name
     ACCEPTED
+
+
+== External dependencies validation ==
+
+The ArchiveAdminView checks the external_dependencies form data to see if
+it's a valid sources.list entry.
+
+    >>> ppa_archive_view = create_initialized_view(
+    ...     cprov.archive, name="+admin")
+
+The validate_external_dependencies() method is called when validating and will
+return a list of errors if the data dis not validate.  A valid entry is of the
+form:
+    deb scheme://domain/ suite component[s]
+
+    >>> print ppa_archive_view.validate_external_dependencies(
+    ...     "deb http://example.com/ karmic main")
+    []
+
+Multiple entries are valid, separated by newlines:
+
+    >>> print ppa_archive_view.validate_external_dependencies(
+    ...     "deb http://example.com/ karmic main\n"
+    ...     "deb http://example.com/ karmic restricted")
+    []
+
+If the line does not start with the word "deb" it fails:
+
+    >>> print ppa_archive_view.validate_external_dependencies(
+    ...     "deb http://example.com/ karmic universe\n"
+    ...     "dab http://example.com/ karmic main")
+    ["dab http://example.com/ karmic main: Must start with 'deb'"]
+
+If the line has too few parts it fails.  Here we're missing a suite:
+
+    >>> print ppa_archive_view.validate_external_dependencies(
+    ...     "deb http://example.com/ karmic universe\n"
+    ...     "deb http://example.com/ main")
+    ["'deb http://example.com/ main'
+        is not a complete and valid sources.list entry"]
+
+If the URL looks invalid, it fails:
+
+    >>> print ppa_archive_view.validate_external_dependencies(
+    ...     "deb http://example.com/ karmic universe\n"
+    ...     "deb example.com/ karmic main")
+    ['deb example.com/ karmic main: Invalid URL']

=== modified file 'lib/lp/soyuz/configure.zcml'
--- lib/lp/soyuz/configure.zcml	2009-10-28 14:42:40 +0000
+++ lib/lp/soyuz/configure.zcml	2009-11-03 18:13:42 +0000
@@ -399,8 +399,8 @@
         <require
             permission="launchpad.Commercial"
             set_attributes="authorized_size buildd_secret
-                            enabled private require_virtualized
-                            relative_build_score"/>
+                            enabled external_dependencies private
+                            require_virtualized relative_build_score "/>
         <require
             permission="launchpad.Admin"
             set_attributes="distribution name signing_key"/>
@@ -856,4 +856,12 @@
                 new"/>
     </securedutility>
 
+    <!-- PackagesetGroup -->
+    <class
+        class="lp.soyuz.model.packagesetgroup.PackagesetGroup">
+        <allow
+            interface="lp.soyuz.interfaces.packagesetgroup.IPackagesetGroup"/>
+    </class>
+
+
 </configure>

=== modified file 'lib/lp/soyuz/doc/archive-dependencies.txt'
--- lib/lp/soyuz/doc/archive-dependencies.txt	2009-08-28 07:34:44 +0000
+++ lib/lp/soyuz/doc/archive-dependencies.txt	2009-11-03 18:13:40 +0000
@@ -441,38 +441,27 @@
 
 == External build dependencies ==
 
-Via a static configuration change, any PPA hosted in launchpad can be
+Via an administrator change, any PPA hosted in launchpad can be
 assigned to one or more 'external' build dependencies additionally to
 the internal ones.
 
-There is a configuration category called 'ppa' which can be extended
-for any hosted PPA. They are named as following:
-
- [ppa.<owner_name>_<ppa_name>]
-
-The 'ppa' categories contain the 'dependencies' field, which is a
-multi-line string listing the external dependencies in the debian
-sources_list format.
-
- deb [user:pass@]<host>[/path] %(series)s[-pocket] [components]
+There is a column on IArchive called 'external_dependencies' which can be set
+for any hosted PPA.  It is a string listing the comma-separated external
+dependencies in the debian sources_list format.
+
+ deb http[s]://[user:pass@]<host>[/path] %(series)s[-pocket] [components]
 
 The '%(series)s' part is optional and will be replaced on-the-fly with
 the series name for the build record being dispatched.
 
-We will create a configuration for Celso's PPA.
-
-    >>> from canonical.config import config
-    >>> cprov_deps = """
-    ... [ppa.cprov_ppa]
-    ... dependencies:
-    ...   deb http://user:pass@repository zoing everything
-    ...   deb http://user:pass@repository %(series)s public private
-    ...   deb http://user:pass@repository %(series)s-extra public
-    ... """
-    >>> config.push('test_deps', cprov_deps)
-
-Configuration in place, now builds in Celso's PPA will use the
-external dependencies.
+We will create some dependencies for Celso's PPA.
+
+    >>> cprov.archive.external_dependencies = (
+    ... "deb http://user:pass@repository zoing everything\n"
+    ... "deb http://user:pass@repository %(series)s public private\n"
+    ... "deb http://user:pass@repository %(series)s-extra public")
+
+Now builds in Celso's PPA will use the external dependencies.
 
     >>> print_building_sources_list(a_build)
     deb http://ftpmaster.internal/ubuntu hoary
@@ -486,6 +475,3 @@
     deb http://user:pass@repository hoary-extra public
     deb http://user:pass@repository zoing everything
 
-Tests done, we can remove the extra configuration content we've added.
-
-    >>> unused = config.pop('test_deps')

=== modified file 'lib/lp/soyuz/doc/archive.txt'
--- lib/lp/soyuz/doc/archive.txt	2009-10-13 16:12:10 +0000
+++ lib/lp/soyuz/doc/archive.txt	2009-11-03 18:13:41 +0000
@@ -58,11 +58,11 @@
     >>> cprov_archive.failed_count
     1
 
-relative_build_score is a property that can be set only by LP admins and read
-by anyone.  It is a signed integer that represents a delta to all the build
-scores for builds done in the archive.
+relative_build_score and external_dependencies are properties that can be set
+only by LP admins and read by anyone.
 
-The default value is zero:
+relative_build_score is a signed integer that represents a delta to all the
+build scores for builds done in the archive.  The default value is zero:
 
     >>> cprov_archive.relative_build_score
     0
@@ -74,10 +74,28 @@
     ...
     Unauthorized: (..., 'relative_build_score', 'launchpad.Commercial')
 
-As a Launchpad admin, it will work.
+external_dependencies is a text field that should contain a comma-separated
+list of sources.list entries in the format:
+deb http[s]://[user:pass@]<host>[/path] %(series)s[-pocket] [components]
+where the series variable is replaced with the series name of the context
+build.  This allows an admin to set external repositories as a source for
+build dependencies on the context PPA.  Its default value is None:
+
+    >>> print cprov_archive.external_dependencies
+    None
+
+Amending it as an unprivileged user results in failure:
+
+    >>> cprov_archive.external_dependencies = "test"
+    Traceback (most recent call last):
+    ...
+    Unauthorized: (..., 'external_dependencies', 'launchpad.Commercial')
+
+As a Launchpad admin, setting these properties will work.
 
     >>> login("[e-mail]")
     >>> cprov_archive.relative_build_score = 100
+    >>> cprov_archive.external_dependencies = "test"
 
 The buildd_secret is used by the slave scanner when generating a
 sources.list entry for the builder to access a private archive.  It is

=== modified file 'lib/lp/soyuz/doc/distroarchseriesbinarypackage.txt'
--- lib/lp/soyuz/doc/distroarchseriesbinarypackage.txt	2009-09-04 12:17:11 +0000
+++ lib/lp/soyuz/doc/distroarchseriesbinarypackage.txt	2009-11-03 18:13:40 +0000
@@ -209,6 +209,7 @@
 
   >>> ubuntu.updateCompleteSourcePackageCache(
   ...    archive=cprov.archive, ztm=LaunchpadZopelessLayer.txn, log=TestLog())
+  DEBUG: ...
   DEBUG: Considering source 'pmount'
   ...
 

=== modified file 'lib/lp/soyuz/doc/package-cache.txt'
--- lib/lp/soyuz/doc/package-cache.txt	2009-08-13 13:09:34 +0000
+++ lib/lp/soyuz/doc/package-cache.txt	2009-11-03 18:13:39 +0000
@@ -163,11 +163,12 @@
 
   >>> updates = ubuntu.updateCompleteSourcePackageCache(
   ...    archive=ubuntu.main_archive, ztm=transaction, log=TestLog())
-  DEBUG: Considering source 'mozilla-firefox'
-  ...
+  DEBUG: ...
   DEBUG: Considering source 'cdrkit'
   DEBUG: Creating new source cache entry.
   ...
+  DEBUG: Considering source 'mozilla-firefox'
+  ...
 
   >>> print updates
   10
@@ -355,6 +356,7 @@
 
   >>> source_updates = ubuntu.updateCompleteSourcePackageCache(
   ...    archive=cprov.archive, ztm=transaction, log=TestLog())
+  DEBUG: ...
   DEBUG: Considering source 'pmount'
   ...
 

=== modified file 'lib/lp/soyuz/interfaces/archive.py'
--- lib/lp/soyuz/interfaces/archive.py	2009-10-26 09:43:56 +0000
+++ lib/lp/soyuz/interfaces/archive.py	2009-11-03 18:13:41 +0000
@@ -256,6 +256,18 @@
         description=_(
             "A delta to apply to all build scores for this archive."))
 
+    external_dependencies = Text(
+        title=_("External dependencies"), required=False, readonly=False,
+        description=_(
+            "Newline-separated list of repositories to be used to retrieve "
+            "any external build dependencies when building packages in this "
+            "archive, in the format:\n"
+            "deb http[s]://[user:pass@]<host>[/path] %(series)s[-pocket] "
+                "[components]\n"
+            "The series variable is replaced with the series name of the "
+            "context build.\n"
+            "NOTE: This is for migration of OEM PPAs only!"))
+
     def getSourcesForDeletion(name=None, status=None, distroseries=None):
         """All `ISourcePackagePublishingHistory` available for deletion.
 
@@ -433,8 +445,10 @@
 
     @operation_parameters(
         person=Reference(schema=IPerson),
-        packageset=TextLine(
-            title=_("Package set"), required=True),
+        # Really IPackageset, corrected in _schema_circular_imports to avoid
+        # circular import.
+        packageset=Reference(
+            Interface, title=_("Package set"), required=True),
         explicit=Bool(
             title=_("Explicit"), required=False))
     # Really IArchivePermission, set in _schema_circular_imports to avoid
@@ -444,7 +458,7 @@
         """Add a package set based permission for a person.
 
         :param person: An `IPerson` for whom you want to add permission.
-        :param packageset: An `IPackageset` or a string package set name.
+        :param packageset: An `IPackageset`.
         :param explicit: True if the package set in question requires
             specialist skills for proper handling.
 
@@ -453,8 +467,10 @@
         """
 
     @operation_parameters(
-        packageset=TextLine(
-            title=_("Package set"), required=True),
+        # Really IPackageset, corrected in _schema_circular_imports to avoid
+        # circular import.
+        packageset=Reference(
+            Interface, title=_("Package set"), required=True),
         direct_permissions=Bool(
             title=_("Ignore package set hierarchy"), required=False))
     # Really IArchivePermission, set in _schema_circular_imports to avoid
@@ -464,7 +480,7 @@
     def getUploadersForPackageset(packageset, direct_permissions=True):
         """The `ArchivePermission` records for uploaders to the package set.
 
-        :param packageset: An `IPackageset` or a string package set name.
+        :param packageset: An `IPackageset`.
         :param direct_permissions: If True, only consider permissions granted
             directly for the package set at hand. Otherwise, include any
             uploaders for package sets that include this one.
@@ -475,8 +491,10 @@
 
     @operation_parameters(
         person=Reference(schema=IPerson),
-        packageset=TextLine(
-            title=_("Package set"), required=True),
+        # Really IPackageset, corrected in _schema_circular_imports to avoid
+        # circular import.
+        packageset=Reference(
+            Interface, title=_("Package set"), required=True),
         explicit=Bool(
             title=_("Explicit"), required=False))
     @export_write_operation()
@@ -484,7 +502,7 @@
         """Revoke upload permissions for a person.
 
         :param person: An `IPerson` for whom you want to revoke permission.
-        :param packageset: An `IPackageset` or a string package set name.
+        :param packageset: An `IPackageset`.
         :param explicit: The value of the 'explicit' flag for the permission
             to be revoked.
         """
@@ -567,9 +585,13 @@
     @operation_parameters(
         sourcepackagename=TextLine(
             title=_("Source package name"), required=True),
-        person=Reference(schema=IPerson))
+        person=Reference(schema=IPerson),
+        distroseries=Reference(
+            # Really IDistroSeries, avoiding a circular import here.
+            Interface,
+            title=_("The distro series"), required=False))
     @export_read_operation()
-    def isSourceUploadAllowed(sourcepackagename, person):
+    def isSourceUploadAllowed(sourcepackagename, person, distroseries=None):
         """True if the person is allowed to upload the given source package.
 
         Return True if there exists a permission that combines
@@ -585,6 +607,9 @@
             either a string or a `ISourcePackageName`.
         :param person: An `IPerson` for whom you want to find out which
             package sets he has access to.
+        :param distroseries: The `IDistroSeries` for which to check
+            permissions. If none is supplied then `currentseries` in
+            Ubuntu is assumed.
 
         :raises NoSuchSourcePackageName: if a source package with the
             given name could not be found.

=== modified file 'lib/lp/soyuz/interfaces/archivepermission.py'
--- lib/lp/soyuz/interfaces/archivepermission.py	2009-08-03 17:10:12 +0000
+++ lib/lp/soyuz/interfaces/archivepermission.py	2009-11-03 18:13:41 +0000
@@ -258,7 +258,8 @@
             archive in question.
         """
 
-    def isSourceUploadAllowed(archive, sourcepackagename, person):
+    def isSourceUploadAllowed(
+        archive, sourcepackagename, person, distroseries=None):
         """True if the person is allowed to upload the given source package.
 
         Return True if there exists a permission that combines
@@ -275,6 +276,9 @@
             either a string or a `ISourcePackageName`.
         :param person: An `IPerson` for whom you want to find out which
             package sets he has access to.
+        :param distroseries: The `IDistroSeries` for which to check
+            permissions. If none is supplied then `currentseries` in
+            Ubuntu is assumed.
 
         :raises SourceNotFound: if a source package with the given
             name could not be found.
@@ -284,6 +288,9 @@
     def uploadersForPackageset(archive, packageset, direct_permissions=True):
         """The `ArchivePermission` records for uploaders to the package set.
 
+        Please note: if a package set *name* is passed the respective
+                     package set in the current distro series will be used.
+
         :param archive: The archive the permission applies to.
         :param packageset: An `IPackageset` or a string package set name.
         :param direct_permissions: If True only consider permissions granted
@@ -332,6 +339,9 @@
     def newPackagesetUploader(archive, person, packageset, explicit=False):
         """Create and return a new `ArchivePermission` for an uploader.
 
+        Please note: if a package set *name* is passed the respective
+                     package set in the current distro series will be used.
+
         :param archive: The archive the permission applies to.
         :param person: An `IPerson` for whom you want to add permission.
         :param packageset: An `IPackageset` or a string package set name.
@@ -379,6 +389,9 @@
     def deletePackagesetUploader(archive, person, packageset, explicit=False):
         """Revoke upload permissions for a person.
 
+        Please note: if a package set *name* is passed the respective
+                     package set in the current distro series will be used.
+
         :param archive: The archive the permission applies to.
         :param person: An `IPerson` for whom you want to revoke permission.
         :param packageset: An `IPackageset` or a string package set name.

=== modified file 'lib/lp/soyuz/interfaces/packageset.py'
--- lib/lp/soyuz/interfaces/packageset.py	2009-07-25 16:33:39 +0000
+++ lib/lp/soyuz/interfaces/packageset.py	2009-11-03 18:13:41 +0000
@@ -8,6 +8,7 @@
 __metaclass__ = type
 
 __all__ = [
+    'DuplicatePackagesetName',
     'IPackageset',
     'IPackagesetSet',
     'NoSuchPackageSet',
@@ -26,14 +27,23 @@
     operation_parameters, operation_returns_collection_of,
     operation_returns_entry, webservice_error)
 from lazr.restful.fields import Reference
+from lp.registry.interfaces.distroseries import IDistroSeries
 from lp.registry.interfaces.person import IPerson
 from lp.registry.interfaces.role import IHasOwner
+from lp.soyuz.interfaces.packagesetgroup import IPackagesetGroup
 
 
 class NoSuchPackageSet(NameLookupFailed):
     """Raised when we try to look up an PackageSet that doesn't exist."""
-    webservice_error(400) #Bad request.
-    _message_prefix = "No such packageset"
+    # Bad request.
+    webservice_error(400)
+    _message_prefix = "No such package set (in the specified distro series)"
+
+
+class DuplicatePackagesetName(Exception):
+    """Raised for packagesets with the same name and distroseries."""
+    # Bad request.
+    webservice_error(400)
 
 
 class IPackagesetViewOnly(IHasOwner):
@@ -48,7 +58,7 @@
 
     owner = exported(Reference(
         IPerson, title=_("Person"), required=True, readonly=True,
-        description=_("The person who owns the package set at hand.")))
+        description=_("The person who owns this package set.")))
 
     name = exported(TextLine(
         title=_('Valid package set name'),
@@ -58,6 +68,18 @@
         title=_("Description"), required=True, readonly=True,
         description=_("The description for the package set at hand.")))
 
+    distroseries = exported(Reference(
+        IDistroSeries, title=_("Distribution series"), required=True,
+        readonly=True,
+        description=_(
+            "The distroseries to which this package set is related.")))
+
+    packagesetgroup = Reference(
+        IPackagesetGroup, title=_('Package set group'), required=True,
+        readonly=True,
+        description=_(
+            'Used internally to link package sets across distro series.'))
+
     def sourcesIncluded(direct_inclusion=False):
         """Get all source names associated with this package set.
 
@@ -195,6 +217,16 @@
             names.
         """
 
+    @operation_returns_collection_of(Interface)
+    @export_read_operation()
+    def relatedSets():
+        """Get all package sets related to this one.
+
+        Return all package sets that are related to this one.
+
+        :return: A (potentially empty) sequence of `IPackageset` instances.
+        """
+
 
 class IPackagesetEdit(Interface):
     """A writeable interface for package sets."""
@@ -316,15 +348,31 @@
             title=_('Package set description'), required=True),
         owner=Reference(
             IPerson, title=_("Person"), required=True, readonly=True,
-            description=_("The person who owns the package set at hand.")))
+            description=_("The person who owns this package set.")),
+        distroseries=Reference(
+            IDistroSeries, title=_("Distroseries"), required=False,
+            readonly=True, description=_(
+                "The distribution series to which the packageset "
+                "is related.")),
+        related_set=Reference(
+            IPackageset, title=_("Related package set"), required=False,
+            readonly=True, description=_(
+                "The new package set will share the package set group "
+                "with this one.")))
     @export_factory_operation(IPackageset, [])
-    def new(name, description, owner):
+    def new(name, description, owner, distroseries=None, related_set=None):
         """Create a new package set.
 
         :param name: the name of the package set to be created.
         :param description: the description for the package set to be created.
         :param owner: the owner of the package set to be created.
+        :param distroseries: the distroseries to which the new packageset
+            is related. Defaults to the current Ubuntu series.
+        :param related_set: the newly created package set is to be related to
+            `related_set` (by being placed in the same package group).
 
+        :raises DuplicatePackagesetName: if a package set with the same `name`
+            exists in `distroseries` already.
         :return: a newly created `IPackageset`.
         """
 
@@ -332,10 +380,12 @@
         name=TextLine(title=_('Package set name'), required=True))
     @operation_returns_entry(IPackageset)
     @export_read_operation()
-    def getByName(name):
+    def getByName(name, distroseries=None):
         """Return the single package set with the given name (if any).
 
         :param name: the name of the package set sought.
+        :param distroseries: the distroseries to which the new packageset
+            is related. Defaults to the current Ubuntu series.
 
         :return: An `IPackageset` instance or None.
         """

=== added file 'lib/lp/soyuz/interfaces/packagesetgroup.py'
--- lib/lp/soyuz/interfaces/packagesetgroup.py	1970-01-01 00:00:00 +0000
+++ lib/lp/soyuz/interfaces/packagesetgroup.py	2009-11-03 18:13:43 +0000
@@ -0,0 +1,41 @@
+# Copyright 2009 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+"""Packageset Group interface."""
+
+__metaclass__ = type
+
+__all__ = [
+    'IPackagesetGroup',
+    ]
+
+from zope.schema import Datetime, Int
+
+from lazr.restful.fields import Reference
+
+from canonical.launchpad import _
+from lp.registry.interfaces.person import IPerson
+from lp.registry.interfaces.role import IHasOwner
+
+
+class IPackagesetGroup(IHasOwner):
+    """A group of related package sets across distroseries' 
+
+    This class is used internally to group related packagesets across
+    distroseries.  For example, if in Karmic there is a 'gnome-games'
+    package set, and this package set is cloned initially for Lucid,
+    then both packagesets would refer to the same packageset-group.
+
+    Packageset-groups are not exposed at all.  The date_created and
+    owner fields are present for internal use only.
+    """
+    id = Int(title=_('ID'), required=True, readonly=True)
+
+    date_created = Datetime(
+        title=_("Date Created"), required=True, readonly=True,
+        description=_("The creation date/time for this packageset group."))
+
+    owner = Reference(
+        IPerson, title=_("Person"), required=True, readonly=True,
+        description=_("The person who created this packageset group."))
+

=== modified file 'lib/lp/soyuz/model/archive.py'
--- lib/lp/soyuz/model/archive.py	2009-10-26 09:43:56 +0000
+++ lib/lp/soyuz/model/archive.py	2009-11-03 18:13:42 +0000
@@ -174,6 +174,12 @@
     relative_build_score = IntCol(
         dbName='relative_build_score', notNull=True, default=0)
 
+    # This field is specifically and only intended for OEM migration to
+    # Launchpad and should be re-examined in October 2010 to see if it
+    # is still relevant.
+    external_dependencies = StringCol(
+        dbName='external_dependencies', notNull=False, default=None)
+
     def _init(self, *args, **kw):
         """Provide the right interface for URL traversal."""
         SQLBase._init(self, *args, **kw)
@@ -998,11 +1004,12 @@
         return permission_set.packagesetsForSource(
             self, sourcepackagename, direct_permissions)
 
-    def isSourceUploadAllowed(self, sourcepackagename, person):
+    def isSourceUploadAllowed(
+        self, sourcepackagename, person, distroseries=None):
         """See `IArchive`."""
         permission_set = getUtility(IArchivePermissionSet)
         return permission_set.isSourceUploadAllowed(
-            self, sourcepackagename, person)
+            self, sourcepackagename, person, distroseries)
 
     def getFileByName(self, filename):
         """See `IArchive`."""

=== modified file 'lib/lp/soyuz/model/archivepermission.py'
--- lib/lp/soyuz/model/archivepermission.py	2009-07-28 21:52:56 +0000
+++ lib/lp/soyuz/model/archivepermission.py	2009-11-03 18:13:43 +0000
@@ -22,6 +22,7 @@
 from canonical.database.enumcol import EnumCol
 from canonical.database.sqlbase import sqlvalues, SQLBase
 
+from lp.registry.interfaces.distribution import IDistributionSet
 from lp.soyuz.interfaces.archive import ComponentNotFound
 from lp.soyuz.interfaces.archivepermission import (
     ArchivePermissionType, IArchivePermission, IArchivePermissionSet,
@@ -312,9 +313,13 @@
     def _nameToPackageset(self, packageset):
         """Helper to convert a possible string name to IPackageset."""
         if isinstance(packageset, basestring):
+            # A package set name was passed, assume the current distro series.
+            ubuntu = getUtility(IDistributionSet).getByName('ubuntu')
             name = packageset
             store = IStore(Packageset)
-            packageset = store.find(Packageset, name=name).one()
+            packageset = store.find(
+                Packageset, name=name,
+                distroseries=ubuntu.currentseries).one()
             if packageset is not None:
                 return packageset
             else:
@@ -475,48 +480,56 @@
                 ''', (sourcepackagename.id, archive.id)))
         return rset
 
-    def isSourceUploadAllowed(self, archive, sourcepackagename, person):
+    def isSourceUploadAllowed(
+        self, archive, sourcepackagename, person, distroseries=None):
         """See `IArchivePermissionSet`."""
         sourcepackagename = self._nameToSourcePackageName(sourcepackagename)
         store = IStore(ArchivePermission)
+        if distroseries is None:
+            ubuntu = getUtility(IDistributionSet).getByName('ubuntu')
+            distroseries = ubuntu.currentseries
 
         # Put together the parameters for the query that follows.
         archive_params = (ArchivePermissionType.UPLOAD, archive.id)
+        permission_params = (sourcepackagename.id, person.id, distroseries.id)
         query_params = (
             # Query parameters for the first WHERE clause.
-            (archive.id, sourcepackagename.id) +
+            (archive.id, distroseries.id, sourcepackagename.id) +
             # Query parameters for the second WHERE clause.
-            (sourcepackagename.id,) + (person.id,) + archive_params + 
+            permission_params + archive_params + 
             # Query parameters for the third WHERE clause.
-            (sourcepackagename.id,) + (person.id,) + archive_params)
+            permission_params + archive_params)
 
         query = '''
         SELECT CASE
           WHEN (
             SELECT COUNT(ap.id)
-            FROM packagesetsources pss, archivepermission ap
+            FROM packagesetsources pss, archivepermission ap, packageset ps
             WHERE
               ap.archive = %s AND ap.explicit = TRUE
+              AND ap.packageset = ps.id AND ps.distroseries = %s
               AND pss.sourcepackagename = %s
               AND pss.packageset = ap.packageset) > 0
           THEN (
             SELECT COUNT(ap.id)
             FROM
-              packagesetsources pss, archivepermission ap,
+              packagesetsources pss, archivepermission ap, packageset ps, 
               teamparticipation tp
             WHERE
               pss.sourcepackagename = %s
               AND ap.person = tp.team AND tp.person = %s
+              AND ap.packageset = ps.id AND ps.distroseries = %s
               AND pss.packageset = ap.packageset AND ap.explicit = TRUE
               AND ap.permission = %s AND ap.archive = %s)
           ELSE (
             SELECT COUNT(ap.id)
             FROM
-              packagesetsources pss, archivepermission ap,
+              packagesetsources pss, archivepermission ap, packageset ps,
               teamparticipation tp, flatpackagesetinclusion fpsi
             WHERE
               pss.sourcepackagename = %s
               AND ap.person = tp.team AND tp.person = %s
+              AND ap.packageset = ps.id AND ps.distroseries = %s
               AND pss.packageset = fpsi.child AND fpsi.parent = ap.packageset
               AND ap.permission = %s AND ap.archive = %s)
         END AS number_of_permitted_package_sets;

=== modified file 'lib/lp/soyuz/model/packageset.py'
--- lib/lp/soyuz/model/packageset.py	2009-07-25 16:33:39 +0000
+++ lib/lp/soyuz/model/packageset.py	2009-11-03 18:13:42 +0000
@@ -6,6 +6,7 @@
 
 import pytz
 
+from storm.exceptions import IntegrityError
 from storm.expr import In, SQL
 from storm.locals import DateTime, Int, Reference, Storm, Unicode
 
@@ -13,12 +14,14 @@
 from zope.interface import implements
 
 from canonical.launchpad.interfaces.lpstorm import IMasterStore, IStore
+from canonical.launchpad.webapp.interfaces import NotFoundError
+from lp.registry.interfaces.distribution import IDistributionSet
 from lp.registry.interfaces.sourcepackagename import (
     ISourcePackageName, ISourcePackageNameSet)
 from lp.registry.model.sourcepackagename import SourcePackageName
 from lp.soyuz.interfaces.packageset import (
-    IPackageset, IPackagesetSet, NoSuchPackageSet)
-
+    DuplicatePackagesetName, IPackageset, IPackagesetSet, NoSuchPackageSet)
+from lp.soyuz.model.packagesetgroup import PackagesetGroup
 
 def _order_result_set(result_set):
     """Default order for package set and source package name result sets."""
@@ -45,6 +48,12 @@
     name = Unicode(name='name', allow_none=False)
     description = Unicode(name='description', allow_none=False)
 
+    distroseries_id = Int(name='distroseries', allow_none=False)
+    distroseries = Reference(distroseries_id, 'DistroSeries.id')
+
+    packagesetgroup_id = Int(name='packagesetgroup', allow_none=False)
+    packagesetgroup = Reference(packagesetgroup_id, 'PackagesetGroup.id')
+
     def add(self, data):
         """See `IPackageset`."""
         handlers = (
@@ -279,41 +288,101 @@
 
     def addSubsets(self, names):
         """See `IPackageset`."""
-        clauses = (Packageset, In(Packageset.name, names))
+        clauses = (
+            Packageset, In(Packageset.name, names),
+            Packageset.distroseries == self.distroseries)
         self._api_add_or_remove(clauses, self._addDirectSuccessors)
 
     def removeSubsets(self, names):
         """See `IPackageset`."""
-        clauses = (Packageset, In(Packageset.name, names))
+        clauses = (
+            Packageset, In(Packageset.name, names),
+            Packageset.distroseries == self.distroseries)
         self._api_add_or_remove(clauses, self._removeDirectSuccessors)
 
+    def relatedSets(self):
+        """See `IPackageset`."""
+        store = IStore(Packageset)
+        result_set = store.find(
+            Packageset,
+            Packageset.packagesetgroup == self.packagesetgroup,
+            Packageset.id != self.id)
+        return _order_result_set(result_set)
+
 
 class PackagesetSet:
     """See `IPackagesetSet`."""
     implements(IPackagesetSet)
 
-    def new(self, name, description, owner):
+    def new(
+        self, name, description, owner, distroseries=None, related_set=None):
         """See `IPackagesetSet`."""
         store = IMasterStore(Packageset)
+
+        packagesetgroup = None
+        if related_set is not None:
+            # Use the packagesetgroup of the `related_set`.
+            packagesetgroup = related_set.packagesetgroup
+        else:
+            # We create the related internal PackagesetGroup for this
+            # packageset so that we can later see related package sets across
+            # distroserieses.
+            packagesetgroup = PackagesetGroup()
+            packagesetgroup.owner = owner
+            store.add(packagesetgroup)
+
+        if distroseries is None:
+            ubuntu = getUtility(IDistributionSet).getByName('ubuntu')
+            distroseries = ubuntu.currentseries
+
         packageset = Packageset()
+        packageset.packagesetgroup = packagesetgroup
         packageset.name = name
         packageset.description = description
         packageset.owner = owner
+
+        packageset.distroseries = distroseries
+
         store.add(packageset)
+
+        # We need to ensure that the cached statements are flushed so that
+        # the duplicate name constraint gets triggered here.
+        try:
+            store.flush()
+        except IntegrityError:
+            raise DuplicatePackagesetName()
+
         return packageset
 
     def __getitem__(self, name):
         """See `IPackagesetSet`."""
         return self.getByName(name)
 
-    def getByName(self, name):
+    def getByName(self, name, distroseries=None):
         """See `IPackagesetSet`."""
         store = IStore(Packageset)
         if not isinstance(name, unicode):
             name = unicode(name, 'utf-8')
-        package_set = store.find(Packageset, Packageset.name == name).one()
+
+        ubuntu = getUtility(IDistributionSet).getByName('ubuntu')
+        extra_args = []
+        if distroseries is not None:
+            # If the user just passed a distro series name, look it up.
+            if isinstance(distroseries, basestring):
+                try:
+                    distroseries = ubuntu[distroseries]
+                except NotFoundError:
+                    raise NoSuchPackageSet(distroseries)
+            extra_args.append(Packageset.distroseries == distroseries)
+        else:
+            extra_args.append(Packageset.distroseries == ubuntu.currentseries)
+
+        package_set = store.find(
+            Packageset, Packageset.name == name, *extra_args).one()
+
         if package_set is None:
             raise NoSuchPackageSet(name)
+
         return package_set
 
     def getByOwner(self, owner):

=== added file 'lib/lp/soyuz/model/packagesetgroup.py'
--- lib/lp/soyuz/model/packagesetgroup.py	1970-01-01 00:00:00 +0000
+++ lib/lp/soyuz/model/packagesetgroup.py	2009-11-03 18:13:41 +0000
@@ -0,0 +1,30 @@
+# Copyright 2009 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+__metaclass__ = type
+
+__all__ = [
+    'PackagesetGroup',
+    ]
+
+import pytz
+
+from storm.locals import DateTime, Int, Reference, Storm
+
+from zope.interface import implements
+
+from lp.soyuz.interfaces.packagesetgroup import IPackagesetGroup
+
+
+class PackagesetGroup(Storm):
+    """See `IPackageset`."""
+    implements(IPackagesetGroup)
+    __storm_table__ = 'PackagesetGroup'
+    id = Int(primary=True)
+
+    date_created = DateTime(
+        name='date_created', allow_none=False, tzinfo=pytz.UTC)
+
+    owner_id = Int(name='owner', allow_none=False)
+    owner = Reference(owner_id, 'Person.id')
+

=== modified file 'lib/lp/soyuz/stories/ppa/xx-ppa-workflow.txt'
--- lib/lp/soyuz/stories/ppa/xx-ppa-workflow.txt	2009-10-13 10:05:58 +0000
+++ lib/lp/soyuz/stories/ppa/xx-ppa-workflow.txt	2009-11-03 18:13:40 +0000
@@ -354,6 +354,7 @@
  * Set a maximum disk size: uploads will be rejected if the resulting
    PPA size is exceeding the authorized size.
  * Set a per-archive build score delta.
+ * Set external archive dependencies
 
 In this case, the administrator may wish to amend the PPA so that it is
 set up like the ubuntu security PPA, which is private but does not
@@ -367,6 +368,8 @@
     True
     >>> admin_browser.getControl(name="field.relative_build_score").value
     '0'
+    >>> admin_browser.getControl(name="field.external_dependencies").value
+    ''
 
     >>> admin_browser.getControl(name="field.enabled").value = False
     >>> admin_browser.getControl(name="field.private").value = True
@@ -376,6 +379,9 @@
     >>> admin_browser.getControl(name="field.authorized_size").value = '1'
     >>> admin_browser.getControl(
     ...     name="field.relative_build_score").value = '199'
+    >>> admin_browser.getControl(
+    ...     name="field.external_dependencies"
+    ...     ).value = "deb http://my.spethial.repo.com/ %(series)s main"
     >>> admin_browser.getControl("Save").click()
 
 Once confirmed the administrator is sent to the PPA page where he can
@@ -388,16 +394,33 @@
     ...     print msg
     This archive has been disabled.
 
-We need go back to the "Administer archive" page to see the build score change
-that was made:
+We need go back to the "Administer archive" page to see the build score and
+external dependencies changes that were made:
 
     >>> admin_browser.getLink("Administer archive").click()
     >>> admin_browser.getControl(name="field.relative_build_score").value
     '199'
+    >>> admin_browser.getControl(name="field.external_dependencies").value
+    'deb http://my.spethial.repo.com/ %(series)s main'
+
+The external dependencies field is validated to make sure it looks like
+a sources.list entry.  If the field fails validation an error is displayed.
+
+    >>> admin_browser.getControl(
+    ...     name="field.external_dependencies"
+    ...     ).value = "deb not_a_url"
+    >>> admin_browser.getControl("Save").click()
+    >>> for error in get_feedback_messages(admin_browser.contents):
+    ...     print error
+    There is 1 error.
+    'deb not_a_url' is not a complete and valid sources.list entry
+
 
 When the archive is private, the buildd secret must also be set, or an
 error is issued:
 
+    >>> admin_browser.getControl(
+    ...     name="field.external_dependencies").value = ""
     >>> admin_browser.getControl(name="field.private").value = True
     >>> admin_browser.getControl(name="field.buildd_secret").value = ""
     >>> admin_browser.getControl("Save").click()

=== modified file 'lib/lp/soyuz/stories/webservice/xx-packageset.txt'
--- lib/lp/soyuz/stories/webservice/xx-packageset.txt	2009-08-20 04:46:48 +0000
+++ lib/lp/soyuz/stories/webservice/xx-packageset.txt	2009-11-03 18:13:41 +0000
@@ -18,6 +18,9 @@
 Please refer to the tests contained in the file above if you are really
 interested in package sets and the complete functionality they offer.
 
+
+== General package set properties ==
+
 We start off by creating an 'umbrella' package set that will include all
 source packages.
 
@@ -52,16 +55,16 @@
 Can we access it via the webservice API as well?
 
     >>> logout()
-    >>> umbrella = webservice.get("/package-sets/umbrella").jsonBody()
+    >>> umbrella = webservice.get("/package-sets/hoary/umbrella").jsonBody()
     >>> print umbrella['self_link']
-    http://api.launchpad.dev/beta/package-sets/umbrella
+    http://api.launchpad.dev/beta/package-sets/hoary/umbrella
 
 `PackageSet`s can be looked up by name.
 
     >>> response = webservice.named_get(
     ...     '/package-sets', 'getByName', {}, name=u'umbrella')
     >>> print response.jsonBody()['self_link']
-    http://api.launchpad.dev/beta/package-sets/umbrella
+    http://api.launchpad.dev/beta/package-sets/hoary/umbrella
 
 When a `PackageSet` cannot be found, an error is returned.
 
@@ -70,9 +73,17 @@
     >>> print response
     HTTP/1.1 400 Bad Request
     ...
-    NoSuchPackageSet: No such packageset: 'not-found'.
+    No such package set (in the specified distro series): 'not-found'.
+    ...
     <BLANKLINE>
 
+Here's an example with a funny URL concoted by a "smart" user.
+
+    >>> response = webservice.get("/package-sets/lucid-plus-1/umbrella/+pwn")
+    >>> print response
+    HTTP/1.1 404 Not Found
+    ...
+
 Populate the 'umbrella' package set with source packages.
 
     >>> from canonical.launchpad.webapp.interfaces import (
@@ -81,7 +92,7 @@
     >>> store = getUtility(IStoreSelector).get(MAIN_STORE, DEFAULT_FLAVOR)
     >>> all_spns = store.find(SourcePackageName)
     >>> response = webservice.named_post(
-    ...     '/package-sets/umbrella', 'addSources', {},
+    ...     '/package-sets/hoary/umbrella', 'addSources', {},
     ...     names=[spn.name for spn in all_spns])
     >>> print response
     HTTP/1.1 200 Ok
@@ -91,7 +102,7 @@
 exist will not fail. Non-existing source package names are *ignored*.
 
     >>> response = webservice.named_post(
-    ...     '/package-sets/umbrella', 'addSources', {},
+    ...     '/package-sets/hoary/umbrella', 'addSources', {},
     ...     names=[u'does-not-exist'])
     >>> print response
     HTTP/1.1 200 Ok
@@ -99,7 +110,7 @@
     null
 
     >>> response = webservice.named_post(
-    ...     '/package-sets/umbrella', 'removeSources', {},
+    ...     '/package-sets/hoary/umbrella', 'removeSources', {},
     ...     names=[u'does-not-exist'])
     >>> print response
     HTTP/1.1 200 Ok
@@ -109,7 +120,7 @@
 Let's see what we got.
 
     >>> response = webservice.named_get(
-    ...     '/package-sets/umbrella', 'getSourcesIncluded', {})
+    ...     '/package-sets/hoary/umbrella', 'getSourcesIncluded', {})
     >>> print response
     HTTP/1.1 200 Ok
     ...
@@ -136,7 +147,7 @@
 from the 'umbrella' package set.
 
     >>> response = webservice.named_post(
-    ...     '/package-sets/umbrella', 'removeSources', {},
+    ...     '/package-sets/hoary/umbrella', 'removeSources', {},
     ...     names=["foobar", "iceweasel"])
     >>> print response
     HTTP/1.1 200 Ok
@@ -146,7 +157,7 @@
 from the list below.
 
     >>> response = webservice.named_get(
-    ...     '/package-sets/umbrella', 'getSourcesIncluded', {})
+    ...     '/package-sets/hoary/umbrella', 'getSourcesIncluded', {})
     >>> print response
     HTTP/1.1 200 Ok
     ...
@@ -176,13 +187,13 @@
 
     >>> response = webservice.get("/package-sets/")
     >>> print_payload(response)
-    http://api.launchpad.dev/beta/package-sets/umbrella
+    http://api.launchpad.dev/beta/package-sets/hoary/umbrella
 
 Package sets may include other package sets (as subsets). At this point,
 however, we only have the 'umbrella' package set. It hence has no subsets.
 
     >>> response = webservice.named_get(
-    ...     '/package-sets/umbrella', 'setsIncluded', {})
+    ...     '/package-sets/hoary/umbrella', 'setsIncluded', {})
     >>> print response
     HTTP/1.1 200 Ok
     ...
@@ -206,6 +217,50 @@
     HTTP/1.1 201 Created
     ...
 
+
+=== Package sets and distro series ===
+
+Every package set is associated with a distro series.
+
+    >>> from lazr.restful.testing.webservice import pprint_entry
+    >>> mozilla = webservice.named_get(
+    ...     '/package-sets', 'getByName', {}, name=u'mozilla').jsonBody()
+    >>> print mozilla['distroseries_link']
+    http://api.launchpad.dev/beta/ubuntu/hoary
+
+
+=== Related package sets ===
+
+When adding a package set we can specify that is to be related to another set
+that exists already.
+
+    >>> grumpy = webservice.get("/ubuntu/grumpy").jsonBody()
+    >>> print grumpy['self_link']
+    http://api.launchpad.dev/beta/ubuntu/grumpy
+
+We are adding a new 'mozilla' package set to the 'grumpy' distro series and
+it is related to 'mozilla' in 'hoary'.
+
+    >>> response = webservice.named_post(
+    ...     '/package-sets', 'new', {},
+    ...     name=u'mozilla',
+    ...     description=u'Contains all mozilla packages in grumpy',
+    ...     owner=name12['self_link'], distroseries=grumpy['self_link'],
+    ...     related_set=mozilla['self_link'])
+    >>> print response
+    HTTP/1.1 201 Created
+    ...
+
+    >>> response = webservice.named_get(
+    ...     mozilla['self_link'], 'relatedSets', {})
+    >>> print_payload(response)
+    http://api.launchpad.dev/beta/package-sets/grumpy/mozilla
+
+
+== Package set hierarchy ==
+
+More package sets are needed to set up the hierarchy described below.
+
     >>> response = webservice.named_post(
     ...     '/package-sets', 'new', {},
     ...     name=u'firefox', description=u'Contains all firefox packages',
@@ -232,6 +287,18 @@
     HTTP/1.1 201 Created
     ...
 
+The 'languagepack' package set will be removed later (in hoary). Let's add a
+set with the same name in 'grumpy' to make sure that the right one is found.
+
+    >>> response = webservice.named_post(
+    ...     '/package-sets', 'new', {},
+    ...     name=u'languagepack',
+    ...     description=u'Contains all languagepack packages',
+    ...     owner=name12['self_link'], distroseries=grumpy['self_link'])
+    >>> print response
+    HTTP/1.1 201 Created
+    ...
+
 In order to test whether methods relating to package set hierarchies were
 exposed on the Launchpad API correctly we will define the following package
 set hierarchy:
@@ -245,27 +312,27 @@
           * languagepack
 
     >>> response = webservice.named_post(
-    ...     '/package-sets/umbrella', 'addSubsets', {},
+    ...     '/package-sets/hoary/umbrella', 'addSubsets', {},
     ...     names=[u'gnome', u'mozilla'])
     >>> print response
     HTTP/1.1 200 Ok
     ...
 
     >>> response = webservice.named_post(
-    ...     '/package-sets/gnome', 'addSubsets', {}, names=[u'languagepack'])
+    ...     '/package-sets/hoary/gnome', 'addSubsets', {}, names=[u'languagepack'])
     >>> print response
     HTTP/1.1 200 Ok
     ...
 
     >>> response = webservice.named_post(
-    ...     '/package-sets/thunderbird', 'addSubsets', {},
+    ...     '/package-sets/hoary/thunderbird', 'addSubsets', {},
     ...     names=[u'languagepack'])
     >>> print response
     HTTP/1.1 200 Ok
     ...
 
     >>> response = webservice.named_post(
-    ...     '/package-sets/mozilla', 'addSubsets', {},
+    ...     '/package-sets/hoary/mozilla', 'addSubsets', {},
     ...     names=[u'firefox', u'thunderbird'])
     >>> print response
     HTTP/1.1 200 Ok
@@ -275,7 +342,7 @@
 non-existing package sets will not fail.
 
     >>> response = webservice.named_post(
-    ...     '/package-sets/thunderbird', 'addSubsets', {},
+    ...     '/package-sets/hoary/thunderbird', 'addSubsets', {},
     ...     names=[u'does-not-exist'])
     >>> print response
     HTTP/1.1 200 Ok
@@ -283,7 +350,7 @@
     null
 
     >>> response = webservice.named_post(
-    ...     '/package-sets/thunderbird', 'removeSubsets', {},
+    ...     '/package-sets/hoary/thunderbird', 'removeSubsets', {},
     ...     names=[u'does-not-exist'])
     >>> print response
     HTTP/1.1 200 Ok
@@ -293,49 +360,49 @@
 The 'umbrella' package set should have plenty of subsets now.
 
     >>> response = webservice.named_get(
-    ...     '/package-sets/umbrella', 'setsIncluded', {})
+    ...     '/package-sets/hoary/umbrella', 'setsIncluded', {})
     >>> print_payload(response)
-    http://api.launchpad.dev/beta/package-sets/firefox
-    http://api.launchpad.dev/beta/package-sets/gnome
-    http://api.launchpad.dev/beta/package-sets/languagepack
-    http://api.launchpad.dev/beta/package-sets/mozilla
-    http://api.launchpad.dev/beta/package-sets/thunderbird
+    http://api.launchpad.dev/beta/package-sets/hoary/firefox
+    http://api.launchpad.dev/beta/package-sets/hoary/gnome
+    http://api.launchpad.dev/beta/package-sets/hoary/languagepack
+    http://api.launchpad.dev/beta/package-sets/hoary/mozilla
+    http://api.launchpad.dev/beta/package-sets/hoary/thunderbird
 
 However only two of the above are direct subsets.
 
     >>> response = webservice.named_get(
-    ...     '/package-sets/umbrella', 'setsIncluded', {},
+    ...     '/package-sets/hoary/umbrella', 'setsIncluded', {},
     ...     direct_inclusion=True)
     >>> print_payload(response)
-    http://api.launchpad.dev/beta/package-sets/gnome
-    http://api.launchpad.dev/beta/package-sets/mozilla
+    http://api.launchpad.dev/beta/package-sets/hoary/gnome
+    http://api.launchpad.dev/beta/package-sets/hoary/mozilla
 
 Let's ask the question the other way around what package sets are including
 a particular subset?
 
     >>> response = webservice.named_get(
-    ...     '/package-sets/languagepack', 'setsIncludedBy', {})
+    ...     '/package-sets/hoary/languagepack', 'setsIncludedBy', {})
     >>> print_payload(response)
-    http://api.launchpad.dev/beta/package-sets/gnome
-    http://api.launchpad.dev/beta/package-sets/mozilla
-    http://api.launchpad.dev/beta/package-sets/thunderbird
-    http://api.launchpad.dev/beta/package-sets/umbrella
+    http://api.launchpad.dev/beta/package-sets/hoary/gnome
+    http://api.launchpad.dev/beta/package-sets/hoary/mozilla
+    http://api.launchpad.dev/beta/package-sets/hoary/thunderbird
+    http://api.launchpad.dev/beta/package-sets/hoary/umbrella
 
 The list of package sets that *directly* include 'languagepack' will be
 shorter because the transitive closure is ignored.
 
     >>> response = webservice.named_get(
-    ...     '/package-sets/languagepack', 'setsIncludedBy', {},
+    ...     '/package-sets/hoary/languagepack', 'setsIncludedBy', {},
     ...     direct_inclusion=True)
     >>> print_payload(response)
-    http://api.launchpad.dev/beta/package-sets/gnome
-    http://api.launchpad.dev/beta/package-sets/thunderbird
+    http://api.launchpad.dev/beta/package-sets/hoary/gnome
+    http://api.launchpad.dev/beta/package-sets/hoary/thunderbird
 
 We can remove subsets as well. In the example below 'thunderbird' will
 stop including 'languagepack'.
 
     >>> response = webservice.named_post(
-    ...     '/package-sets/thunderbird', 'removeSubsets', {},
+    ...     '/package-sets/hoary/thunderbird', 'removeSubsets', {},
     ...     names=[u'languagepack'])
     >>> print response
     HTTP/1.1 200 Ok
@@ -344,37 +411,37 @@
 And, here we go, now 'languagepack' has only one direct predecessor: 'gnome'.
 
     >>> response = webservice.named_get(
-    ...     '/package-sets/languagepack', 'setsIncludedBy', {},
+    ...     '/package-sets/hoary/languagepack', 'setsIncludedBy', {},
     ...     direct_inclusion=True)
     >>> print_payload(response)
-    http://api.launchpad.dev/beta/package-sets/gnome
+    http://api.launchpad.dev/beta/package-sets/hoary/gnome
 
 Let's add a few source packages to the 'firefox' and the 'thunderbird'
 package sets.
 
     >>> response = webservice.named_post(
-    ...     '/package-sets/firefox', 'addSources', {},
+    ...     '/package-sets/hoary/firefox', 'addSources', {},
     ...     names=['at', 'mozilla-firefox', 'language-pack-de'])
     >>> print response
     HTTP/1.1 200 Ok
     ...
 
     >>> response = webservice.named_get(
-    ...     '/package-sets/firefox', 'getSourcesIncluded', {})
+    ...     '/package-sets/hoary/firefox', 'getSourcesIncluded', {})
     >>> print response
     HTTP/1.1 200 Ok
     ...
     ["at", "language-pack-de", "mozilla-firefox"]
 
     >>> response = webservice.named_post(
-    ...     '/package-sets/thunderbird', 'addSources', {},
+    ...     '/package-sets/hoary/thunderbird', 'addSources', {},
     ...     names=['at', 'cnews', 'thunderbird', 'language-pack-de'])
     >>> print response
     HTTP/1.1 200 Ok
     ...
 
     >>> response = webservice.named_get(
-    ...     '/package-sets/thunderbird', 'getSourcesIncluded', {})
+    ...     '/package-sets/hoary/thunderbird', 'getSourcesIncluded', {})
     >>> print response
     HTTP/1.1 200 Ok
     ...
@@ -386,9 +453,9 @@
     ...     '/package-sets/', 'setsIncludingSource', {},
     ...     sourcepackagename=u'mozilla-firefox')
     >>> print_payload(response)
-    http://api.launchpad.dev/beta/package-sets/firefox
-    http://api.launchpad.dev/beta/package-sets/mozilla
-    http://api.launchpad.dev/beta/package-sets/umbrella
+    http://api.launchpad.dev/beta/package-sets/hoary/firefox
+    http://api.launchpad.dev/beta/package-sets/hoary/mozilla
+    http://api.launchpad.dev/beta/package-sets/hoary/umbrella
 
 Which package sets include the 'mozilla-firefox' source package *directly*?
 
@@ -397,8 +464,8 @@
     ...     sourcepackagename=u'mozilla-firefox',
     ...     direct_inclusion=True)
     >>> print_payload(response)
-    http://api.launchpad.dev/beta/package-sets/firefox
-    http://api.launchpad.dev/beta/package-sets/umbrella
+    http://api.launchpad.dev/beta/package-sets/hoary/firefox
+    http://api.launchpad.dev/beta/package-sets/hoary/umbrella
 
 If a non-existing source package name is passed it returns an error.
 
@@ -414,9 +481,9 @@
 What source packages are shared by the 'firefox' and the 'thunderbird'
 package sets?
 
-    >>> thunderbird = webservice.get("/package-sets/thunderbird").jsonBody()
+    >>> thunderbird = webservice.get("/package-sets/hoary/thunderbird").jsonBody()
     >>> response = webservice.named_get(
-    ...     '/package-sets/firefox', 'getSourcesSharedBy', {},
+    ...     '/package-sets/hoary/firefox', 'getSourcesSharedBy', {},
     ...     other_package_set=thunderbird['self_link'])
     >>> print response
     HTTP/1.1 200 Ok
@@ -426,16 +493,16 @@
 How about the complement set i.e. the packages not shared?
 
     >>> response = webservice.named_get(
-    ...     '/package-sets/firefox', 'getSourcesNotSharedBy', {},
+    ...     '/package-sets/hoary/firefox', 'getSourcesNotSharedBy', {},
     ...     other_package_set=thunderbird['self_link'])
     >>> print response
     HTTP/1.1 200 Ok
     ...
     ["mozilla-firefox"]
 
-    >>> firefox = webservice.get("/package-sets/firefox").jsonBody()
+    >>> firefox = webservice.get("/package-sets/hoary/firefox").jsonBody()
     >>> response = webservice.named_get(
-    ...     '/package-sets/thunderbird', 'getSourcesNotSharedBy', {},
+    ...     '/package-sets/hoary/thunderbird', 'getSourcesNotSharedBy', {},
     ...     other_package_set=firefox['self_link'])
     >>> print response
     HTTP/1.1 200 Ok
@@ -461,7 +528,7 @@
     >>> response = webservice.named_post(
     ...     ubuntu['main_archive_link'], 'newPackagesetUploader', {},
     ...     person=name12['self_link'],
-    ...     packageset='firefox')
+    ...     packageset=firefox['self_link'])
     >>> print response
     HTTP/1.1 201 Created
     ...
@@ -489,7 +556,7 @@
     >>> response = webservice.named_post(
     ...     ubuntu['main_archive_link'], 'newPackagesetUploader', {},
     ...     person=name12['self_link'],
-    ...     packageset='mozilla')
+    ...     packageset=mozilla['self_link'])
     >>> print response
     HTTP/1.1 201 Created
     ...
@@ -499,7 +566,7 @@
 
     >>> response = webservice.named_get(
     ...     ubuntu['main_archive_link'], 'getUploadersForPackageset', {},
-    ...     packageset='firefox')
+    ...     packageset=firefox['self_link'])
     >>> print_payload(response)
     http://.../+archive/primary/+upload/name12?type=packageset&item=firefox
 
@@ -508,7 +575,7 @@
 
     >>> response = webservice.named_get(
     ...     ubuntu['main_archive_link'], 'getUploadersForPackageset', {},
-    ...     packageset='firefox', direct_permissions=False)
+    ...     packageset=firefox['self_link'], direct_permissions=False)
     >>> print_payload(response)
     http://.../+archive/primary/+upload/name12?type=packageset&item=firefox
     http://.../+archive/primary/+upload/name12?type=packageset&item=mozilla
@@ -518,7 +585,7 @@
     >>> response = webservice.named_post(
     ...     ubuntu['main_archive_link'], 'deletePackagesetUploader', {},
     ...     person=name12['self_link'],
-    ...     packageset='mozilla')
+    ...     packageset=mozilla['self_link'])
     >>> print response
     HTTP/1.1 200 Ok
     ...
@@ -528,7 +595,7 @@
 
     >>> response = webservice.named_get(
     ...     ubuntu['main_archive_link'], 'getUploadersForPackageset', {},
-    ...     packageset='firefox', direct_permissions=False)
+    ...     packageset=firefox['self_link'], direct_permissions=False)
     >>> print_payload(response)
     http://.../+archive/primary/+upload/name12?type=packageset&item=firefox
 
@@ -538,7 +605,7 @@
     >>> response = webservice.named_post(
     ...     ubuntu['main_archive_link'], 'newPackagesetUploader', {},
     ...     person=cprov['self_link'],
-    ...     packageset='mozilla')
+    ...     packageset=mozilla['self_link'])
     >>> print response
     HTTP/1.1 201 Created
     ...
@@ -546,7 +613,7 @@
     >>> response = webservice.named_post(
     ...     ubuntu['main_archive_link'], 'newPackagesetUploader', {},
     ...     person=cprov['self_link'],
-    ...     packageset='thunderbird')
+    ...     packageset=thunderbird['self_link'])
     >>> print response
     HTTP/1.1 201 Created
     ...
@@ -599,6 +666,39 @@
     ...
     true
 
+Archive permissions have distro series scope. We did not specify a distro
+series in the query above. Hence the `currentseries` in Ubuntu is assumed
+('hoary').
+The following query (note the additional 'distroseries' parameter) is
+thus equivalent:
+
+    >>> print ubuntu['current_series_link']
+    http://api.launchpad.dev/beta/ubuntu/hoary
+    >>> hoary = webservice.get("/ubuntu/hoary").jsonBody()
+    >>> print hoary['self_link']
+    http://api.launchpad.dev/beta/ubuntu/hoary
+
+    >>> response = webservice.named_get(
+    ...     ubuntu['main_archive_link'], 'isSourceUploadAllowed',
+    ...     {}, sourcepackagename='mozilla-firefox',
+    ...     person=cprov['self_link'], distroseries=hoary['self_link'])
+    >>> print(response)
+    HTTP/1.1 200 Ok
+    ...
+    true
+
+Since cprov's upload permission is limited to the current distro series
+('hoary') checking the same permission for 'grumpy' will fail.
+
+    >>> response = webservice.named_get(
+    ...     ubuntu['main_archive_link'], 'isSourceUploadAllowed',
+    ...     {}, sourcepackagename='mozilla-firefox',
+    ...     person=cprov['self_link'], distroseries=grumpy['self_link'])
+    >>> print(response)
+    HTTP/1.1 200 Ok
+    ...
+    false
+
 'name12' should not be allowed to upload the 'thunderbird' source package.
 
     >>> response = webservice.named_get(
@@ -610,6 +710,80 @@
     ...
     false
 
+Let's create a (related) package set in 'grumpy' and authorize 'name12' to
+upload to it.
+
+This will fail since 'name12' has no permissions applying to 'grumpy' yet.
+
+    >>> response = webservice.named_get(
+    ...     ubuntu['main_archive_link'], 'isSourceUploadAllowed',
+    ...     {}, sourcepackagename='thunderbird',
+    ...     person=name12['self_link'], distroseries=grumpy['self_link'])
+    >>> print(response)
+    HTTP/1.1 200 Ok
+    ...
+    false
+
+Create a new package set ('grouchy-thunderbird') in 'grumpy'.
+
+    >>> response = webservice.named_post(
+    ...     '/package-sets', 'new', {},
+    ...     name=u'grouchy-thunderbird',
+    ...     description=u'Contains all thunderbird packages in grumpy',
+    ...     owner=name12['self_link'], distroseries=grumpy['self_link'],
+    ...     related_set=thunderbird['self_link'])
+    >>> print response
+    HTTP/1.1 201 Created
+    ...
+
+    >>> response = webservice.named_get(
+    ...     thunderbird['self_link'], 'relatedSets', {})
+    >>> print_payload(response)
+    http://api.launchpad.dev/beta/package-sets/grumpy/grouchy-thunderbird
+
+Associate 'grouchy-thunderbird' with the appropriate source packages.
+
+    >>> response = webservice.named_post(
+    ...     '/package-sets/grumpy/grouchy-thunderbird', 'addSources', {},
+    ...     names=['thunderbird', 'language-pack-de'])
+    >>> print response
+    HTTP/1.1 200 Ok
+    ...
+
+Grant 'name12' upload permissions to 'grouchy-thunderbird' in 'grumpy'.
+
+    >>> grouchy_bird = webservice.get(
+    ...     "/package-sets/grumpy/grouchy-thunderbird").jsonBody()
+
+    >>> response = webservice.named_post(
+    ...     ubuntu['main_archive_link'], 'newPackagesetUploader', {},
+    ...     person=name12['self_link'],
+    ...     packageset=grouchy_bird['self_link'])
+    >>> print response
+    HTTP/1.1 201 Created
+    ...
+
+Does the new archive permission show up?
+
+    >>> response = webservice.named_get(
+    ...     ubuntu['main_archive_link'], 'getPackagesetsForUploader', {},
+    ...     person=name12['self_link'])
+    >>> print_payload(response)
+    http://...+archive/primary/+upload/name12?type=packageset&item=firefox
+    http://...+archive/primary/+upload/name12?type=packageset&item=grouchy-thunderbird
+
+And now 'name12' should be authorized to upload source package
+'thunderbird' in 'grumpy'.
+
+    >>> response = webservice.named_get(
+    ...     ubuntu['main_archive_link'], 'isSourceUploadAllowed',
+    ...     {}, sourcepackagename='thunderbird',
+    ...     person=name12['self_link'], distroseries=grumpy['self_link'])
+    >>> print(response)
+    HTTP/1.1 200 Ok
+    ...
+    true
+
 Sometimes it's also interesting to see what package set based upload
 permissions apply to a source package irrespective of the principal.
 

=== modified file 'lib/lp/soyuz/templates/person-archive-subscriptions.pt'
--- lib/lp/soyuz/templates/person-archive-subscriptions.pt	2009-09-18 07:46:03 +0000
+++ lib/lp/soyuz/templates/person-archive-subscriptions.pt	2009-11-03 18:13:39 +0000
@@ -34,7 +34,7 @@
                 </td>
                 <td>
                   <tal:active condition="token">
-                    <a tal:attributes="href subscription/fmt:url" class="info">
+                    <a tal:attributes="href subscription/fmt:url" class="sprite info">
                       View
                     </a>
                   </tal:active>

=== added file 'lib/lp/soyuz/tests/test_packageset.py'
--- lib/lp/soyuz/tests/test_packageset.py	1970-01-01 00:00:00 +0000
+++ lib/lp/soyuz/tests/test_packageset.py	2009-11-03 18:13:43 +0000
@@ -0,0 +1,187 @@
+# Copyright 2009 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+"""Test Packageset features."""
+
+from zope.component import getUtility
+
+from canonical.testing import LaunchpadZopelessLayer
+
+from lp.testing import TestCaseWithFactory
+from lp.registry.interfaces.distribution import IDistributionSet
+from lp.registry.interfaces.distroseries import DistroSeriesStatus
+from lp.soyuz.interfaces.packageset import (
+    DuplicatePackagesetName, IPackagesetSet)
+
+
+class TestPackagesetSet(TestCaseWithFactory):
+
+    layer = LaunchpadZopelessLayer
+
+    def setUp(self):
+        """Setup a distribution with multiple distroseries."""
+        super(TestPackagesetSet, self).setUp()
+        self.distribution = getUtility(IDistributionSet).getByName(
+            'ubuntu')
+        self.distroseries_current = self.distribution.currentseries
+        self.distroseries_experimental = self.factory.makeDistroRelease(
+            distribution = self.distribution, name="experimental",
+            status=DistroSeriesStatus.EXPERIMENTAL)
+
+        self.person1 = self.factory.makePerson(
+            name='hacker', displayname=u'Happy Hacker')
+
+        self.packageset_set = getUtility(IPackagesetSet)
+
+    def test_new_defaults_to_current_distroseries(self):
+        # If the distroseries is not provided, the current development
+        # distroseries will be assumed.
+        packageset = self.packageset_set.new(
+            u'kernel', u'Contains all OS kernel packages', self.person1)
+
+        self.failUnlessEqual(
+            self.distroseries_current, packageset.distroseries)
+
+    def test_new_with_specified_distroseries(self):
+        # A distroseries can be provided when creating a package set.
+        packageset = self.packageset_set.new(
+            u'kernel', u'Contains all OS kernel packages', self.person1,
+            distroseries=self.distroseries_experimental)
+
+        self.failUnlessEqual(
+            self.distroseries_experimental, packageset.distroseries)
+
+    def test_new_creates_new_packageset_group(self):
+        # Creating a new packageset should also create a new packageset
+        # group with the same owner.
+        packageset = self.packageset_set.new(
+            u'kernel', u'Contains all OS kernel packages', self.person1,
+            distroseries=self.distroseries_experimental)
+
+        self.failUnlessEqual(
+            self.person1, packageset.packagesetgroup.owner)
+
+    def test_new_duplicate_name_for_same_distroseries(self):
+        # Creating a packageset with a duplicate name for the
+        # given distroseries will fail.
+        packageset = self.packageset_set.new(
+            u'kernel', u'Contains all OS kernel packages', self.person1,
+            distroseries=self.distroseries_experimental)
+
+        self.failUnlessRaises(
+            DuplicatePackagesetName, self.packageset_set.new,
+            u'kernel', u'A packageset with a duplicate name', self.person1,
+            distroseries=self.distroseries_experimental)
+
+    def test_new_duplicate_name_for_different_distroseries(self):
+        # Creating a packageset with a duplicate name but for a different
+        # series is no problem.
+        packageset = self.packageset_set.new(
+            u'kernel', u'Contains all OS kernel packages', self.person1)
+
+        packageset2 = self.packageset_set.new(
+            u'kernel', u'A packageset with a duplicate name', self.person1,
+            distroseries=self.distroseries_experimental)
+        self.assertEqual(packageset.name, packageset2.name)
+
+    def test_new_related_packageset(self):
+        # Creating a new package set while specifying a `related_set` should
+        # have the effect that the former ends up in the same group as the
+        # latter.
+        pset1 = self.packageset_set.new(
+            u'kernel', u'Contains all OS kernel packages', self.person1)
+
+        pset2 = self.packageset_set.new(
+            u'kernel', u'A related package set.', self.person1,
+            distroseries=self.distroseries_experimental, related_set=pset1)
+        self.assertEqual(pset1.packagesetgroup, pset2.packagesetgroup)
+
+    def test_get_by_name_in_current_distroseries(self):
+        # IPackagesetSet.getByName() will return the package set in the
+        # current distroseries if the optional `distroseries` parameter is
+        # omitted.
+        pset1 = self.packageset_set.new(
+            u'kernel', u'Contains all OS kernel packages', self.person1)
+        pset2 = self.packageset_set.new(
+            u'kernel', u'A related package set.', self.person1,
+            distroseries=self.distroseries_experimental, related_set=pset1)
+        pset_found = getUtility(IPackagesetSet).getByName('kernel')
+        self.assertEqual(pset1, pset_found)
+
+    def test_get_by_name_in_specified_distroseries(self):
+        # IPackagesetSet.getByName() will return the package set in the
+        # specified distroseries.
+        pset1 = self.packageset_set.new(
+            u'kernel', u'Contains all OS kernel packages', self.person1)
+        pset2 = self.packageset_set.new(
+            u'kernel', u'A related package set.', self.person1,
+            distroseries=self.distroseries_experimental, related_set=pset1)
+        pset_found = getUtility(IPackagesetSet).getByName(
+            'kernel', distroseries=self.distroseries_experimental)
+        self.assertEqual(pset2, pset_found)
+
+
+class TestPackageset(TestCaseWithFactory):
+
+    layer = LaunchpadZopelessLayer
+
+    def setUp(self):
+        """Setup a distribution with multiple distroseries."""
+        super(TestPackageset, self).setUp()
+        self.distribution = getUtility(IDistributionSet).getByName(
+            'ubuntu')
+        self.distroseries_current = self.distribution.currentseries
+        self.distroseries_experimental = self.factory.makeDistroRelease(
+            distribution = self.distribution, name="experimental",
+            status=DistroSeriesStatus.EXPERIMENTAL)
+        self.distroseries_experimental2 = self.factory.makeDistroRelease(
+            distribution = self.distribution, name="experimental2",
+            status=DistroSeriesStatus.EXPERIMENTAL)
+
+        self.person1 = self.factory.makePerson(
+            name='hacker', displayname=u'Happy Hacker')
+
+        self.packageset_set = getUtility(IPackagesetSet)
+
+    def test_no_related_sets(self):
+        # If the package set is the only one in the group the result set
+        # returned by relatedSets() is empty.
+        packageset = self.packageset_set.new(
+            u'kernel', u'Contains all OS kernel packages', self.person1)
+
+        self.failUnlessEqual(packageset.relatedSets().count(), 0)
+
+    def test_related_set_found(self):
+        # Creating a new package set while specifying a `related_set` should
+        # have the effect that the former ends up in the same group as the
+        # latter.
+
+        # The original package set.
+        pset1 = self.packageset_set.new(
+            u'kernel', u'Contains all OS kernel packages', self.person1)
+
+        # A related package set.
+        pset2 = self.packageset_set.new(
+            u'kernel', u'A related package set.', self.person1,
+            distroseries=self.distroseries_experimental, related_set=pset1)
+        self.assertEqual(pset1.packagesetgroup, pset2.packagesetgroup)
+
+        # An unrelated package set with the same name.
+        pset3 = self.packageset_set.new(
+            u'kernel', u'Unrelated package set.', self.person1,
+            distroseries=self.distroseries_experimental2)
+        self.assertNotEqual(pset2.packagesetgroup, pset3.packagesetgroup)
+
+        # Make sure 'pset2' is related to 'pset1'.
+        related = pset1.relatedSets()
+        self.assertEqual(related.count(), 1)
+        self.assertEqual(related[0], pset2)
+
+        # And the other way around ..
+        related = pset2.relatedSets()
+        self.assertEqual(related.count(), 1)
+        self.assertEqual(related[0], pset1)
+
+        # Unsurprisingly, the unrelated package set is not associated with any
+        # other package set.
+        self.failUnlessEqual(pset3.relatedSets().count(), 0)

=== modified file 'scripts/ftpmaster-tools/_syncorigins.py'
--- scripts/ftpmaster-tools/_syncorigins.py	2009-07-23 02:33:14 +0000
+++ scripts/ftpmaster-tools/_syncorigins.py	2009-11-03 18:13:42 +0000
@@ -12,7 +12,7 @@
 "debian": {
     "name": "Debian",
     "url": "http://ftp.debian.org/debian/",
-    "default suite": "unstable",
+    "default suite": "testing",
     "default component": "main",
     "dsc": "must be signed and valid"
     },

=== modified file 'utilities/pgmassacre.py'
--- utilities/pgmassacre.py	2009-06-24 20:15:50 +0000
+++ utilities/pgmassacre.py	2009-11-03 18:13:41 +0000
@@ -11,6 +11,7 @@
 
 # Nothing but system installed libraries - this script sometimes
 # gets installed standalone with no Launchpad tree available.
+from distutils.version import LooseVersion
 import sys
 import time
 import psycopg2
@@ -184,12 +185,20 @@
     error_msg = None
     con = connect()
     con.set_isolation_level(0) # Autocommit required for CREATE DATABASE.
+    create_db_cmd = """
+        CREATE DATABASE %s WITH ENCODING='UTF8' TEMPLATE=%s
+        """ % (database, template)
+    # 8.4 allows us to create empty databases with a different locale
+    # to template1 by using the template0 database as a template.
+    # We make use of this feature so we don't have to care what locale
+    # was used to create the database cluster rather than requiring it
+    # to be rebuilt in the C locale.
+    if pg_version >= LooseVersion("8.4.0") and template == "template0":
+        create_db_cmd += "LC_COLLATE='C' LC_CTYPE='C'"
     while now < start + 20:
         cur = con.cursor()
         try:
-            cur.execute(
-                "CREATE DATABASE %s WITH ENCODING='UTF8' TEMPLATE=%s"
-                % (database, template))
+            cur.execute(create_db_cmd)
             con.close()
             return 0
         except psycopg2.Error, exception:
@@ -219,6 +228,7 @@
 
 
 options = None
+pg_version = None # LooseVersion - Initialized in main()
 
 
 def main():
@@ -243,6 +253,12 @@
 
     con = connect()
     cur = con.cursor()
+
+    # Store the database version for version specific code.
+    global pg_version
+    cur.execute("show server_version")
+    pg_version = LooseVersion(cur.fetchone()[0])
+
     # Ensure the template database exists.
     if options.template is not None:
         cur.execute(