Merge lp:~cjwatson/britney/honour-updates into lp:~ubuntu-release/britney/britney1-ubuntu

[Colin Watson]

Include $SERIES-updates in the baseline Sources/Packages data files.

For stable releases, we need to include $SERIES-updates in the baseline Sources/Packages data files that britney.py itself uses for suite comparison, because -proposed is allowed to depend on things only in -updates. I've checked that britney2 uses the highest version of a package it finds in any suite.

=== modified file 'britney'
--- britney	2015-02-18 15:37:12 +0000
+++ britney	2015-02-19 13:50:45 +0000
@@ -232,14 +232,23 @@
 pkg_lists () {
   for suite in $SERIES $SERIES-proposed; do
       mkdir -p $1/$suite
-      suite_dir=$FTP_MIRROR/dists/$suite
-      gzip -t $suite_dir/{main,restricted,universe,multiverse}/source/Sources.gz
-      zcat $suite_dir/{main,restricted,universe,multiverse}/source/Sources.gz >$1/$suite/Sources
+      suite_dirs=$FTP_MIRROR/dists/$suite
+      if [ "$suite" = "$SERIES" ]; then
+          suite_dirs="$suite_dirs $FTP_MIRROR/dists/$SERIES-updates"
+      fi
+      >$1/$suite/Sources
+      for suite_dir in $suite_dirs; do
+          gzip -t $suite_dir/{main,restricted,universe,multiverse}/source/Sources.gz
+          zcat $suite_dir/{main,restricted,universe,multiverse}/source/Sources.gz >>$1/$suite/Sources
+      done
       for arch in `suite_arches $suite`; do
-          gzip -t $suite_dir/{main,restricted,universe,multiverse}/binary-$arch/Packages.gz
-          zcat $suite_dir/{main,restricted,universe,multiverse}/binary-$arch/Packages.gz >$1/$suite/Packages_$arch
-          gzip -t $suite_dir/{main,restricted,universe,multiverse}/debian-installer/binary-$arch/Packages.gz
-          zcat $suite_dir/{main,restricted,universe,multiverse}/debian-installer/binary-$arch/Packages.gz >>$1/$suite/Packages_$arch
+          >$1/$suite/Packages_$arch
+          for suite_dir in $suite_dirs; do
+              gzip -t $suite_dir/{main,restricted,universe,multiverse}/binary-$arch/Packages.gz
+              zcat $suite_dir/{main,restricted,universe,multiverse}/binary-$arch/Packages.gz >>$1/$suite/Packages_$arch
+              gzip -t $suite_dir/{main,restricted,universe,multiverse}/debian-installer/binary-$arch/Packages.gz
+              zcat $suite_dir/{main,restricted,universe,multiverse}/debian-installer/binary-$arch/Packages.gz >>$1/$suite/Packages_$arch
+          done
       done
   done
   $FAUXPKG_SCRIPT generate $1/$SERIES $1/$SERIES-proposed