[Piuparts-commits] [piuparts] 12/14: p.conf: rename wheezy-proposed to wheezy-lts

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch develop
in repository piuparts.

commit ac2732189f94662ce7d07d44b2a6deddec418aec
Author: Andreas Beckmann <anbe at debian.org>
Date:   Mon Aug 14 08:04:58 2017 +0200

    p.conf: rename wheezy-proposed to wheezy-lts
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 debian/changelog                           |  4 ++++
 instances/piuparts.conf-template.pejacevic | 30 +++++++++++++++---------------
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 35ac1ce..889149c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,10 @@ piuparts (0.79) UNRELEASED; urgency=medium
     - Add wheezy-lts as a full distro.
   * piuparts.conf:
     - Use relative expiration ages.
+    - Use wheezy-lts as upgrade target and rename sections:
+      + [wheezy2proposed] => [wheezy2lts]
+      + [squeeze2wheezy-proposed] => [squeeze2wheezy-lts]
+    - [squeeze2bpo2wheezy]: Use wheezy-lts as final upgrade target.
   * piuparts.conf.anbe: Add some more example sections.
   * Move some exceptions to scripts/{pre,post}_test_exceptions.
   * scripts/post_distupgrade_base_cleanup: Remove pinentry-curses from the
diff --git a/instances/piuparts.conf-template.pejacevic b/instances/piuparts.conf-template.pejacevic
index 162ba82..bf43cae 100644
--- a/instances/piuparts.conf-template.pejacevic
+++ b/instances/piuparts.conf-template.pejacevic
@@ -150,12 +150,12 @@ sections =
 	wheezy2jessie
 	wheezy2jessie-rcmd
 	wheezy2bpo2jessie
-#	wheezy-proposed
-	wheezy2proposed
+#	wheezy-lts
+	wheezy2lts
 	wheezy
 	wheezy-security
 	wheezy-pu
-	squeeze2wheezy-proposed
+	squeeze2wheezy-lts
 	squeeze2wheezy
 	squeeze2bpo-sloppy
 	squeeze2bpo2wheezy
@@ -689,18 +689,18 @@ piuparts-flags =
 distro = wheezy
 
 
-[wheezy-proposed]
-precedence = 100
+[wheezy-lts]
+precedence = 10
 json-sections = none
 piuparts-flags =
 	%(flags-default)s
 	%(flags-start-wheezy)s
 	%(flags-end-wheezy)s
-distro = wheezy-proposed
+distro = wheezy-lts
 
 
 [wheezy-security]
-precedence = 100
+precedence = 10
 json-sections = none
 piuparts-flags =
 	%(flags-default)s
@@ -721,26 +721,26 @@ depends-sections = wheezy
 distro = wheezy-proposed-updates
 
 
-[wheezy2proposed]
-precedence = 100
+[wheezy2lts]
+precedence = 10
 json-sections = none
 piuparts-flags =
 	%(flags-default)s
 	%(flags-start-wheezy)s
 	%(flags-end-wheezy)s
 distro = wheezy
-upgrade-test-distros = wheezy wheezy-proposed
+upgrade-test-distros = wheezy wheezy-lts
 
 
-[squeeze2wheezy-proposed]
-precedence = 100
+[squeeze2wheezy-lts]
+precedence = 10
 json-sections = none
 piuparts-flags =
 	%(flags-default)s
 	%(flags-start-squeeze)s
 	%(flags-end-wheezy)s
 distro = squeeze
-upgrade-test-distros = squeeze wheezy-proposed
+upgrade-test-distros = squeeze wheezy-lts
 
 
 [squeeze2wheezy]
@@ -755,7 +755,7 @@ upgrade-test-distros = squeeze wheezy
 
 
 [squeeze2bpo2wheezy]
-precedence = 100
+precedence = 10
 json-sections = none
 piuparts-flags =
 	%(flags-default)s
@@ -763,7 +763,7 @@ piuparts-flags =
 	%(flags-end-wheezy)s
 depends-sections = squeeze
 distro = squeeze-backports
-upgrade-test-distros = squeeze squeeze-backports wheezy
+upgrade-test-distros = squeeze squeeze-backports wheezy-lts
 
 
 [squeeze2bpo-sloppy]

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/piuparts/piuparts.git