r8444 - in packages/trunk/xlife/debian: . patches
Peter De Wachter
pdewacht-guest at alioth.debian.org
Sat Nov 22 22:52:40 UTC 2008
Author: pdewacht-guest
Date: 2008-11-22 22:52:40 +0000 (Sat, 22 Nov 2008)
New Revision: 8444
Modified:
packages/trunk/xlife/debian/patches/20_xlife_manpage.diff
packages/trunk/xlife/debian/patches/40_lifesrc_manpage.diff
packages/trunk/xlife/debian/rules
packages/trunk/xlife/debian/xlife.docs
Log:
more manpage fixes & install them
Modified: packages/trunk/xlife/debian/patches/20_xlife_manpage.diff
===================================================================
--- packages/trunk/xlife/debian/patches/20_xlife_manpage.diff 2008-11-22 21:59:34 UTC (rev 8443)
+++ packages/trunk/xlife/debian/patches/20_xlife_manpage.diff 2008-11-22 22:52:40 UTC (rev 8444)
@@ -1,6 +1,6 @@
--- a/xlife/xlife.man
+++ b/xlife/xlife.man
-@@ -1,15 +1,15 @@
+@@ -1,17 +1,16 @@
.TH Xlife 6
.SH NAME
-Xlife - the Game of Life and other cellular automata for X
@@ -18,9 +18,11 @@
-[\fB-ACDIMPRSv\fR] [-p \fIpatternfile\fR] [\fB-g\fR \fIn\fR] \fIfile\fR
+[\fB\-ACDIMPRSv\fR] [\-p \fIpatternfile\fR] [\fB\-g\fR \fIn\fR] \fIfile\fR
.SH DESCRIPTION
- .NXR "xlife"
+-.NXR "xlife"
.B xlife
-@@ -22,7 +22,7 @@
+ brings up an X program in which the user may experiment interactively with
+ cellular automata. In its default mode, the program helps the user experiment
+@@ -22,7 +21,7 @@
screen. This window is a viewport on a universe which is effectively unbounded
(4.2 billion cells on a side).
@@ -29,7 +31,7 @@
X applications.
If an initial pattern is specified, it will be loaded and started evolving
-@@ -32,31 +32,31 @@
+@@ -32,31 +31,31 @@
is a format-conversion utility that translates between several different
file formats for saving patterns. It takes a pattern file argument and
writes the conversion to standard output. Conversion options are described
@@ -70,7 +72,18 @@
Emit a usage message and quit.
.SH COMMANDS
-@@ -191,7 +191,7 @@
+@@ -100,8 +99,8 @@
+
+ .SS Scale
+ At zoom scale N, cells are two to the power N pixels wide; the default cell
+-size is scale 4, 16 pixels on a side.. Scale range is -3 to 7; at scales -1,
+--2 and -3 a single pixel represents the logical or of a square sample of 4, 16,
++size is scale 4, 16 pixels on a side.. Scale range is \-3 to 7; at scales \-1,
++\-2 and \-3 a single pixel represents the logical or of a square sample of 4, 16,
+ and 64 pixels respectively.
+ .IP \fB=,+\fR 10
+ Zoom the view in, magnifying the area around the mouse cursor.
+@@ -191,7 +190,7 @@
cells changed from the previous generation are shown (whether alive or dead).
Your display mode is reset to zero by the `l' command or by selecting a
tentative battern.
@@ -79,7 +92,25 @@
Change tentative-display mode. By default the tentative-pattern cells are
displayed in normal state colors but with a bounding box. In the alternate
(`wireframe') mode, tentative-pattern cells are displayed as open rectangles
-@@ -317,14 +317,14 @@
+@@ -211,7 +210,7 @@
+ pattern if there is one, otherwise the active pattern).
+ .IP \fBS\fR 10
+ Save the current pattern to a file adding extension .l, along with
+-any comments created via 'A'. Clear the internal comment area.
++any comments created via `A'. Clear the internal comment area.
+ .IP \fBi\fR
+ Set the save format for the S command. Normally the save command tries to use
+ `I' format. The command `i' allows you to specify one of A D I M P R S; simply
+@@ -254,7 +253,7 @@
+ .IP \fBW\fR 10
+ Write (and flush from memory) script of loaded patterns into a file with `.l'
+ extension. The origin of the written pattern will be the mouse position when
+-'W' is typed. Also save to the file any comments created via 'A', and clear
++`W' is typed. Also save to the file any comments created via `A', and clear
+ the internal comment area.
+ .IP \fBD\fR 10
+ Discard the current load script, including any tentative pattern, but leave the
+@@ -317,14 +316,14 @@
.SS \fBA\fR -- Absolute.
Each following line is interpreted as an absolute (x,y) coordinate pair for a
cell to be put in state 1. This format is deprecated. and should not be used
@@ -96,7 +127,7 @@
.B lifeconv
emits it.
-@@ -336,7 +336,7 @@
+@@ -336,7 +335,7 @@
character. If this is done, these will be interpreted as a pair of x and y
offsets, and the image section will be drawn with its upper left corner
displaced from the cursor position by those offsets. This facility can be used
@@ -105,7 +136,7 @@
option of
.B lifeconv
emits this format.
-@@ -353,7 +353,7 @@
+@@ -353,7 +352,7 @@
position. The \fB!\fR terminates all these data. Each of the three characters
\fBob$\fR can be led ahead by a positive integer, not staring with a \fB0\fR,
which then is interpretated as the repetation of that character. Any illegal
@@ -114,16 +145,25 @@
option of
.B lifeconv
emits this format.
-@@ -362,7 +362,7 @@
+@@ -362,7 +361,7 @@
Each line in the section is interpreted as a scan line of a relative image.
Each \fB*\fR character turns the corresponding cell on. All other characters
leave the corresponding cell off. For multi-state automata, characters may
-be digits, with '*' corresponding to 1. The -P option of
-+be digits, with '*' corresponding to 1. The \-P option of
++be digits, with `*' corresponding to 1. The \-P option of
.B lifeconv
emits this format.
-@@ -399,7 +399,7 @@
+@@ -385,7 +384,7 @@
+ negative) is acceptable, as all are taken modulo 4 (true mod, not "%").
+ .br
+ .I flip
+-is a multiplier (1 or -1) for the y coordinate that specifies a flip
++is a multiplier (1 or \-1) for the y coordinate that specifies a flip
+ about the x-axis. Other integers are accepted and silently mapped to 1.
+ Flips are done before rotations.
+ .br
+@@ -399,12 +398,12 @@
.P
The include facility is useful for assembling `sampler'
collections of interesting patterns, as well as maintaining structured
@@ -132,7 +172,13 @@
.B lifeconv
may be useful for collecting inclusions from multiple files into a single
self-contained file.
-@@ -440,14 +440,14 @@
+ .P
+-When you save a pattern in 'I' mode, the program automatically does a pattern
++When you save a pattern in `I' mode, the program automatically does a pattern
+ analysis to detect `blobs' (completely connected regions of live cells).
+ Repeated blobs are recognized, even if they are rotated or reflected.
+ If there is only one blob, the save output is identical to #P or #S
+@@ -440,14 +439,14 @@
This line contains information on the person who wrote the file, it is written
in the form: `id at machine date (name)', for example.
@@ -149,7 +195,7 @@
written to the save file, and which may be viewed from within Xlife.
.SS \fBT\ survivedigits/borndigits\fR -- Set new transition rules
-@@ -457,7 +457,7 @@
+@@ -457,7 +456,7 @@
survives/is born to state ON. For example the default and classical rules for
Conway's \fIGame of Life\fR are:
.br
@@ -158,7 +204,21 @@
.SS \fBU\ filename\fR -- Use ruleset
Format is #U followed by a filename. This directive is ignored if Xlife is in
-@@ -809,26 +809,26 @@
+@@ -789,11 +788,11 @@
+ incorporated into the universe. The effects of having the template written
+ to the load script are non-fatal, and may be corrected with a text editor.
+ However, it is best to get in the habit of typing `I' (include pattern),
+-'D' (discard load script) immediately upon loading a template.
++`D' (discard load script) immediately upon loading a template.
+
+ The mirror in ex.l is already given in a structured way, but it will suffice
+ to illustrate the technique. To place the template, load ex:mirror, and type
+-'I' and `D' as mentioned above. Now, load in succession two eaters (ex:eater)
++`I' and `D' as mentioned above. Now, load in succession two eaters (ex:eater)
+ and the oscillator (ex:oscil) and place each pattern over the corresponding
+ part of the old image. Use `W' to write the load script.
+
+@@ -809,26 +808,26 @@
pattern that used to reside in a single file may now be spread over several
files. There may be too many to easily keep track of them. For the user who
wishes only to use #I as a means of collecting a structured pattern into a
@@ -191,7 +251,7 @@
Try these options on any of the files written by `W' in examples 1, 2, and 3.
-@@ -891,7 +891,7 @@
+@@ -891,7 +890,7 @@
this behavior.
.IP \fBborderWidth\fR 20
Set the border width for Xlife's windows (may be visually useful when running
@@ -200,7 +260,7 @@
.IP \fBstateColor0\fR 20
X color to use for displaying state 0. There is also a \fBstateColor1\fR
and so forth, up to \fBstateColor\fRN where N is the maximum supported
-@@ -910,7 +910,7 @@
+@@ -910,7 +909,7 @@
.IP \fBreverseBoard\fR 20
Reverse the Life board to black-on-white. When this option is enabled and
"Black" and "White" are in the stateColor list, they are swapped. Enabling
@@ -209,7 +269,7 @@
.IP \fBfalseColorMode\fR 20
If the value of this resource is "true", XLife when simulating a 2-state
automaton defaults to the false-color display mode toggled by the `*' command.
-@@ -924,7 +924,7 @@
+@@ -924,7 +923,7 @@
.IP \fBsoupDensity\fR 20
Density for primordial soups generated by the `%' command. Defaults to 30%.
.IP \fBgridInterval\fR 20
@@ -218,7 +278,7 @@
command-line option. A positive value for this option turns the grid on by
default; a negative one does not, but sets the interval to its absolute value.
.IP \fBsaveFormat\fR 20
-@@ -955,7 +955,7 @@
+@@ -955,7 +954,7 @@
will not be refreshed.
.P
Old files in #P format may not have same y coordinate when read by the
@@ -227,7 +287,7 @@
.P
The I save format does not yet detect duplicate blobs when they are rotated
or reflected.
-@@ -983,10 +983,10 @@
+@@ -983,10 +982,10 @@
<esr at snark.thyrsus.com>.
Many new commands, subpixel resolution, M format:
Modified: packages/trunk/xlife/debian/patches/40_lifesrc_manpage.diff
===================================================================
--- packages/trunk/xlife/debian/patches/40_lifesrc_manpage.diff 2008-11-22 21:59:34 UTC (rev 8443)
+++ packages/trunk/xlife/debian/patches/40_lifesrc_manpage.diff 2008-11-22 22:52:40 UTC (rev 8444)
@@ -1,5 +1,5 @@
--- /dev/null
-+++ b/lifesrc-3.5/lifesrc.man
++++ b/lifesrc-3.5/lifesrc.6
@@ -0,0 +1,537 @@
+.TH lifesrc 6 "2008-11-22"
+.\" Please adjust this date whenever revising the manpage.
Modified: packages/trunk/xlife/debian/rules
===================================================================
--- packages/trunk/xlife/debian/rules 2008-11-22 21:59:34 UTC (rev 8443)
+++ packages/trunk/xlife/debian/rules 2008-11-22 22:52:40 UTC (rev 8444)
@@ -16,7 +16,7 @@
build-stamp:
dh_testdir
- ln -sf xlife.man xlife/lifeconv.man #TODO find the lifeconv manpage
+ ln -sf xlife.man xlife/lifeconv.man #xlife makefile wants this to exist
cd xlife && xmkmf -a
$(MAKE) -C xlife CDEBUGFLAGS="$(CFLAGS)" XLIFEPATSDIR="/usr/share/doc/xlife/examples"
@@ -30,12 +30,12 @@
dh_testroot
rm -f build-stamp
- rm -f xlife/lifeconv.man #TODO remove me
-
[ ! -f xlife/Makefile ] || make -C xlife clean
rm -f xlife/Makefile
make -C lifesrc-3.5 clean
+ rm -f xlife/lifeconv.man
+
dh_clean
install: build
@@ -58,8 +58,9 @@
dh_installexamples
dh_installmenu
dh_installcron
-# dh_installman lifeconv.man lifesearch.man xlife.man \
- lifesearchdumb.man collect.man
+ dh_installman xlife/xlife.man lifesrc-3.5/lifesrc.6
+ dh_link usr/share/man/man6/xlife.6 usr/share/man/man6/lifeconv.6
+ dh_link usr/share/man/man6/lifesrc.6 usr/share/man/man6/lifesrcdumb.6
dh_installinfo
dh_installchangelogs CHANGES
dh_link
Modified: packages/trunk/xlife/debian/xlife.docs
===================================================================
--- packages/trunk/xlife/debian/xlife.docs 2008-11-22 21:59:34 UTC (rev 8443)
+++ packages/trunk/xlife/debian/xlife.docs 2008-11-22 22:52:40 UTC (rev 8444)
@@ -1,3 +1,2 @@
HACKING
-README
doc
More information about the Pkg-games-commits
mailing list