[Piuparts-commits] [SCM] piuparts git repository branch, bikeshed, updated. 0.51-62-gea3534a

Mon May 27 16:18:00 UTC 2013

The following commit has been merged in the bikeshed branch:
commit d43ee2a9afeef1cb40d2f922da0b5890080c66fd
Author: Holger Levsen <holger at layer-acht.org>
Date:   Mon May 27 15:54:59 2013 +0200

    Add piuparts_slave_run.8 and piuparts_slave_join.8 manpages.

diff --git a/Makefile b/Makefile
index b803ebb..c20cd71 100644
--- a/Makefile
+++ b/Makefile
@@ -3,6 +3,7 @@ sbindir = $(prefix)/sbin
 sharedir = $(prefix)/share
 mandir = $(sharedir)/man
 man1dir = $(mandir)/man1
+man8dir = $(mandir)/man8
 libdir = $(prefix)/lib
 docdir = $(prefix)/share/doc/piuparts/
 site26 = $(libdir)/python2.6/dist-packages
@@ -23,7 +24,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 README.html
+DOCS_GENERATED		 = piuparts.1 piuparts.1.html piuparts_slave_run.8 piuparts_slave_join.8 README.html
 
 define placeholder_substitution
 	sed -r \
@@ -61,6 +62,12 @@ README.html: README.txt
 piuparts.1: piuparts.1.txt
 	a2x -f manpage piuparts.1.txt
 
+piuparts_slave_run.8: piuparts_slave_run.8.txt
+	a2x -f manpage piuparts_slave_run.8.txt
+
+piuparts_slave_join.8: piuparts_slave_join.8.txt
+	a2x -f manpage piuparts_slave_join.8.txt
+
 piuparts.1.html: piuparts.1.txt
 	a2x --copy -f xhtml piuparts.1.txt
 
@@ -69,7 +76,11 @@ install-doc: build-stamp
 	install -m 0644 README.txt README.html docbook-xsl.css $(DESTDIR)$(docdir)/
 	install -d $(DESTDIR)$(man1dir)
 	install -m 0644 piuparts.1 $(DESTDIR)$(man1dir)/
+	install -d $(DESTDIR)$(man8dir)
+	install -m 0644 piuparts_slave_run.8 piuparts_slave_join.8 $(DESTDIR)$(man8dir)/
 	gzip -9f $(DESTDIR)$(man1dir)/piuparts.1
+	gzip -9f $(DESTDIR)$(man8dir)/piuparts_slave_run.8
+	gzip -9f $(DESTDIR)$(man8dir)/piuparts_slave_join.8
 	install -m 0644 piuparts.1.html $(DESTDIR)$(docdir)/
 
 install-conf: build-stamp
@@ -153,7 +164,7 @@ check:
 
 clean:
 	rm -f build-stamp
-	rm -f piuparts.1 piuparts.1.xml piuparts.1.html README.xml README.html docbook-xsl.css piuparts.html
+	rm -f piuparts.1 piuparts.1.xml piuparts.1.html piuparts_slave_run.8 piuparts_slave_join.8 README.xml README.html docbook-xsl.css piuparts.html
 	rm -f *.pyc piupartslib/*.pyc master-bin/*.pyc slave-bin/*.pyc
 	rm -f $(SCRIPTS_GENERATED)
 
diff --git a/debian/changelog b/debian/changelog
index 785b79e..d513dd6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -38,6 +38,8 @@ piuparts (0.52) UNRELEASED; urgency=low
   * debian/control: Add adequate to piuparts' recommends.
   * piuparts-slave.postrm: Also remove /var/cache/piuparts/tmp on purge.
   * conf/crontab-master: Run generate_daily_report twice a day.
+  * piuparts-slave.deb: Add piuparts_slave_run.8 and piuparts_slave_join.8
+    manpages.
 
  -- Holger Levsen <holger at debian.org>  Wed, 15 May 2013 17:25:41 +0200
 
diff --git a/debian/piuparts-slave.manpages b/debian/piuparts-slave.manpages
new file mode 100644
index 0000000..2c817aa
--- /dev/null
+++ b/debian/piuparts-slave.manpages
@@ -0,0 +1,3 @@
+debian/tmp/usr/share/man/man8/piuparts_slave_run.8.gz
+debian/tmp/usr/share/man/man8/piuparts_slave_join.8.gz
+
diff --git a/piuparts_slave_join.8.txt b/piuparts_slave_join.8.txt
new file mode 100644
index 0000000..6f93189
--- /dev/null
+++ b/piuparts_slave_join.8.txt
@@ -0,0 +1,40 @@
+piuparts_slave_join(8)
+======================
+
+NAME
+----
+piuparts_slave_join - join a running piuparts-slave screen session
+
+SYNOPSIS
+--------
+*piuparts_slave_join*
+
+DESCRIPTION
+-----------
+*piuparts_slave_join* joins a running piuparts-slave session in screen.
+
+OPTIONS
+-------
+There are no options to this command.
+
+ENVIRONMENT
+-----------
+Running piuparts in master-slave mode requires configuration in _/etc/piuparts_.
+
+NOTES
+-----
+Make sure to also read */usr/share/doc/piuparts-master/README_server.txt*.
+
+SEE ALSO
+--------
+*piuparts*(1), *piuparts_slave_run*(8)
+
+AUTHOR
+------
+Holger Levsen (holger at layer-acht.org)
+
+DATE
+----
+2013-05-27
+
+// vim: set filetype=asciidoc:
diff --git a/piuparts_slave_run.8.txt b/piuparts_slave_run.8.txt
new file mode 100644
index 0000000..4061b33
--- /dev/null
+++ b/piuparts_slave_run.8.txt
@@ -0,0 +1,48 @@
+piuparts_slave_run(8)
+=====================
+
+NAME
+----
+piuparts_slave_run - start up piuparts-slave instance(s) in screen
+
+SYNOPSIS
+--------
+*piuparts_slave_run*
+
+DESCRIPTION
+-----------
+*piuparts_slave_run* runs piuparts-slave instance(s) in screen which run *piuparts* tests which test whether Debian packages handle installation, upgrading, and removal correctly.
+
+OPTIONS
+-------
+There are no options to this command currently. Note however that *this interface is under development* and may change.
+
+ENVIRONMENT
+-----------
+Running piuparts in master-slave mode requires configuration in _/etc/piuparts_.
+
+BUGS
+----
+*piuparts_slave_run* should be able to run slaves in different ways:
+1. all, in a new screen (only this is implemented at the moment)
+2. a specific one, in a specified screen slot in a (running) screen
+3. append one to a (running) screen using a "random" slot
+4. start slave in the current directory in the current shell in foreground.
+
+NOTES
+-----
+Make sure to also read */usr/share/doc/piuparts-master/README_server.txt*.
+
+SEE ALSO
+--------
+*piuparts*(1), *piuparts_slave_join*(8)
+
+AUTHOR
+------
+Holger Levsen (holger at layer-acht.org)
+
+DATE
+----
+2013-05-27
+
+// vim: set filetype=asciidoc:

-- 
piuparts git repository

