* examples/cacamoir.c:

+ Renamed cacacirc to cacamoir.
  * libcaca.spec debian/ doc/:
    + Added cacamoir to the distributed files.

NEWS

@@ -6,6 +6,7 @@ Changes between 0.7 and 0.8:
   * autorepeat emulation in the ncurses and slang drivers
   * support for more keycodes in the ncurses and slang drivers
   * cacaplas, a plasma animation example
+  * cacamoir, a moiré circles animation example
 
 Changes between 0.6 and 0.7:
 ----------------------------

debian/control

@@ -34,6 +34,8 @@ Description: text mode graphics utilities
  .
  cacaball is a tiny graphic program that renders animated ASCII metaballs on
  the screen, cacafire is a port of AALib's aafire and displays burning ASCII
- art flames, and cacademo is a simple application that shows the libcaca
+ art flames, cacamoir animates colourful moire circles and cacaplas displays
- rendering features such as line and ellipses drawing, triangle filling and
+ an old school plasma effect.
- sprite blitting.
+ .
+ cacademo is a simple application that shows the libcaca rendering features
+ such as line and ellipses drawing, triangle filling and sprite blitting.

debian/rules

@@ -46,6 +46,8 @@ install: build
 	mv debian/libcaca-dev/usr/bin/cacademo debian/caca-utils/usr/bin
 	mv debian/libcaca-dev/usr/bin/cacaview debian/caca-utils/usr/bin
 	mv debian/libcaca-dev/usr/bin/cacafire debian/caca-utils/usr/bin
+	mv debian/libcaca-dev/usr/bin/cacamoir debian/caca-utils/usr/bin
+	mv debian/libcaca-dev/usr/bin/cacaplas debian/caca-utils/usr/bin
 
 	mv debian/libcaca-dev/usr/share/libcaca debian/caca-utils/usr/share
 	mv debian/libcaca-dev/usr/share/man/man1/cacaball.1 \
@@ -54,6 +56,10 @@ install: build
 	   debian/caca-utils/usr/share/man/man1/
 	mv debian/libcaca-dev/usr/share/man/man1/cacafire.1 \
 	   debian/caca-utils/usr/share/man/man1/
+	mv debian/libcaca-dev/usr/share/man/man1/cacamoir.1 \
+	   debian/caca-utils/usr/share/man/man1/
+	mv debian/libcaca-dev/usr/share/man/man1/cacaplas.1 \
+	   debian/caca-utils/usr/share/man/man1/
 	mv debian/libcaca-dev/usr/share/man/man1/cacaview.1 \
 	   debian/caca-utils/usr/share/man/man1/
 

doc/Makefile.am

