[Piuparts-commits] [SCM] piuparts git repository branch, bikeshed, updated. 0.52-19-g9617a30

[Andreas Beckmann]

The following commit has been merged in the bikeshed branch:
commit 07e255a90b2a29d65ba5617d57569a985bdc3fa9
Author: Andreas Beckmann <anbe at debian.org>
Date:   Sun May 26 12:52:27 2013 +0200

    distros.conf: add virtual squeeze-proposed, wheezy-proposed
    
    these are virtual full distros created by merging a full distro with some
    partial distros
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>

diff --git a/conf/distros.conf b/conf/distros.conf
index 072f385..b50c887 100644
--- a/conf/distros.conf
+++ b/conf/distros.conf
@@ -7,6 +7,7 @@
 # distribution = <distribution>
 # components = <default components>
 # depends =
+# candidates =
 # target-release =
 #
 # These are the standard fields for sources.list entries:
@@ -17,7 +18,13 @@
 #
 # The "depends" entry can be used to refer to the "parent distribution"
 # (e.g. stable) of a "partial distribution" (e.g. stable-backports).
+# These are resolved recursively and will be made available in the
+# sources.list file.
 #
+# The "candidates" entry can be used to build a (virtually) merged
+# Packages file from one or more partial distribution (and maybe a full
+# parent distribution). This is used for selecting (package,version)
+# tuples to be tested. No recursive lookup.
 
 
 [etch]
@@ -37,6 +44,11 @@ depends = squeeze
 [squeeze-proposed-updates]
 depends = squeeze
 
+[squeeze-proposed]
+uri = None
+depends = squeeze squeeze/updates squeeze-updates squeeze-proposed-updates
+candidates = squeeze squeeze/updates squeeze-proposed-updates
+
 [squeeze-backports]
 uri = http://ftp.de.debian.org/debian-backports
 depends = squeeze squeeze/updates
@@ -58,6 +70,11 @@ depends = wheezy
 [wheezy-proposed-updates]
 depends = wheezy
 
+[wheezy-proposed]
+uri = None
+depends = wheezy wheezy/updates wheezy-updates wheezy-proposed-updates
+candidates = wheezy wheezy/updates wheezy-proposed-updates
+
 [wheezy-backports]
 depends = wheezy wheezy/updates
 target-release = wheezy-backports
diff --git a/debian/changelog b/debian/changelog
index 6c51837..5b79a46 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ piuparts (0.53) UNRELEASED; urgency=low
   * piuparts.py:
   * piuparts.conf:
   * distros.conf:
+    - Add "candidates" key to merge multiple Packages files into one virtual
+      distro.
+    - Define wheezy-proposed and squeeze-proposed.
   * piupartslib/conf.py:
   * piupartslib/packagesdb.py:
   * piuparts-master-backend.py:

-- 
piuparts git repository