From 480b8a916bd460688847b3312a9643c469deeacf Mon Sep 17 00:00:00 2001 From: Sam Hocevar Date: Mon, 6 Mar 2006 08:26:09 +0000 Subject: [PATCH] * Removed cacademo from examples, manpages and distributions. It's useless. --- debian/changelog | 6 +- debian/control | 28 ++++++-- debian/copyright | 2 +- debian/rules | 11 +-- doc/Makefile.am | 10 ++- doc/{cacademo.1 => cacafire.1} | 26 +++---- libcaca.spec | 5 -- msvc/Makefile.am | 1 - msvc/cacademo.vcproj | 122 --------------------------------- msvc/libcaca.sln | 7 -- 10 files changed, 52 insertions(+), 166 deletions(-) rename doc/{cacademo.1 => cacafire.1} (63%) delete mode 100644 msvc/cacademo.vcproj diff --git a/debian/changelog b/debian/changelog index 5799d9d..1895fda 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -libcaca (0.9-999.exp) experimental; urgency=low +libcaca (0.10-1) UNRELEASED; urgency=low - * UNRELEASED. + * New upstream release. - -- Sam Hocevar (Debian packages) Fri, 24 Jun 2005 13:53:50 +0200 + -- Sam Hocevar (Debian packages) Mon, 6 Mar 2006 00:55:30 +0100 libcaca (0.9-5) unstable; urgency=low diff --git a/debian/control b/debian/control index a3ad725..306e1d1 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: libs Priority: optional Maintainer: Sam Hocevar (Debian packages) Build-Depends: debhelper (>= 4.0), libncurses5-dev, libslang2-dev, libx11-dev, libimlib2-dev, doxygen, tetex-bin, tetex-extra -Standards-Version: 3.6.1.0 +Standards-Version: 3.6.2 Package: libcaca-dev Section: libdevel @@ -17,6 +17,29 @@ Description: development files for libcaca This package contains the header files and static libraries needed to compile applications or shared objects that use libcaca. +Package: libcucul0 +Section: libs +Architecture: any +Depends: ${shlibs:Depends} +Description: low-level Unicode character drawing library + libcaca is the Colour AsCii Art library. It provides high level functions + for colour text drawing, simple primitives for line, polygon and ellipse + drawing, as well as powerful image to text conversion routines. + . + This package contains the shared library for libcucul, libcaca's + platform-independent character drawing engine. + +Package: libcaca0 +Section: libs +Architecture: any +Depends: ${shlibs:Depends} +Description: colour ASCII art library + libcaca is the Colour AsCii Art library. It provides high level functions + for colour text drawing, simple primitives for line, polygon and ellipse + drawing, as well as powerful image to text conversion routines. + . + This package contains the shared library for libcaca. + Package: caca-utils Section: utils Architecture: any @@ -36,6 +59,3 @@ Description: text mode graphics utilities the screen, cacafire is a port of AALib's aafire and displays burning ASCII art flames, cacamoir animates colourful moire circles and cacaplas displays an old school plasma effect. - . - cacademo is a simple application that shows the libcaca rendering features - such as line and ellipses drawing, triangle filling and sprite blitting. diff --git a/debian/copyright b/debian/copyright index 6c4b512..6eb3a5f 100644 --- a/debian/copyright +++ b/debian/copyright @@ -43,7 +43,7 @@ Copyright (c) 1998, 1999, 2001 Jan Hubicka You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA On Debian GNU/Linux systems, the complete text of the GNU Lesser General Public License can be found in `/usr/share/common-licenses/LGPL'. diff --git a/debian/rules b/debian/rules index 5261334..60612c8 100755 --- a/debian/rules +++ b/debian/rules @@ -40,11 +40,16 @@ install: build dh_clean -k dh_installdirs -plibcaca-dev dh_installdirs usr/bin usr/share/doc/caca-utils usr/share/man/man1 -pcaca-utils + dh_installdirs usr/lib -plibcucul0 + dh_installdirs usr/lib -plibcaca0 $(MAKE) install DESTDIR=`pwd`/debian/libcaca-dev/ + mv debian/libcaca-dev/usr/lib/libcucul*.so.* debian/libcucul0/usr/lib + + mv debian/libcaca-dev/usr/lib/libcaca*.so.* debian/libcaca0/usr/lib + mv debian/libcaca-dev/usr/bin/cacaball debian/caca-utils/usr/bin - 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 @@ -53,8 +58,6 @@ install: build mv debian/libcaca-dev/usr/share/libcaca debian/caca-utils/usr/share mv debian/libcaca-dev/usr/share/man/man1/cacaball.1 \ debian/caca-utils/usr/share/man/man1/ - mv debian/libcaca-dev/usr/share/man/man1/cacademo.1 \ - 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 \ @@ -97,7 +100,7 @@ binary-arch: build install dh_strip dh_compress dh_fixperms -# dh_makeshlibs + dh_makeshlibs dh_installdeb # dh_perl dh_shlibdeps diff --git a/doc/Makefile.am b/doc/Makefile.am index 526fc80..55b71b4 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -2,7 +2,7 @@ EXTRA_DIST = doxygen.cfg.in footer.html header.html $(man_MANS) -man_MANS = caca-config.1 cacademo.1 cacaview.1 +man_MANS = caca-config.1 cacafire.1 cacaview.1 if BUILD_DOCUMENTATION htmldoc_DATA = html/doxygen.css @@ -48,12 +48,10 @@ if BUILD_DOCUMENTATION cp `find man -name '*.3caca'` $(DESTDIR)$(mandir)/man3 $(mkinstalldirs) $(DESTDIR)$(mandir)/man1 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 + ln -s cacafire.1 $(DESTDIR)$(mandir)/man1/cacaball.1 rm -f $(DESTDIR)$(mandir)/man1/cacamoir.1 - ln -s cacademo.1 $(DESTDIR)$(mandir)/man1/cacamoir.1 + ln -s cacafire.1 $(DESTDIR)$(mandir)/man1/cacamoir.1 rm -f $(DESTDIR)$(mandir)/man1/cacaplas.1 - ln -s cacademo.1 $(DESTDIR)$(mandir)/man1/cacaplas.1 + ln -s cacafire.1 $(DESTDIR)$(mandir)/man1/cacaplas.1 endif diff --git a/doc/cacademo.1 b/doc/cacafire.1 similarity index 63% rename from doc/cacademo.1 rename to doc/cacafire.1 index 2db804c..224f6b4 100644 --- a/doc/cacademo.1 +++ b/doc/cacafire.1 @@ -1,10 +1,8 @@ -.TH libcaca 1 "2004-1-6" "libcaca" +.TH libcaca 1 "2006-3-6" "libcaca" .SH NAME -cacademo, cacaball, cacafire, cacamoir, cacaplas \- libcaca's demonstration +cacaball, cacafire, cacamoir, cacaplas \- libcaca's demonstration applications .SH SYNOPSIS -cacademo -.PP cacaball .PP cacafire @@ -14,14 +12,9 @@ cacamoir cacaplas .RI .SH DESCRIPTION -This manual page documents briefly the cacademo, cacaball, cacafire, cacamoir +This manual page documents briefly the cacaball, cacafire, cacamoir 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 @@ -33,14 +26,21 @@ displays a coloured ASCII art moire pattern of concentric circles. .PP .B cacaplas displays an old school ASCII art plasma effect. +.SH KEYS +.TP +.B Space +pauses and resumes the program +.TP +.B Esc +exits the program .SH BUGS Please report any bugs you find to . .SH LICENSE -cacademo, cacaball, cacamoir and cacaplas are covered by the Do What The -Fuck You Want Public License (WTFPL). +cacaball, cacamoir and cacaplas are covered by the Do What The +Fuck You Want To Public License (WTFPL). cacafire is covered by the GNU Lesser General Public License (LGPL). .SH AUTHORS -.B cacademo, cacamoir +.B cacamoir and this manual page were written by Sam Hocevar . .PP .B cacaball diff --git a/libcaca.spec b/libcaca.spec index 69c6976..e8f5358 100644 --- a/libcaca.spec +++ b/libcaca.spec @@ -52,9 +52,6 @@ the screen, cacafire is a port of AALib's aafire and displays burning ASCII art flames, cacamoir animates colourful moire circles and cacaplas displays an old school plasma effect. -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 all) @@ -95,7 +92,6 @@ rm -rf %{buildroot} %files -n caca-utils %defattr(-,root,root) %{_prefix}/bin/cacaball -%{_prefix}/bin/cacademo %{_prefix}/bin/cacafire %{_prefix}/bin/cacamoir %{_prefix}/bin/cacaplas @@ -103,7 +99,6 @@ rm -rf %{buildroot} %{_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* diff --git a/msvc/Makefile.am b/msvc/Makefile.am index 68aa5f5..422b31a 100644 --- a/msvc/Makefile.am +++ b/msvc/Makefile.am @@ -7,7 +7,6 @@ EXTRA_DIST = \ config.h \ libcaca.vcproj \ cacaball.vcproj \ - cacademo.vcproj \ cacafire.vcproj \ cacamoir.vcproj \ cacaplas.vcproj \ diff --git a/msvc/cacademo.vcproj b/msvc/cacademo.vcproj deleted file mode 100644 index aaa2737..0000000 --- a/msvc/cacademo.vcproj +++ /dev/null @@ -1,122 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/msvc/libcaca.sln b/msvc/libcaca.sln index c63b01e..34ced88 100644 --- a/msvc/libcaca.sln +++ b/msvc/libcaca.sln @@ -5,8 +5,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cacaview", "cacaview.vcproj EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cacaball", "cacaball.vcproj", "{7C6ECE78-045C-458D-8B8F-DEC2C9CB9C14}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cacademo", "cacademo.vcproj", "{C2C2652D-A50D-4803-90B5-0DCD041980CF}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cacafire", "cacafire.vcproj", "{F25D1237-9ED8-4343-B958-308C95FE392F}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cacamoir", "cacamoir.vcproj", "{5D336F08-9B06-4C19-94C7-EB423296B83E}" @@ -21,7 +19,6 @@ Global GlobalSection(ProjectDependencies) = postSolution {62E567BD-73B7-4C1E-9919-6423C8A8F72E}.0 = {8951ECB0-7CFE-41AB-A426-98D7C441BEA4} {7C6ECE78-045C-458D-8B8F-DEC2C9CB9C14}.0 = {8951ECB0-7CFE-41AB-A426-98D7C441BEA4} - {C2C2652D-A50D-4803-90B5-0DCD041980CF}.0 = {8951ECB0-7CFE-41AB-A426-98D7C441BEA4} {F25D1237-9ED8-4343-B958-308C95FE392F}.0 = {8951ECB0-7CFE-41AB-A426-98D7C441BEA4} {5D336F08-9B06-4C19-94C7-EB423296B83E}.0 = {8951ECB0-7CFE-41AB-A426-98D7C441BEA4} {04CC61FD-CC15-4B08-9028-BD87A63E7365}.0 = {8951ECB0-7CFE-41AB-A426-98D7C441BEA4} @@ -39,10 +36,6 @@ Global {7C6ECE78-045C-458D-8B8F-DEC2C9CB9C14}.Debug.Build.0 = Debug|Win32 {7C6ECE78-045C-458D-8B8F-DEC2C9CB9C14}.Release.ActiveCfg = Release|Win32 {7C6ECE78-045C-458D-8B8F-DEC2C9CB9C14}.Release.Build.0 = Release|Win32 - {C2C2652D-A50D-4803-90B5-0DCD041980CF}.Debug.ActiveCfg = Debug|Win32 - {C2C2652D-A50D-4803-90B5-0DCD041980CF}.Debug.Build.0 = Debug|Win32 - {C2C2652D-A50D-4803-90B5-0DCD041980CF}.Release.ActiveCfg = Release|Win32 - {C2C2652D-A50D-4803-90B5-0DCD041980CF}.Release.Build.0 = Release|Win32 {F25D1237-9ED8-4343-B958-308C95FE392F}.Debug.ActiveCfg = Debug|Win32 {F25D1237-9ED8-4343-B958-308C95FE392F}.Debug.Build.0 = Debug|Win32 {F25D1237-9ED8-4343-B958-308C95FE392F}.Release.ActiveCfg = Release|Win32