* test/spritedit.c:

+ Moved spritedit to the test/ directory, because it is not mature enough.
  * libcaca.spec debian/control debian/rules:
    + Do not install caca-spritedit.

debian/control

@@ -34,6 +34,6 @@ 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, cacademo is a simple application that shows the libcaca rendering
- features such as line and ellipses drawing, triangle filling and sprite
- blitting, and caca-spritedit is a simple sprite viewer for libcaca.
+ art flames, and 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,7 +46,6 @@ 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/caca-spritedit 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 \
@@ -57,8 +56,6 @@ install: build
 	   debian/caca-utils/usr/share/man/man1/
 	mv debian/libcaca-dev/usr/share/man/man1/cacaview.1 \
 	   debian/caca-utils/usr/share/man/man1/
-	mv debian/libcaca-dev/usr/share/man/man1/caca-spritedit.1 \
-	   debian/caca-utils/usr/share/man/man1/
 
 	cp debian/libcaca-dev/usr/share/doc/libcaca-dev/README \
 	   debian/libcaca-dev/usr/share/doc/libcaca-dev/BUGS \

doc/Makefile.am

@@ -1,6 +1,6 @@
 EXTRA_DIST = doxygen.cfg.in footer.html header.html $(man_MANS)
 
-man_MANS = caca-config.1 cacademo.1 caca-spritedit.1 cacaview.1
+man_MANS = caca-config.1 cacademo.1 cacaview.1
 
 if DOXYGEN
 htmldoc_DATA = html/doxygen.css

doc/caca-spritedit.1

@@ -1,15 +0,0 @@
-.TH caca-spritedit 1 "2003-11-22" "libcaca"
-.SH NAME
-caca-spritedit \- libcaca's sprite viewer
-.SH SYNOPSIS
-.B caca-spritedit FILE
-.RI
-.SH DESCRIPTION
-This is a simple sprite viewer for libcaca sprites. It will evolve into a
-full featured sprite editor.
-.PP
-Use + and - keys to browse through the sprite's frames, q to quit.
-.SH EXAMPLE
-caca-spritedit /usr/share/libcaca/caca.txt
-.SH AUTHOR
-This manual page was written by Sam Hocevar <sam@zoy.org>

examples/Makefile.am

@@ -6,7 +6,7 @@ pkgdata_DATA = caca.txt
 
 EXTRA_DIST = caca.txt
 
-bin_PROGRAMS = cacademo cacafire cacaball caca-spritedit cacaview
+bin_PROGRAMS = cacademo cacafire cacaball cacaview
 
 cacademo_SOURCES = demo.c
 cacademo_LDADD = ../src/libcaca.a @CACA_LIBS@ -lm
@@ -20,10 +20,6 @@ cacaball_SOURCES = cacaball.c
 cacaball_LDADD = ../src/libcaca.a @CACA_LIBS@
 cacaball_CPPFLAGS = -I$(top_srcdir)/src
 
-caca_spritedit_SOURCES = spritedit.c
-caca_spritedit_LDADD = ../src/libcaca.a @CACA_LIBS@
-caca_spritedit_CPPFLAGS = -I$(top_srcdir)/src
-
 cacaview_SOURCES = cacaview.c
 cacaview_LDADD = ../src/libcaca.a @CACA_LIBS@
 cacaview_CPPFLAGS = -I$(top_srcdir)/src -DX_DISPLAY_MISSING=1

libcaca.spec

@@ -49,9 +49,9 @@ 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, cacademo is a simple application that shows the libcaca rendering
-features such as line and ellipses drawing, triangle filling and sprite
-blitting, and caca-spritedit is a simple sprite viewer for libcaca.
+art flames, and 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
@@ -96,14 +96,12 @@ rm -rf %{buildroot}
 %{_prefix}/bin/cacademo
 %{_prefix}/bin/cacafire
 %{_prefix}/bin/cacaview
-%{_prefix}/bin/caca-spritedit
 %{_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/cacaview.1*
-%{_prefix}/share/man/man1/caca-spritedit.1*
 
 %changelog
 * Sat Jan 4 2004 Sam Hocevar (RPM packages) <sam+rpm@zoy.org> 0.6-2

test/Makefile.am

@@ -2,7 +2,7 @@
 # Automake targets and declarations for libcaca test programs
 ###############################################################################
 
-noinst_PROGRAMS = dithering hsv optipal
+noinst_PROGRAMS = dithering hsv optipal spritedit
 
 dithering_SOURCES = dithering.c
 dithering_LDADD = ../src/libcaca.a @CACA_LIBS@
@@ -16,3 +16,7 @@ optipal_SOURCES = optipal.c
 optipal_LDADD = ../src/libcaca.a @CACA_LIBS@
 optipal_CPPFLAGS = -I$(top_srcdir)/src
 
+spritedit_SOURCES = spritedit.c
+spritedit_LDADD = ../src/libcaca.a @CACA_LIBS@
+spritedit_CPPFLAGS = -I$(top_srcdir)/src
+