@@ -45,9 +45,13 @@ if DOXYGEN
 	$(mkinstalldirs) $(DESTDIR)$(mandir)/man3
 	cp man/man3/*.3caca $(DESTDIR)$(mandir)/man3
 	$(mkinstalldirs) $(DESTDIR)$(mandir)/man1
-	rm -f $(DESTDIR)$(mandir)/man1/cacafire.1
-	ln -s cacademo.1 $(DESTDIR)$(mandir)/man1/cacafire.1
 	rm -f $(DESTDIR)$(mandir)/man1/cacaball.1
 	ln -s cacademo.1 $(DESTDIR)$(mandir)/man1/cacaball.1
+	rm -f $(DESTDIR)$(mandir)/man1/cacafire.1
+	ln -s cacademo.1 $(DESTDIR)$(mandir)/man1/cacafire.1
+	rm -f $(DESTDIR)$(mandir)/man1/cacamoir.1
+	ln -s cacademo.1 $(DESTDIR)$(mandir)/man1/cacamoir.1
+	rm -f $(DESTDIR)$(mandir)/man1/cacaplas.1
+	ln -s cacademo.1 $(DESTDIR)$(mandir)/man1/cacaplas.1
 endif
 

doc/cacademo.1

@@ -1,42 +1,55 @@
 .TH libcaca 1 "2004-1-6" "libcaca"
 .SH NAME
-cacademo, cacafire, cacaball \- libcaca's demonstration applications
+cacademo, cacaball, cacafire, cacamoir, cacaplas \- libcaca's demonstration
+applications
 .SH SYNOPSIS
 cacademo
 .PP
+cacaball
+.PP
 cacafire
 .PP
-cacaball
+cacamoir
+.PP
+cacaplas
 .RI
 .SH DESCRIPTION
-This manual page documents briefly the cacademo, cacafire and cacaball
+This manual page documents briefly the cacademo, cacaball, cacafire, cacamoir
-programs.
+and cacaplas programs.
 .PP
 .B cacademo
 is a simple demo which demonstrates some features of the libcaca
 library. The main menu lists available keys and their actions. To
 exit a particular demo, press any key.
 .PP
+.B cacaball
+displays ASCII art metaballs.
+.PP
 .B cacafire
 displays burning ASCII art flames.
 .PP
-.B cacaball
+.B cacamoir
-displays ASCII art metaballs.
+displays a coloured ASCII art moire pattern of concentric circles.
+.PP
+.B cacaplas
+displays an old school ASCII art plasma effect.
 .SH BUGS
 Please report any bugs you find to <libcaca@lists.zoy.org>.
 .SH LICENSE
-cacademo, cacafire and cacaball are covered by the GNU Lesser General
+cacademo, cacaball, cacafire, cacamoir and cacaplas are covered by the GNU
-Public License (LGPL).
+Lesser General Public License (LGPL).
 .SH AUTHORS
-.B cacademo
+.B cacademo, cacamoir
 and this manual page were written by Sam Hocevar <sam@zoy.org>.
 .PP
+.B cacaball
+was written by Jean-Yves Lamoureux <jylam@lnxscene.org>,
 .B cacafire
 is a port of AAlib's
 .B aafire
-written by Jan Hubicka <hubicka@freesoft.cz>.
+written by Jan Hubicka <hubicka@freesoft.cz> and
-.PP
+.B cacaplas
-.B cacaball
+is a port of an SDL plasma effect written and put in the public domain by
-was written by Jean-Yves Lamoureux <jylam@lnxscene.org>.
+Michele Bini <mibin@tin.it>.
 .SH SEE ALSO
 cacaview(1), aafire(1)

examples/Makefile.am

@@ -6,7 +6,7 @@ pkgdata_DATA = caca.txt
 
 EXTRA_DIST = caca.txt
 
-bin_PROGRAMS = cacademo cacafire cacaball cacaplas cacaview cacacirc
+bin_PROGRAMS = cacademo cacafire cacaball cacaplas cacaview cacamoir
 
 cacademo_SOURCES = demo.c
 cacademo_LDADD = ../src/libcaca.a @CACA_LIBS@ @MATH_LIBS@
@@ -24,9 +24,9 @@ cacaplas_SOURCES = cacaplas.c
 cacaplas_LDADD = ../src/libcaca.a @CACA_LIBS@ @MATH_LIBS@
 cacaplas_CPPFLAGS = -I$(top_srcdir)/src
 
-cacacirc_SOURCES = cacacirc.c
+cacamoir_SOURCES = cacamoir.c
-cacacirc_LDADD = ../src/libcaca.a @CACA_LIBS@ @MATH_LIBS@
+cacamoir_LDADD = ../src/libcaca.a @CACA_LIBS@ @MATH_LIBS@
-cacacirc_CPPFLAGS = -I$(top_srcdir)/src
+cacamoir_CPPFLAGS = -I$(top_srcdir)/src
 
 cacaview_SOURCES = cacaview.c
 cacaview_LDADD = ../src/libcaca.a @CACA_LIBS@

examples/cacacirc.c → examples/cacamoir.c

@@ -1,5 +1,5 @@
 /*
- *  cacacirc      circle effect for libcaca
+ *  cacamoir      moiré circles effect for libcaca
  *  Copyright (c) 2004 Sam Hocevar <sam@zoy.org>
  *                All Rights Reserved
  *

libcaca.spec

@@ -49,9 +49,11 @@ or enable anti-aliasing.
 
 cacaball is a tiny graphic program that renders animated ASCII metaballs on
 the screen, cacafire is a port of AALib's aafire and displays burning ASCII
-art flames, and cacademo is a simple application that shows the libcaca
+art flames, cacamoir animates colourful moire circles and cacaplas displays
-rendering features such as line and ellipses drawing, triangle filling and
+an old school plasma effect.
-sprite blitting.
+cacademo is a simple application that shows the libcaca rendering features
+such as line and ellipses drawing, triangle filling and sprite blitting.
 
 %prep
 case "${RPM_COMMAND:-all}" in
@@ -95,12 +97,16 @@ rm -rf %{buildroot}
 %{_prefix}/bin/cacaball
 %{_prefix}/bin/cacademo
 %{_prefix}/bin/cacafire
+%{_prefix}/bin/cacamoir
+%{_prefix}/bin/cacaplas
 %{_prefix}/bin/cacaview
 %{_prefix}/share/doc/caca-utils-%{version}/*
 %{_prefix}/share/libcaca/*
 %{_prefix}/share/man/man1/cacaball.1*
 %{_prefix}/share/man/man1/cacademo.1*
 %{_prefix}/share/man/man1/cacafire.1*
+%{_prefix}/share/man/man1/cacamoir.1*
+%{_prefix}/share/man/man1/cacaplas.1*
 %{_prefix}/share/man/man1/cacaview.1*
 
 %changelog