[Piuparts-commits] [SCM] piuparts git repository branch, develop, updated. 0.44-641-g9d74001

[Holger Levsen]

The following commit has been merged in the develop branch:
commit 25a0875015163c4ebfb63774ba4722bb7e008e2b
Author: Holger Levsen <holger at layer-acht.org>
Date:   Sat Jun 2 11:13:52 2012 +0200

    Update documentation about merged piatti.git. Leave traces in piuparts-reports so Daves patches still apply.

diff --git a/README.txt b/README.txt
index 684bec8..a62df95 100644
--- a/README.txt
+++ b/README.txt
@@ -458,12 +458,12 @@ is being run.
 Some of the configuration items are not required, but it is best
 to set them all to be sure what the configuration actually is.
 
-==== piatti.git specific configuration
+==== piuparts,debian.org specific configuration
 
 In addition to some of the above settings the following
-configuration settings are used by the scripts in the piatti.git
-repository. They are all optional, default values are set in the
-scripts.
+configuration settings are used by the scripts in '~piuparts?/bin/'
+used to run piuparts.debian.org. They are all optional, default 
+values are set in the scripts.
 
 * "prefix" (global) sets the prefix of the piuparts installation, e.g. for finding $prefix/share/piuparts/ .
 
@@ -490,4 +490,4 @@ If you want to run piuparts-report (which is only+very useful if
 you run piuparts in master-slave mode), you need to 'apt-get
 install python-rpy r-recommended r-base-dev'. For more
 information see
-link:http://anonscm.debian.org/gitweb/?p=piuparts/piatti.git;a=blob_plain;f=README.txt;hb=piatti[http://anonscm.debian.org/gitweb/?p=piuparts/piatti.git;a=blob_plain;f=README.txt;hb=piatti].
+link:http://anonscm.debian.org/gitweb/?p=piuparts/piuparts.git;a=blob;f=README.txt[http://anonscm.debian.org/gitweb/?p=piuparts/piuparts.git;a=blob;f=README.txt].
diff --git a/debian/changelog b/debian/changelog
index 77b19d3..d7d04b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,7 @@ piuparts (0.45) UNRELEASED; urgency=low
 
   [ Holger Levsen ]
   * Merge piatti.git into piuparts.git, so that piatti.git has become obsolete
-    now.
+    now. Update documentation accordingly.
 
   [ David Steele ]
   * Remove debian/postinst as it was only dealing with lenny time area
diff --git a/org/piuparts.debian.org/etc/piuparts.conf.goldwasser b/org/piuparts.debian.org/etc/piuparts.conf.goldwasser
index b4f8b05..6c5c170 100644
--- a/org/piuparts.debian.org/etc/piuparts.conf.goldwasser
+++ b/org/piuparts.debian.org/etc/piuparts.conf.goldwasser
@@ -1,7 +1,7 @@
 #
 # This is the configuration file for piuparts running in master-slave mode on a host called goldwasser
 # 
-# For more information on this setup see http://anonscm.debian.org/gitweb/?p=piuparts/piatti.git;a=blob;f=README.txt
+# For more information on this setup see http://anonscm.debian.org/gitweb/?p=piuparts/piuparts.git;a=blob;f=piatti_README.txt
 #
 #
 
diff --git a/org/piuparts.debian.org/etc/piuparts.conf.piatti b/org/piuparts.debian.org/etc/piuparts.conf.piatti
index e985204..7a25d75 100644
--- a/org/piuparts.debian.org/etc/piuparts.conf.piatti
+++ b/org/piuparts.debian.org/etc/piuparts.conf.piatti
@@ -1,7 +1,7 @@
 #
 # This is the configuration file for piuparts running in master-slave mode on piatti.debian.org
 # 
-# For more information on this setup see http://anonscm.debian.org/gitweb/?p=piuparts/piatti.git;a=blob;f=README.txt
+# For more information on this setup see http://anonscm.debian.org/gitweb/?p=piuparts/piuparts.git;a=blob;f=piatti_README.txt
 #
 #
 
diff --git a/piatti_README.txt b/piatti_README.txt
index 8180be1..30ff08c 100644
--- a/piatti_README.txt
+++ b/piatti_README.txt
@@ -30,7 +30,7 @@ piupartss       ALL=(ALL) NOPASSWD: ALL
 
 * sudo apt-get install apt python debootstrap lsof lsb-release python-debian make dpkg-dev python-support asciidoc xmlto python-rpy r-recommended r-base-dev gs
 * you need a webserver too, if you run the master
-* Copy 'http://anonscm.debian.org/gitweb/?p=piuparts/piatti.git;a=blob;f=home/piupartss/bin/update-piuparts-setup' on the host and run it under the 'piupartss' user. It assumes you want to set it up in '/org/piuparts.debian.org' and does all further updates from git as well as the initial installation. It needs the piupartss and piupartsm user set up as described below, though.
+* Copy 'http://anonscm.debian.org/gitweb/?p=piuparts/piuparts.git;a=blob;f=home/piupartss/bin/update-piuparts-setup' on the host and run it under the 'piupartss' user. It assumes you want to set it up in '/org/piuparts.debian.org' and does all further updates from git as well as the initial installation. It needs the piupartss and piupartsm user set up as described below, though.
 * mkdir /org/piuparts.debian.org
 * sudo ln -s /org/piuparts.debian.org/etc/ /etc/piuparts
 	

-- 
piuparts git repository