[Piuparts-commits] [SCM] piuparts git repository branch, develop, updated. 0.52-21-g5dc61c4

[Holger Levsen]

The following commit has been merged in the develop branch:
commit 5dc61c444579d356773a10f1121de63f7fef3a9c
Author: Holger Levsen <holger at layer-acht.org>
Date:   Wed May 29 03:28:33 2013 +0200

    Rename README.txt to README_1st.txt.
    
    Signed-off-by: Holger Levsen <holger at layer-acht.org>

diff --git a/Makefile b/Makefile
index 50ebc40..a708b4c 100644
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,7 @@ endif
 SCRIPTS_TEMPLATES	 = $(wildcard *.in master-bin/*.in slave-bin/*.in conf/*.in)
 SCRIPTS_PYTHON_BINARY	 = $(wildcard *.py master-bin/*.py slave-bin/*.py)
 SCRIPTS_GENERATED	 = $(SCRIPTS_TEMPLATES:.in=) $(SCRIPTS_PYTHON_BINARY:.py=)
-DOCS_GENERATED		 = piuparts.1 piuparts.1.html piuparts_slave_run.8 piuparts_slave_join.8 README.html README_server.html
+DOCS_GENERATED		 = piuparts.1 piuparts.1.html piuparts_slave_run.8 piuparts_slave_join.8 README_1st.html README_server.html
 
 define placeholder_substitution
 	sed -r \
@@ -54,8 +54,8 @@ build-stamp: $(SCRIPTS_GENERATED) $(DOCS_GENERATED) Makefile
 
 build-doc: $(DOCS_GENERATED)
 
-README.html: README.txt
-	a2x --copy -a toc -a toclevels=3 -f xhtml -r /etc/asciidoc/ README.txt
+README_1st.html: README_1st.txt
+	a2x --copy -a toc -a toclevels=3 -f xhtml -r /etc/asciidoc/ README_1st.txt
 
 README_server.html: README_server.txt
 	a2x --copy -a toc -a toclevels=3 -f xhtml -r /etc/asciidoc/ README_server.txt
@@ -74,7 +74,7 @@ piuparts.1.html: piuparts.1.txt
 
 install-doc: build-stamp
 	install -d $(DESTDIR)$(docdir)/
-	install -m 0644 README.txt README.html README_server.html docbook-xsl.css $(DESTDIR)$(docdir)/
+	install -m 0644 README_1st.txt README_1st.html README_server.txt README_server.html docbook-xsl.css $(DESTDIR)$(docdir)/
 	install -d $(DESTDIR)$(man1dir)
 	install -m 0644 piuparts.1 $(DESTDIR)$(man1dir)/
 	install -d $(DESTDIR)$(man8dir)
diff --git a/README.txt b/README_1st.txt
similarity index 98%
rename from README.txt
rename to README_1st.txt
index f3c7f9f..523d251 100644
--- a/README.txt
+++ b/README_1st.txt
@@ -1,10 +1,10 @@
-piuparts README
----------------
+piuparts README_1st
+-------------------
 
 Author: Lars Wirzenius
 Email: <liw at iki.fi>
 
-After reading this README you probably also want to have a look
+After reading this README_1st you probably also want to have a look
 at the piuparts manpage, to learn about the available options.
 But read this document first!
 
diff --git a/debian/changelog b/debian/changelog
index 3081cdf..78ab1fb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -33,6 +33,7 @@ piuparts (0.53) UNRELEASED; urgency=low
     cleaned up.
   * Move master-slave related documentation from README.txt to
     README_server.txt and leave a pointer in the former.
+  * Rename README.txt to README_1st.txt.
   * piuparts-master.deb: Ship README_server.html.
   * piuparts-report.py: Add a link to README_server.html.
 
diff --git a/debian/piuparts-master.docs b/debian/piuparts-master.docs
index 695daae..c4cb52b 100644
--- a/debian/piuparts-master.docs
+++ b/debian/piuparts-master.docs
@@ -1,4 +1,3 @@
-README_server.html
 README_server.txt
 README_pejacevic.txt
 conf/piuparts.conf.sample
diff --git a/debian/piuparts.docs b/debian/piuparts.docs
index 2bf155e..6e6d8c4 100644
--- a/debian/piuparts.docs
+++ b/debian/piuparts.docs
@@ -1,4 +1,4 @@
-README.txt
-README.html
+README_1st.txt
+README_1st.html
 piuparts.1.html
 docbook-xsl.css
diff --git a/piuparts-report.py b/piuparts-report.py
index 2af62b0..591366d 100644
--- a/piuparts-report.py
+++ b/piuparts-report.py
@@ -121,8 +121,11 @@ HTML_HEADER = """
     </tr>
     <tr class="normalrow">
      <td class="contentcell">
-      <a href="$doc_root/doc/README.html" target="_blank">piuparts README</a>,
-      <br>
+      <a href="$doc_root/doc/README_1st.html" target="_blank">README_1st</a>
+     </td>
+    </tr>
+    <tr class="normalrow">
+     <td class="contentcell">
       <a href="$doc_root/doc/README_server.html" target="_blank">README_server</a>
      </td>
     </tr>
diff --git a/piuparts.1.txt b/piuparts.1.txt
index 2728089..30e7b41 100644
--- a/piuparts.1.txt
+++ b/piuparts.1.txt
@@ -189,7 +189,7 @@ Note that file: addresses works if the directories are made accessible from with
   Save chroot package selection and file meta data in FILE for later use. See the function install_and_upgrade_between_distros() in piuparts.py for defaults. Mostly useful for large scale distro upgrade tests.
 
 *--scriptsdir*='DIR'::
-  Directory where are placed the custom scripts. For more information about this, read README.txt
+  Directory where are placed the custom scripts. For more information about this, read README_server.txt
 
 *--schroot*='SCHROOT-NAME'::
   Use schroot session named SCHROOT-NAME for the chroot, instead of building a new one with debootstrap.

-- 
piuparts git repository