[Piuparts-commits] rev 567 - in trunk: . debian

[Holger Levsen]

Author: holger
Date: 2009-12-16 20:50:59 +0000 (Wed, 16 Dec 2009)
New Revision: 567

Modified:
   trunk/README.txt
   trunk/debian/changelog
   trunk/piuparts.1.txt
   trunk/piuparts.py
Log:
Replace all references to sarge and etch with ones to lenny and squeeze.  

Modified: trunk/README.txt
===================================================================
--- trunk/README.txt	2009-12-16 20:41:16 UTC (rev 566)
+++ trunk/README.txt	2009-12-16 20:50:59 UTC (rev 567)
@@ -206,7 +206,7 @@
 To set this up for yourself, the following steps should
 suffice:
 
-. Pick a machine to run the master. It cannot be a chroot, but a etch system is good enough.
+. Pick a machine to run the master. It cannot be a chroot, but basically any real (or properly virtualized) Debian system is good enough.
 . Install piuparts on it.
 . Create an account for the master.
 . Configure '/etc/piuparts/piuparts.conf' appropriately.
@@ -386,7 +386,7 @@
   
 * "chroot-tgz" is the name of the file the slave should use for the tarball to keep the chroot for the basic install/purge testing. If the tarball doesn't exist, the slave creates it.
 
-* "upgrade-test-distros" is the space delimited list of distributions the slave should use for testing upgrades between distributions (i.e., Debian versions). Currently, "etch lenny sid" is a good choice.  Make this empty if you do not want to run upgrade tests.
+* "upgrade-test-distros" is the space delimited list of distributions the slave should use for testing upgrades between distributions (i.e., Debian versions). Currently, "lenny squeeze sid" is a good choice.  Make this empty if you do not want to run upgrade tests.
 
 * "upgrade-test-chroot-tgz" is the name of the file the slave should use for the tarball to keep the chroot for the first distribution in upgrade-test-distros. If the file does not exist, the slave creates it.
 

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2009-12-16 20:41:16 UTC (rev 566)
+++ trunk/debian/changelog	2009-12-16 20:50:59 UTC (rev 567)
@@ -40,6 +40,7 @@
       slave will now only sleep if there is nothing to do for any section.
   * Makefile: workaround 559305 by calling a2x twice.   
   * Update debian/NEWS.
+  * Replace all references to sarge and etch with ones to lenny and squeeze.  
 
  -- Holger Levsen <holger at debian.org>  Fri, 04 Dec 2009 15:55:42 +0100
 

Modified: trunk/piuparts.1.txt
===================================================================
--- trunk/piuparts.1.txt	2009-12-16 20:41:16 UTC (rev 566)
+++ trunk/piuparts.1.txt	2009-12-16 20:50:59 UTC (rev 567)
@@ -51,7 +51,7 @@
   Bind-mount a directory inside the chroot.
 
 *-d* 'name', *--distribution*='name'::
-  Which Debian distribution to use: a code name (etch, lenny, sid) or experimental. The default is sid (i.e, unstable).
+  Which Debian distribution to use: a code name (for example lenny, squeeze 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.
@@ -176,10 +176,10 @@
 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 (etch) Debian release, then can be upgraded to the testing (lenny) 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 lenny) Debian release, then can be upgraded to the testing (currently squeeze) and unstable (sid) versions, and then uninstalled without problems, you would give the following command:
 
 ----
-piuparts -a -d etch -d lenny -d sid foo
+piuparts -a -d lenny -d squeeze -d sid foo
 ----
 
 ENVIRONMENT

Modified: trunk/piuparts.py
===================================================================
--- trunk/piuparts.py	2009-12-16 20:41:16 UTC (rev 566)
+++ trunk/piuparts.py	2009-12-16 20:50:59 UTC (rev 567)
@@ -1778,8 +1778,8 @@
     
     parser.add_option("-d", "--distribution", action="append", metavar="NAME",
                       help="Which Debian distribution to use: a code name " +
-                           "(etch, lenny, sid) or experimental. The " +
-                           "default is sid (i.e., unstable).")
+                           "(for example lenny, squeeze, sid) or experimental. The " +
+                           "default is sid (=unstable).")
 
     parser.add_option("-D", "--defaults", action="store",
                       help="Choose which set of defaults to use "