debian/changelog

@@ -4,17 +4,6 @@ piuparts (1.1.0) UNRELEASED; urgency=medium
   * piuparts.py: use Popen with universal_newlines=True. Py2, Py3 compatible.
   * New mail template: add bug-templates/obsolete_conffiles.mail.
 
-  [ Holger Levsen ]
-  * Bump standards version to 4.4.0, no changes needed. 
-  * piuparts.conf-template.pejacevic:
-    - also test bullseye and bullseye-rcmd. Closes: #933061.
-    - increase precedence values for oldstable and older.
-  * Bump version number to 1.1.x due to the switch to python3.
-  * d/tests: Add simple smoke-test.
-  
-  [ David Prévot ]
-  * Use the same favicon as the one from www.d.o. 
-
   [ Thomas Goirand ]
   * Switch to package to Python 3:
     - Replaced python- with python3- in debian/control.
@@ -35,6 +24,22 @@ piuparts (1.1.0) UNRELEASED; urgency=medium
     - Lintian overrides "python-script-but-no-python-dep": that's ok, because
       piuparts-common already has the dependency.
 
+  [ Holger Levsen ]
+  * Bump version number to 1.1.x due to the switch to python3.
+  * piuparts.conf-template.pejacevic:
+    - also test bullseye and bullseye-rcmd. Closes: #933061.
+    - increase precedence values for oldstable and older.
+  * docs/README_server.txt, docs/piuparts/piuparts.1.txt and piuparts.py:
+    update examples for buster being stable and bullseye being the new
+    testing.
+  * Bump standards version to 4.4.0, no changes needed.
+  * d/tests: Add simple smoke-test.
+  * htdocs/news.tpl: mention new suites bullseye and bullseye-rcmd being
+    tested.
+
+  [ David Prévot ]
+  * Use the same favicon as the one from www.d.o.
+
  -- Holger Levsen <holger@debian.org>  Sun, 07 Jul 2019 17:15:41 +0200
 
 piuparts (1.0.1) unstable; urgency=medium

docs/README_server.txt

@@ -520,7 +520,7 @@ section, too, and will serve as defaults for all other sections
  distributions the slave should use for testing upgrades
  between distributions (i.e., Debian versions). Using "partial"
  distributions as defined in distros.conf is possible. Currently,
- "jessie stretch sid" is a good choice.
+ "buster bullseye sid" is a good choice.
  Setting this switches from doing install/purge tests to
  dist-upgrade tests. Not set by default.
 

docs/piuparts/piuparts.1.txt

@@ -65,7 +65,7 @@ Options must come before the other command line arguments.
   Bind-mount a directory inside the chroot.
 
 *-d* 'name', *-*-distribution*='name'::
-  Which Debian distribution to use: a code name (for example jessie, stretch or sid) or experimental. The default is sid (=unstable).
+  Which Debian distribution to use: a code name (for example buster, bullseye or sid) or experimental. The default is sid (=unstable).
 
 *-D* 'flavor', *-*-defaults*='flavor'::
   Use default settings suitable for a particular flavor of Debian: either debian or ubuntu. The default is debian.
@@ -352,10 +352,10 @@ If you want to do the same as above but for your changes files, pass in your cha
  piuparts -m 'http://gytha/debian main' ../foo_1.0-2_i386.changes
  ----
 
-If you want to test that a package installs properly in the stable (currently jessie) Debian release, then can be upgraded to the testing (currently stretch) and unstable (sid) versions, and then uninstalled without problems, you would give the following command::
+If you want to test that a package installs properly in the stable (currently buster) Debian release, then can be upgraded to the testing (currently bullseye) and unstable (sid) versions, and then uninstalled without problems, you would give the following command::
 
  ----
- piuparts -a -d jessie -d stretch -d sid foo
+ piuparts -a -d buster -d bullseye -d sid foo
  ----
 
 ENVIRONMENT

htdocs/news.tpl

@@ -4,6 +4,12 @@
       News
      </td>
     </tr>
+    <tr class="normalrow">
+     <td class="contentcell2">
+      <b>2019-07-31</b>
+	Add two new suites, <a href="https://piuparts.debian.org/bullseye">bullseye</a> and <a href="https://piuparts.debian.org/bullseye-rcmd">bullseye-rcmd</a>, after the release of buster on July 6th.
+     </td>
+    </tr>
     <tr class="normalrow">
      <td class="contentcell2">
       <b>2019-05-04</b> Release of piuparts 1.0.0 - may the force be with you! If everything goes as planned, this is also the last Python 2 release. Many thanks and kudos to Lars Wirzenius for starting to write piuparts 14 years ago.

piuparts.py

@@ -2684,7 +2684,7 @@ def parse_command_line():
 
     parser.add_option("-d", "--distribution", action="append", metavar="NAME",
                       help="Which Debian distribution to use: a code name " +
-                           "(for example jessie, stretch, sid) or experimental. The " +
+                           "(for example buster, bullseye, sid) or experimental. The " +
                            "default is sid (=unstable).")
 
     parser.add_option("-D", "--defaults", action="store",