[Piuparts-commits] [SCM] piuparts git repository branch, develop, updated. 0.49-113-g2c98b1d

[Andreas Beckmann]

The following commit has been merged in the develop branch:
commit 6b4f686de7747403cc7d6108b02c0f96c437fee1
Author: Andreas Beckmann <anbe at debian.org>
Date:   Sat Mar 2 12:34:23 2013 +0100

    add distros.conf
    
    new configuration file describing
    * distros (e.g. lenny, squeeze, sid)
    * partial distros (e.g. squeeze-security (needs squeeze) or
      experimental (needs sid)
    * non-default mirrors (archived distros, backports)
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>

diff --git a/Makefile b/Makefile
index 767ccaf..b4aa8e4 100644
--- a/Makefile
+++ b/Makefile
@@ -72,6 +72,7 @@ install-doc: build-stamp
 install-conf: build-stamp
 	install -d $(DESTDIR)$(etcdir)/piuparts
 	install -m 0644 conf/piuparts.conf.sample $(DESTDIR)$(etcdir)/piuparts/piuparts.conf
+	install -m 0644 conf/distros.conf $(DESTDIR)$(etcdir)/piuparts/
 
 	install -d $(DESTDIR)$(etcdir)/cron.d
 	install -m 0644 conf/crontab-master $(DESTDIR)$(etcdir)/cron.d/piuparts-master
@@ -89,6 +90,7 @@ install-conf-4-running-from-git: build-stamp
 	install -d $(DESTDIR)$(etcdir)/piuparts
 	install -m 0644 conf/crontab-master $(DESTDIR)$(etcdir)/piuparts/
 	install -m 0644 conf/crontab-slave $(DESTDIR)$(etcdir)/piuparts/
+	install -m 0644 conf/distros.conf $(DESTDIR)$(etcdir)/piuparts/
 	install -m 0644 instances/forward.* $(DESTDIR)$(etcdir)/piuparts/
 	install -m 0644 instances/piuparts.conf.* $(DESTDIR)$(etcdir)/piuparts/
 	install -d $(DESTDIR)$(sharedir)/piuparts/slave
diff --git a/conf/distros.conf b/conf/distros.conf
new file mode 100644
index 0000000..79c1355
--- /dev/null
+++ b/conf/distros.conf
@@ -0,0 +1,71 @@
+#
+# Omitted fields will be set to defaults and completely "missing"
+# [distribution] entries will automatically be generated as follows:
+#
+# [<distribution>]
+# uri = <default mirror>
+# distribution = <distribution>
+# components = <default components>
+# depends =
+#
+# These are the standard fields for sources.list entries:
+#   uri, distribution, components
+#
+# The "depends" entry can be used to refer to the "parent distribution"
+# (e.g. stable) of a "partial distribution" (e.g. stable-backports).
+#
+
+
+[etch]
+uri = http://archive.debian.org/debian
+
+[lenny]
+uri = http://archive.debian.org/debian
+
+
+[squeeze/updates]
+uri = http://security.debian.org/
+depends = squeeze
+
+[squeeze-updates]
+depends = squeeze
+
+[squeeze-updates]
+depends = squeeze
+
+[squeeze-proposed-updates]
+depends = squeeze
+
+[squeeze-backports]
+uri = http://backports.debian.org/debian-backports
+depends = squeeze
+
+
+[wheezy/updates]
+uri = http://security.debian.org/
+depends = wheezy
+
+[wheezy-updates]
+depends = wheezy
+
+[wheezy-updates]
+depends = wheezy
+
+[wheezy-proposed-updates]
+depends = wheezy
+
+[wheezy-backports]
+uri = http://backports.debian.org/debian-backports
+depends = wheezy
+
+
+[experimental]
+depends = sid
+
+
+# It's also possible to have "virtual" entries to provide aliases
+# e.g. to combine several partial distributions
+[squeeze-current]
+uri = None
+depends = squeeze/updates squeeze-updates
+
diff --git a/debian/changelog b/debian/changelog
index 3b8d6db..0a8ee53 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,10 @@ piuparts (0.50) UNRELEASED; urgency=low
       + PYTHONPATH (to find the python modules in non-default path setups)
       + slave-load-max
     - Setting tmpdir is now mandatory for master/slave operation.
+  * distros.conf: New configuration file to describe full distributions (e.g.
+    sid, squeeze) and partial distributions (e.g. squeeze/security,
+    squeeze-backports, experimental) along with their dependencies (e.g. base
+    distribution) and non-default mirrors. Shipped in package piuparts-common.
   * piupartslib/conf.py:
   * piupartslib/packagesdb.py:
     - Add Package.waiting_count() and friends, populated in calc_rrdep_count.
diff --git a/debian/piuparts-common.install b/debian/piuparts-common.install
index 1ee1aa0..3b9c71a 100644
--- a/debian/piuparts-common.install
+++ b/debian/piuparts-common.install
@@ -1,2 +1,3 @@
+etc/piuparts/distros.conf
 usr/lib/*
 usr/share/piuparts/lib/*

-- 
piuparts git repository