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

[Holger Levsen]

Author: holger
Date: 2008-05-13 09:31:56 +0000 (Tue, 13 May 2008)
New Revision: 164

Modified:
   trunk/README
   trunk/debian/changelog
   trunk/piuparts-slave.conf.sample
   trunk/piuparts.docbook
   trunk/piuparts.py
Log:
 * Replace all references to sarge and etch with etch and lenny.
 * Update README to reflect that piuparts runs fine in etch. 



Modified: trunk/README
===================================================================
--- trunk/README	2008-05-12 19:47:58 UTC (rev 163)
+++ trunk/README	2008-05-13 09:31:56 UTC (rev 164)
@@ -42,15 +42,15 @@
                 suffice:
                 
                  1. Pick a machine to run the master. It cannot be a chroot,
-                    but etch should be good enough.
+                    but a etch system is good enough.
                  2. Install piuparts on it.
                  3. Create an account for the master.
                  4. Configure /etc/piuparts/piuparts-master.conf 
                     appropriately.
                  
                  5. Pick one or more slaves to run the slave. You can use
-                    the machine running the master also as a slave. You need
-                    sid (or possibly etch), but it can be in a chroot.
+                    the machine running the master also as a slave. Etch is
+		    fine, it can even be in a chroot.
                  6. Install piuparts on it.
                  7. Configure /etc/piuparts/piuparts-slave.conf
                     appropriately.
@@ -283,7 +283,7 @@
                 * "upgrade-test-distros" is the space delimited list of
                   distributions the slave should use for testing upgrades
                   between distributions (i.e., Debian versions). Currently,
-		  "sarge etch sid" is a good choice.  Make this empty if you
+		  "etch lenny 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

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-05-12 19:47:58 UTC (rev 163)
+++ trunk/debian/changelog	2008-05-13 09:31:56 UTC (rev 164)
@@ -1,9 +1,14 @@
 piuparts (0.32) UNRELEASED; urgency=low
 
+  [ John Wright ]
   * Fix a typo in how-to-use-piuparts.txt.
 
- -- John Wright <jsw at debian.org>  Mon, 12 May 2008 13:46:21 -0600
+  [ Holger Levsen ]
+  * Replace all references to sarge and etch with etch and lenny.
+  * Update README to reflect that piuparts runs fine in etch. 
 
+ -- Holger Levsen <holger at debian.org>  Tue, 13 May 2008 11:31:07 +0200
+
 piuparts (0.31) unstable; urgency=low
 
   [ Lars Wirzenius ]

Modified: trunk/piuparts-slave.conf.sample
===================================================================
--- trunk/piuparts-slave.conf.sample	2008-05-12 19:47:58 UTC (rev 163)
+++ trunk/piuparts-slave.conf.sample	2008-05-13 09:31:56 UTC (rev 164)
@@ -18,8 +18,8 @@
 piuparts-cmd = sudo piuparts
 distro = sid
 chroot-tgz = sid.tar.gz
-upgrade-test-distros = sarge etch sid
-upgrade-test-chroot-tgz = sarge.tar.gz
+upgrade-test-distros = etch lenny sid
+upgrade-test-chroot-tgz = etch.tar.gz
 max-reserved = 50
 debug = no
 

Modified: trunk/piuparts.docbook
===================================================================
--- trunk/piuparts.docbook	2008-05-12 19:47:58 UTC (rev 163)
+++ trunk/piuparts.docbook	2008-05-13 09:31:56 UTC (rev 164)
@@ -190,7 +190,7 @@
                 <listitem>
                 
                     <para>Which Debian distribution to use: a code name
-                    (sarge, etch, sid) or experimental. The default is
+                    (etch, lenny, sid) or experimental. The default is
                     sid (i.e, unstable).</para>
 
                 </listitem>
@@ -543,13 +543,13 @@
             >piuparts -m 'http://gytha/debian main' ../foo_1.0-2_i386.deb</programlisting>
 
             <para>If you want to test that a package installs properly
-            in the stable (sarge) Debian release, then can be upgraded
-            to the testing (etch) and unstable (sid) versions, and then
+            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:</para>
 
             <programlisting
-            >piuparts -a -d sarge -d etch -d sid foo</programlisting>
+            >piuparts -a -d etch -d lenny -d sid foo</programlisting>
 
     </refsect1>
 

Modified: trunk/piuparts.py
===================================================================
--- trunk/piuparts.py	2008-05-12 19:47:58 UTC (rev 163)
+++ trunk/piuparts.py	2008-05-13 09:31:56 UTC (rev 164)
@@ -1627,7 +1627,7 @@
     
     parser.add_option("-d", "--distribution", action="append", metavar="NAME",
                       help="Which Debian distribution to use: a code name " +
-                           "(sarge, etch, sid) or experimental. The " +
+                           "(etch, lenny, sid) or experimental. The " +
                            "default is sid (i.e., unstable).")
     
     parser.add_option("-i", "--ignore", action="append", metavar="FILENAME",