diff --git a/ChangeLog b/ChangeLog index 04a24fb..872acf2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,100 @@ +------------------------------------------------------------------------ +r789 | sam | 2006-08-13 19:30:34 +0200 (Sun, 13 Aug 2006) | 2 lines +Changed paths: + M /trunk/caca/driver_gl.c + + * Factored some of the GL code. + +------------------------------------------------------------------------ +r788 | sam | 2006-08-02 15:15:52 +0200 (Wed, 02 Aug 2006) | 2 lines +Changed paths: + M /trunk/test + M /trunk/test/matrix.c + + * A few changes to the matrix program. I do not plan to maintain it. + +------------------------------------------------------------------------ +r787 | sam | 2006-08-02 15:12:43 +0200 (Wed, 02 Aug 2006) | 3 lines +Changed paths: + M /trunk/caca/caca.c + M /trunk/caca/caca.h + M /trunk/caca/driver_conio.c + M /trunk/caca/driver_ncurses.c + M /trunk/caca/driver_raw.c + M /trunk/caca/driver_slang.c + M /trunk/caca/driver_vga.c + M /trunk/caca/event.c + M /trunk/caca/graphics.c + + * Fixed libcaca prototypes so that all functions use the errno mechanism + and return a value. + +------------------------------------------------------------------------ +r786 | sam | 2006-08-02 15:11:39 +0200 (Wed, 02 Aug 2006) | 2 lines +Changed paths: + M /trunk/cucul/cucul.c + + * Fixed cucul_create_canvas()'s documentation. + +------------------------------------------------------------------------ +r785 | sam | 2006-07-21 10:19:29 +0200 (Fri, 21 Jul 2006) | 3 lines +Changed paths: + M /trunk/cucul/dither.c + + * Fixed typos in cucul/dither.c that prevented using ordered dither modes, + thanks to Sean D'Epagnier. + +------------------------------------------------------------------------ +r784 | jylam | 2006-06-10 13:35:18 +0200 (Sat, 10 Jun 2006) | 2 lines +Changed paths: + M /trunk/cxx/caca++.cpp + M /trunk/cxx/caca++.h + M /trunk/cxx/cpptest.cpp + + * Updated C++ bindings + +------------------------------------------------------------------------ +r783 | sam | 2006-06-10 13:04:21 +0200 (Sat, 10 Jun 2006) | 3 lines +Changed paths: + M /trunk/debian/control + + * Fix debian package dependencies; -dev packages didn't pull their library + dependencies. Of course. + +------------------------------------------------------------------------ +r782 | sam | 2006-05-31 16:33:48 +0200 (Wed, 31 May 2006) | 2 lines +Changed paths: + M /trunk/test/matrix.c + + * Fixed matrix.c for non-Thinkpad computers. + +------------------------------------------------------------------------ +r781 | sam | 2006-05-31 16:08:58 +0200 (Wed, 31 May 2006) | 2 lines +Changed paths: + M /trunk/configure.ac + + * Fix a build failure when X11R7 is available but OpenGL isn't. + +------------------------------------------------------------------------ +r780 | sam | 2006-05-31 14:18:23 +0200 (Wed, 31 May 2006) | 3 lines +Changed paths: + M /trunk/test/Makefile.am + A /trunk/test/matrix.c + + * Small matrix effect. Totally useless. Unless you have a Thinkpad, in + which case it is massively useless. + +------------------------------------------------------------------------ +r779 | sam | 2006-05-29 00:19:10 +0200 (Mon, 29 May 2006) | 3 lines +Changed paths: + M /trunk/ChangeLog + M /trunk/NEWS + M /trunk/configure.ac + M /trunk/debian/changelog + + * Updated ChangeLog and NEWS. + * 0.99.beta2 release. + ------------------------------------------------------------------------ r778 | sam | 2006-05-26 09:43:41 +0200 (Fri, 26 May 2006) | 2 lines Changed paths: diff --git a/Makefile.am b/Makefile.am index 8708553..3e31044 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ # $Id$ SUBDIRS = kernel cucul caca src test tools cxx doc -DIST_SUBDIRS = $(SUBDIRS) autotools debian msvc +DIST_SUBDIRS = $(SUBDIRS) autotools msvc EXTRA_DIST = NOTES COPYING.GPL COPYING.LGPL bootstrap build-dos build-kernel build-win32 caca-config.in common.h libcaca.spec AUTOMAKE_OPTIONS = dist-bzip2 diff --git a/configure.ac b/configure.ac index b5c445d..60a1b46 100644 --- a/configure.ac +++ b/configure.ac @@ -308,7 +308,6 @@ AC_CONFIG_FILES([ cxx/Makefile doc/Makefile autotools/Makefile - debian/Makefile msvc/Makefile ]) AC_CONFIG_FILES([ diff --git a/debian/Makefile.am b/debian/Makefile.am deleted file mode 100644 index 4c42d49..0000000 --- a/debian/Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ -# $Id$ - -NULL = -EXTRA_DIST = \ - changelog \ - compat \ - control \ - copyright \ - rules \ - caca-utils.install \ - caca-utils.mime \ - libcucul-dev.install \ - libcucul0.install \ - libcaca-dev.install \ - libcaca0.install \ - $(NULL) - diff --git a/debian/caca-utils.install b/debian/caca-utils.install deleted file mode 100644 index 50d5451..0000000 --- a/debian/caca-utils.install +++ /dev/null @@ -1,14 +0,0 @@ -usr/bin/cacaball -usr/bin/cacafire -usr/bin/cacaserver -usr/bin/cacaview -usr/bin/cacamoir -usr/bin/cacaplas -usr/bin/cacaplay -usr/bin/img2irc -usr/share/man/man1/cacaball.1 -usr/share/man/man1/cacaplas.1 -usr/share/man/man1/cacafire.1 -usr/share/man/man1/cacamoir.1 -usr/share/man/man1/cacaview.1 -usr/share/libcaca diff --git a/debian/caca-utils.mime b/debian/caca-utils.mime deleted file mode 100644 index 5a1f54b..0000000 --- a/debian/caca-utils.mime +++ /dev/null @@ -1,15 +0,0 @@ -image/gif; /usr/bin/cacaview '%s'; description=GIF Image; nametemplate=%s.gif; needsterminal; priority=1 -image/jpeg; /usr/bin/cacaview '%s'; description=JPEG Image; nametemplate=%s.jpg; needsterminal; priority=1 -image/png; /usr/bin/cacaview '%s'; description=PNG Image; nametemplate=%s.png; needsterminal; priority=1 -image/tiff; /usr/bin/cacaview '%s'; description=TIFF Image; nametemplate=%s.tiff; needsterminal; priority=1 -image/bmp; /usr/bin/cacaview '%s'; description=BMP Image; nametemplate=%s.bmp; needsterminal; priority=1 -image/x-ms-bmp; /usr/bin/cacaview '%s'; description=BMP Image; nametemplate=%s.bmp; priority=1 -image/x-cmu-raster; /usr/bin/cacaview '%s'; description=CMU-RasterFile Image; nametemplate=%s.ras; priority=1 -image/g3fax; /usr/bin/cacaview '%s'; description=G3-FAX Image; nametemplate=%s.g3; priority=1 -image/targa; /usr/bin/cacaview '%s'; description=TARGA Image; nametemplate=%s.tga; priority=1 -image/x-portable-bitmap; /usr/bin/cacaview '%s'; description=PBM Image; nametemplate=%s.pbm; priority=1 -image/x-portable-graymap; /usr/bin/cacaview '%s'; description=PGM Image; nametemplate=%s.pgm; priority=1 -image/x-portable-pixmap; /usr/bin/cacaview '%s'; description=PPM Image; nametemplate=%s.ppm; priority=1 -image/x-rgb; /usr/bin/cacaview '%s'; description=RGB Image; nametemplate=%s.rgb; priority=1 -image/x-xbitmap; /usr/bin/cacaview '%s'; description=XBM Image; nametemplate=%s.xbm; priority=1 -image/x-xpixmap; /usr/bin/cacaview '%s'; description=XPM Image; nametemplate=%s.xpm; priority=1 diff --git a/debian/changelog b/debian/changelog deleted file mode 100644 index 23f831b..0000000 --- a/debian/changelog +++ /dev/null @@ -1,140 +0,0 @@ -libcaca (0.99.beta2-1) experimental; urgency=low - - * New upstream release. - - -- Sam Hocevar (Debian packages) Mon, 29 May 2006 00:04:08 +0200 - -libcaca (0.9-6) unstable; urgency=low - - * Maintainer upload. - * Acknowledging previous NMU (Closes: #349790). Thanks to Don Armstrong. - * debian/control: - + Set policy to 3.7.2. - * configure.ac: - + Work around AC_PATH_X not setting ${x_libraries} to avoid build - failures (Closes: #268651, #367854). - - -- Sam Hocevar (Debian packages) Fri, 19 May 2006 03:08:53 -0500 - -libcaca (0.9-5.1) unstable; urgency=low - - * Non-maintainer upload. - * Hard-code cacaview_LDFLAGS = -lImlib2 instead of using the output of - imlib2-config which is incorrect for GNU/* systems using dynamic - linking. (Closes: #349790) - * Add AM_MAINTAINER_MODE to configure.ac as well, to avoid build-time - regeneration of autotools files. - * Fix syntax errors in doc/Makefile.am that aren't accepted by current - automake-1.7 - * Thanks to Steve Langasek for the above patches - - -- Don Armstrong Sun, 19 Feb 2006 01:46:44 -0800 - -libcaca (0.9-5) unstable; urgency=low - - * debian/control: - + Build-depend on libslang2-dev instead of slang1-dev (Closes: #315234). - - -- Sam Hocevar (Debian packages) Thu, 23 Jun 2005 22:46:20 +0200 - -libcaca (0.9-4) unstable; urgency=low - - * debian/control: - + Build-depend on libxt-dev because autoconf's AC_PATH_X needs it to find - the X headers (Closes: #266070). - + Set policy to 3.6.1.1. - - -- Sam Hocevar (Debian packages) Tue, 17 Aug 2004 13:29:58 +0200 - -libcaca (0.9-3) unstable; urgency=low - - * doc/Makefile.am: - + Work around doxygen's new behaviour of storing .3caca manpages in the - man3caca directory instead of man3 (Closes: #250602). - - -- Sam Hocevar (Debian packages) Thu, 27 May 2004 18:08:43 -0300 - -libcaca (0.9-2) unstable; urgency=low - - * debian/control: - + Depend on libx11-dev instead of xlibs-dev. - - -- Sam Hocevar (Debian packages) Mon, 15 Mar 2004 16:48:19 +0100 - -libcaca (0.9-1) unstable; urgency=low - - * New upstream release. - - -- Sam Hocevar (Debian packages) Mon, 2 Feb 2004 03:50:43 +0100 - -libcaca (0.8-2) unstable; urgency=low - - * src/caca.c src/event.c src/graphics.c: - + Include instead of to fix m68k FTBFS. - - -- Sam Hocevar (Debian packages) Mon, 26 Jan 2004 11:47:32 +0100 - -libcaca (0.8-1) unstable; urgency=low - - * New upstream release. - - -- Sam Hocevar (Debian packages) Sun, 18 Jan 2004 05:19:23 +0100 - -libcaca (0.7-1) unstable; urgency=low - - * New upstream release. - - -- Sam Hocevar (Debian packages) Wed, 7 Jan 2004 19:16:19 +0100 - -libcaca (0.6-1) unstable; urgency=low - - * New upstream release. - - -- Sam Hocevar (Debian packages) Sat, 3 Jan 2004 23:59:08 +0100 - -libcaca (0.5-1) unstable; urgency=low - - * New upstream release. - - -- Sam Hocevar (Debian packages) Thu, 25 Dec 2003 22:34:51 +0100 - -libcaca (0.4-1) unstable; urgency=low - - * New upstream release. - * debian/control: - + Build-depend on doxygen and tetex to build documentation. - + Build-depend on xlibs-dev and slang1-dev to provide alternate drivers. - - -- Sam Hocevar (Debian packages) Tue, 23 Dec 2003 18:01:41 +0100 - -libcaca (0.3-2) unstable; urgency=low - - * debian/rules: - + Moved cacafire to the caca-utils package. - - -- Sam Hocevar (Debian packages) Thu, 18 Dec 2003 10:32:19 +0100 - -libcaca (0.3-1) unstable; urgency=low - - * New upstream release. - - -- Sam Hocevar (Debian packages) Thu, 18 Dec 2003 01:38:17 +0100 - -libcaca (0.2-2) unstable; urgency=low - - * First Debian upload (Closes: #222753). - - -- Sam Hocevar (Debian packages) Thu, 4 Dec 2003 17:57:46 +0100 - -libcaca (0.2-1) unstable; urgency=low - - * New upstream release. - - -- Sam Hocevar (Debian packages) Sun, 30 Nov 2003 17:38:23 +0100 - -libcaca (0.1-1) unstable; urgency=low - - * Initial release. - - -- Sam Hocevar (Debian packages) Sat, 22 Nov 2003 14:00:18 +0100 - diff --git a/debian/compat b/debian/compat deleted file mode 100644 index b8626c4..0000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -4 diff --git a/debian/control b/debian/control deleted file mode 100644 index 9a89dde..0000000 --- a/debian/control +++ /dev/null @@ -1,75 +0,0 @@ -Source: libcaca -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.7.2 - -Package: libcucul-dev -Section: libdevel -Architecture: any -Depends: libcucul0, ${shlibs:Depends} -Conflicts: libcaca-dev (<< 0.10-1) -Replaces: libcaca-dev (<< 0.10-1) -Description: development files for libcucul - 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 header files and static libraries needed to - compile applications or shared objects that use libcaca. - -Package: libcaca-dev -Section: libdevel -Architecture: any -Depends: libcaca0, ${shlibs:Depends}, libcucul-dev (= ${Source-Version}), libncurses5-dev, libslang2-dev, libx11-dev -Description: development files for libcaca - 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 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 -Depends: ${shlibs:Depends} -Conflicts: libcaca-dev (<= 0.3-1) -Replaces: libcaca-dev (<= 0.3-1) -Description: text mode graphics utilities - This package contains utilities and demonstration programs for libcaca, the - Colour AsCii Art library. - . - cacaview is a simple image viewer for the terminal. It opens most image - formats such as JPEG, PNG, GIF etc. and renders them on the terminal using - ASCII art. The user can zoom and scroll the image, set the dithering method - 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, cacamoir animates colourful moire circles and cacaplas displays - an old school plasma effect. diff --git a/debian/copyright b/debian/copyright deleted file mode 100644 index 6eb3a5f..0000000 --- a/debian/copyright +++ /dev/null @@ -1,49 +0,0 @@ -This package was downloaded from http://sam.zoy.org/libcaca/ - -Upstream authors: Sam Hocevar - Jean-Yves Lamoureux - John Beppu - -License for libcaca and all demos except cacafire -================================================= - -Copyright (c) 2003, 2004, 2005, 2006 Sam Hocevar - 2003, 2004, 2005, 2006 Jean-Yves Lamoureux - 2004, 2005 John Beppu - - | DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE - | Version 2, December 2004 - | - | Copyright (C) 2004 Sam Hocevar - | 22 rue de Plaisance, 75014 Paris, France - | Everyone is permitted to copy and distribute verbatim or modified - | copies of this license document, and changing it is allowed as long - | as the name is changed. - | - | DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE - | TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - | - | 0. You just DO WHAT THE FUCK YOU WANT TO. - -License for cacafire -==================== - -Copyright (c) 1998, 1999, 2001 Jan Hubicka - 2003, 2004, 2005, 2006 Sam Hocevar - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - 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., 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/libcaca-dev.install b/debian/libcaca-dev.install deleted file mode 100644 index 73c1747..0000000 --- a/debian/libcaca-dev.install +++ /dev/null @@ -1,4 +0,0 @@ -usr/include/caca.h -usr/lib/libcaca.so -usr/lib/libcaca.a -usr/lib/pkgconfig/caca.pc diff --git a/debian/libcaca0.install b/debian/libcaca0.install deleted file mode 100644 index c5c6407..0000000 --- a/debian/libcaca0.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/libcaca*.so.* diff --git a/debian/libcucul-dev.install b/debian/libcucul-dev.install deleted file mode 100644 index 79059c5..0000000 --- a/debian/libcucul-dev.install +++ /dev/null @@ -1,8 +0,0 @@ -usr/bin/caca-config -usr/include/cucul.h -usr/lib/libcucul.so -usr/lib/libcucul.a -usr/lib/pkgconfig/cucul.pc -usr/share/man/man3/*.3caca -usr/share/man/man1/caca-config.1 -usr/share/doc/libcucul-dev diff --git a/debian/libcucul0.install b/debian/libcucul0.install deleted file mode 100644 index 151aad3..0000000 --- a/debian/libcucul0.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/libcucul*.so.* diff --git a/debian/rules b/debian/rules deleted file mode 100755 index cb0d000..0000000 --- a/debian/rules +++ /dev/null @@ -1,83 +0,0 @@ -#!/usr/bin/make -f - -#export DH_VERBOSE=1 -export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) - -# FOR AUTOCONF 2.52 AND NEWER ONLY -ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) - confflags += --build $(DEB_HOST_GNU_TYPE) -else - confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) -endif - -confflags += --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info -confflags += --enable-ncurses --enable-slang --enable-x11 \ - --enable-imlib2 --enable-doc - -configure: configure-stamp -configure-stamp: - dh_testdir - ./configure $(confflags) --prefix=/usr - touch configure-stamp - -build: configure-stamp build-stamp -build-stamp: - dh_testdir - $(MAKE) - touch build-stamp - -clean: - dh_testdir - dh_testroot - rm -f build-stamp configure-stamp - -$(MAKE) distclean - dh_clean - -install: build - dh_testdir - dh_testroot - 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/tmp - dh_install --sourcedir=debian/tmp --list-missing - -# Build architecture-independent files here. -binary-indep: build install -# We have nothing to do by default. - -# Build architecture-dependent files here. -binary-arch: build install -# dh_testversion - dh_testdir - dh_testroot -# dh_installdebconf - dh_installdocs -A README TODO AUTHORS NEWS NOTES THANKS -# dh_installexamples - dh_installmenu -# dh_installemacsen -# dh_installpam -# dh_installinit - dh_installcron -# dh_installmanpages - dh_installinfo - dh_installmime -# dh_undocumented - dh_installchangelogs ChangeLog - dh_link - dh_strip - dh_compress - dh_fixperms - dh_makeshlibs - dh_installdeb -# dh_perl - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install configure