--- aview-1.3.0rc1.orig/AUTHORS +++ aview-1.3.0rc1/AUTHORS @@ -1,6 +1,6 @@ -Jan Hubicka - - Original code, maitainer -Kamil Toman +Jan Hubicka + - Original code, maintainer +Kamil Toman - Maitenance of version 1.2 Ladislav Michl - Number of fixes and improvements --- aview-1.3.0rc1.orig/main.c +++ aview-1.3.0rc1/main.c @@ -1,3 +1,4 @@ +#include #include #include "image.h" #include "ui.h" @@ -25,8 +26,8 @@ filename[0] = '\0'; for (i = 1; i < argc; i++) { - if (!strncmp(argv[i], "--", 2)) { - if (!strcmp(argv[i], "--help")) { showhelp(argv[0]); exit(0); } + if (!strncmp(argv[i], "-", 1)) { + if (!strcmp(argv[i], "--help") || !strcmp(argv[i], "-h")) { showhelp(argv[0]); exit(0); } if (!strcmp(argv[i], "--version")) { showversion(argv[0]); exit(0); } printf("Unknown option. Use %s --help for help\n", argv[0]); exit(-1); --- aview-1.3.0rc1.orig/ui.c +++ aview-1.3.0rc1/ui.c @@ -168,11 +168,11 @@ aa_puts(context, 0, 3, AA_SPECIAL, " z - unzoom Z - zoom "); aa_puts(context, 0, 4, AA_SPECIAL, " s - Save image "); aa_puts(context, 0, 5, AA_SPECIAL, " m - change dithering mode q - quit "); - aa_puts(context, 0, 6, AA_SPECIAL, " i - turns inversion on I - intversion off "); + aa_puts(context, 0, 6, AA_SPECIAL, " i - turn inversion on I - inversion off "); aa_puts(context, 0, 7, AA_SPECIAL, " u - select attributes f - select font "); aa_puts(context, 0, 8, AA_SPECIAL, " space - redraw ',','.' - change contrast "); - aa_puts(context, 0, 9, AA_SPECIAL, " ';',''' - change gamma '<','>' - change bright "); - aa_puts(context, 0, 10, AA_SPECIAL, " '+','-' - zoom/unzoom '<','>' - change bright "); + aa_puts(context, 0, 9, AA_SPECIAL, " ';',''' - change gamma '<','>' - change brightness "); + aa_puts(context, 0, 10, AA_SPECIAL, " '+','-' - zoom/unzoom "); } void main_loop(void) { --- aview-1.3.0rc1.orig/flip.c +++ aview-1.3.0rc1/flip.c @@ -7,8 +7,10 @@ #include #include +#include #include #include +#include #include #include "general.h" @@ -16,6 +18,8 @@ #define NAMELEN 256 +static int f_getkey(void); + struct OPTIONS { char filename[NAMELEN]; /* filename given on command line */ char fast; /* 1 = play without delays */ @@ -330,7 +334,7 @@ puts( " -b Process frames when they are loaded." ); puts( " -c Keep a blank screen while frames are being loaded." ); puts( " -n Play the animation sequence times." ); - puts( " -s Set delay between frames to miliseconds." ); + puts( " -s Set delay between frames to milliseconds." ); puts( " - Read flic file from standard input." ); puts( "also standard aalib options are supported" ); puts( " -dim, -bold, -reverse, -normal for enabling attributes"); @@ -705,7 +709,7 @@ aa_setsupported(c, supported); } -int f_getkey(void) +static int f_getkey(void) { int c=aa_getkey(context,0); switch(c) { @@ -769,7 +773,6 @@ int quit = 0; int playstartframe = 0; int first=1; -long t, tdelta; aa_parseoptions(NULL,NULL,&argc,argv); parse_cmdln( argc, argv, &options ); strcpy( fli.filename, options.filename ); --- aview-1.3.0rc1.orig/aview.1 +++ aview-1.3.0rc1/aview.1 @@ -1,44 +1,107 @@ -.TH NAME SECTION -.\" NAME should be all caps, SECTION should be 1-8, maybe w/ subsection -.\" other parms are allowed: see man(7), man(1) +.TH AVIEW 1 "December 17, 2001" .SH NAME -aview \- An high quality ascii-art image(pgm) browser +aview \- A high quality ASCII art image viewer .SH SYNOPSIS -.B aview -.I "[options] filename.p[ngbp]m" -.SH "DESCRIPTION" -This manual page documents briefly the -.BR aview , -and -.B asciiview -commands. +.BR "aview " [ options "] filename.p[ngbp]m" +.br +.BR "asciiview " [ options "] filename.xxx" +.SH DESCRIPTION This manual page was written for the Debian GNU/Linux distribution because the original program does not have a manual page. .PP .B aview/asciiview -is a program that show files with ascii-art. +is an image viewer which displays the images in ASCII art... +.PP .B aview -support zooming/unzooming, three dithering modes, Inversion, Contrast, Bright, -Gamma control and can save into many formats (html, text, ansi, more/less -etc...). The +supports zooming/unzooming, three dithering modes, inversion, contrast, +brightness, gamma control and can save into many formats (html, text, ansi, +more/less etc.). +.PP .B aview -can only show files in the PNM file format. But the -.B asciiview -program convert the file formats to PNM (with extern programs like NetPBM and -ImageMagic) and start -.B aview. -It's support the driver from the aalib. Normaly slang, x11 and stdout. It -support the mousedriver (X11 and gpm) too. -.SH OPTIONS -For a complete description, make only +can only show files in the PNM file format. But +.B asciiview +automatically converts the file formats to PNM (with extern programs like +NetPBM and ImageMagic) and then runs +.BR aview . +.PP +It supports the usual aalib drivers (e.g. slang, x11 and stdout) as well as +the mousedrivers X11 and gpm. +.SH CONTROLS +.TP +.BR a , w , d , x +Move the image one row/column. +.TP +.BR A , W , D , X +Move the image one page. +.TP +.BR Z , + +Zoom in. +.TP +.BR z , - +Zoom out. +.TP +.B s +Save image. +.TP +.B m +Change dithering mode. +.TP +.B q +Quit the viewer. .TP -.B aview -.TP -This show all option. +.B i +Turn inversion on. +.TP +.B I +Turn inversion off. +.TP +.B u +Select attributes. +.TP +.B f +Select font. +.TP +.B SPACE +Redraw screen. +.TP +.B . +Increase contrast (dot). +.TP +.B , +Decrease contrast (comma). +.TP +.B ' +Increase gamma (single quote). +.TP +.B ; +Decrease gamma (semicolon). +.TP +.B > +Increase brightness. +.TP +.B < +Decrease brightness. +.SH OPTIONS +For a complete description, type +.BR "aview --help" . +This shows all options. +.SH BUGS +Please report any bugs you find to Jan Hubicka . +.SH LICENSE +.B aview +is covered by the GNU General Public License (GPL). .SH "SEE ALSO" -.B bb -, -.B "aalib (info-page)" +.BR aafire (1), +.BR aainfo (1), +.BR aasavefont (1), +.BR aatest (1), +.BR aaflip (1), +.BR aa3d (1), +.BR aatv (1), +.BR bb (1), +.BR xaos (6). .SH AUTHOR +Jan Hubicka +.PP This manual page was written by Michael Bramer , for the Debian GNU/Linux system (but may be used by others). --- aview-1.3.0rc1.orig/asciiview +++ aview-1.3.0rc1/asciiview @@ -7,9 +7,9 @@ } myconvert() { - if anytopnm $1 >/tmp/aview$$.pgm 2>/dev/null ; then + if anytopnm "$1" >/tmp/aview$$.pgm 2>/dev/null ; then exit - elif convert -colorspace gray $1 pgm:- 2>/dev/null ; then + elif convert -colorspace gray "$1" pgm:- 2>/dev/null ; then exit fi echo "Failed to convert file format to PNM by both convert and anytopnm" >&2 @@ -33,8 +33,9 @@ " exit 1 fi +counter=0 while [ "$1" != "" ]; do - case $1 in + case "$1" in "-font" | "-driver" | "-kbddriver" | "-mousedriver" | "-*width" | "-*height" | "-bright" | "-contrast" | "-gamma" | "-random" | "-dimmul" | "-boldmul") options="$options $1 $2" shift @@ -45,7 +46,8 @@ shift ;; *) - filenames="$filenames $1" + filenames[$counter]="$1" + counter=$(($counter+1)) shift ;; esac @@ -53,21 +55,23 @@ trap clear 0 mkfifo /tmp/aview$$.pgm outfile=/tmp/aview$$.pgm -for name in $filenames ; do -if test -r $name ; then -case $name in +while [ $counter -gt 0 ]; do +counter=$(($counter-1)) +name=${filenames[$counter]} +if test -r "$name" ; then +case "$name" in *.fli | *.lfc | *.flic ) PATH="$PATH:." - aaflip $options $name + aaflip $options "$name" ;; *) - myconvert $name >/tmp/aview$$.pgm & + myconvert "$name" >/tmp/aview$$.pgm & pid=$! PATH="$PATH:." aview $options /tmp/aview$$.pgm kill $pid 2>/dev/null esac else - echo "$name could not be opended" + echo "The file '$name' could not be opened." fi done --- aview-1.3.0rc1.orig/debian/changelog +++ aview-1.3.0rc1/debian/changelog @@ -0,0 +1,174 @@ +aview (1.3.0rc1-6ubuntu1) breezy; urgency=low + + * Rebuild for aalib and slang2 transition + + -- Sebastian Dröge Wed, 24 Aug 2005 21:53:48 +0200 + +aview (1.3.0rc1-6) unstable; urgency=low + + * Switched to cdbs. + * Fixed typos (Closes: #232356, #223105). + * Standards-Version: 3.6.1.0. + + -- Uwe Hermann Mon, 16 Feb 2004 00:18:10 +0100 + +aview (1.3.0rc1-5) unstable; urgency=low + + * Changed my email address to uwe@debian.org. + * debian/control: Fixed typo (Closes: #124432). + + -- Uwe Hermann Mon, 31 Dec 2001 17:29:38 +0100 + +aview (1.3.0rc1-4) unstable; urgency=low + + * New maintainer (with permission from Michael Bramer ). + * Repackaged from scratch using debhelper v3. + * Removed useless debian/*.ex and debian/substvars.debhelper. + * Moved the aaflip manpage into the debian/ directory in the source package. + * debian/aaflip.1: + + Slightly improved description. + + Added sections BUGS and LICENSE. + + Added upstream author to the AUTHOR section. + + Added several programs to the "SEE ALSO" section. + + Fixed typos and several smaller issues. + + Install the manpage, it was a link to undocumented(7) before... + * aview.1: + + Improved description. + + Document asciiview in this manpage, too. + + Added sections BUGS and LICENSE. + + Added lots of programs to the "SEE ALSO" section. + + Added section CONTROLS (Closes: #117277). + + Lots of smaller fixes. + * debian/control: + + Removed unnecessary Build-Dependencies 'slang1-dev', 'libncurses5-dev' + and 'libgpmg1-dev'. They are not used directly, aalib1-dev just depends + on them... + + debhelper is a versioned Build-Dependency now. + + Improved package description. + + Standards-Version: 3.5.6.0 + * Added support for DEB_BUILD_OPTIONS. + * Fix lintian warning about -rpath usage. + * debian/copyright: + + Updated URL to upstream tarball. + + List upstream author. + * debian/dirs: Removed, not necessary. + * Fixed a few compiler warnings. + * debian/docs: Additionally install AUTHORS, ANNOUNCE and NEWS. + * debian/changelog: Removed add-log-mailing-address (lintian). + * Do not install the asciiview(1) manpage, which is now documented in + aview(1). asciiview(1) is a symlink to aview(1). + * Fixed the code to also recognize -h, not only --help. + * flip.c: Typo (mentioned by Edward Betts in #101452). + * Added Aaron Lehmann to the authors of the aaflip(1) + manpage (see #101452). + * Applied patch from Torsten Hilbrich which + adds support to asciiview for filenames which contain + spaces (Closes: #116489). + * AUTHORS: Typo. + + -- Uwe Hermann Mon, 17 Dec 2001 19:01:03 +0100 + +aview (1.3.0rc1-3) unstable; urgency=low + + * remove man-pages from /usr/man/ (Closes: #98997, #100033) + * add -isp to dpkg-gencontrol + * use dh_clean in debian/rules clean + * cp /usr/share/automake/config.* / (Closes: #105116) (hopefully) + * add man page aaflip, thanks Aaron Lehmann and Edward Betts + (Closes: #101452) + * add new man page from Edward Betts (Closes: #107669) + + -- Michael Bramer Mon, 11 Jun 2001 07:10:31 +0100 + +aview (1.3.0rc1-2) unstable; urgency=low + + * fix build-depends Closes: #96351 + + -- Michael Bramer Mon, 7 May 2001 07:10:31 +0100 + +aview (1.3.0rc1-1) unstable; urgency=low + + * new upstream + * upstream has add my man-pages and improve asciiview + * The aa project is alive again, updated copyright file to point to + new homepage. + + -- Michael Bramer Wed, 14 Feb 2001 21:00:40 +0100 + +aview (1.2-10) frozen unstable; urgency=low + + * remove dh_debstd with other dh_* closes: #85970 + + -- Michael Bramer Wed, 14 Feb 2001 21:00:40 +0100 + +aview (1.2-9) frozen unstable; urgency=low + + * add build-depends items closes: #59270 + * add patch from Gerfried Fuchs closes: #70769 + + -- Michael Bramer Tue, 13 Feb 2001 14:41:15 +0100 + +aview (1.2-8.1) frozen unstable; urgency=low + + * NMU + * Adds build-depends: closes: #58577 + * Fixed dependency info, closes: #59033 + + -- Randolph Chung Sat, 26 Feb 2000 10:21:27 -0700 + +aview (1.2-8) frozen unstable; urgency=low + + * rebuild for potato, make change in flips.c: + use string.h and not the optimized sstring.h from the package + this close Bug:#58577 + + -- Michael Bramer Wed, 23 Feb 2000 23:34:43 +0100 + +aview (1.2-7) unstable; urgency=low + + * recompile with new libs (sorry, the mirror was not update) + + -- Michael Bramer Wed, 23 Feb 2000 23:34:21 +0100 + +aview (1.2-6) unstable; urgency=low + + * recompile with new libs. + + -- Michael Bramer Mon, 18 Oct 1999 01:15:54 +0200 + +aview (1.2-5) unstable; urgency=low + + * compile with new ncurses + + -- Michael Bramer Thu, 4 Mar 1999 13:18:46 +0100 + +aview (1.2-4) unstable; urgency=low + + * move maintainer address to the right + * make a better man-page, FIX #26563 + + -- Michael Bramer Thu, 17 Dec 1998 19:37:49 +0100 + +aview (1.2-3) unstable; urgency=low + + * make diffs for alpha (thanks to Paul Slootman) (close#26279) + + -- Michael Bramer Tue, 8 Sep 1998 18:07:04 +0200 + +aview (1.2-2) unstable; urgency=low + + * fix lintian spelling-error-in-description + * add '#!/bin/bash' to asciiview + * Switches on the automatic manpage to undocumented + + -- Michael Bramer Wed, 26 Aug 1998 11:47:46 +0200 + +aview (1.2-1) unstable; urgency=low + + * Initial Release. + + -- Michael Bramer Sat, 15 Aug 1998 16:59:57 +0200 + +Local variables: +mode: debian-changelog +End: --- aview-1.3.0rc1.orig/debian/aaflip.1 +++ aview-1.3.0rc1/debian/aaflip.1 @@ -0,0 +1,83 @@ +.TH AAFLIP 1 "December 17, 2001" +.SH NAME +aaflip \- An ASCII art video player +.SH SYNOPSIS +.B aaflip +.RB [\| \-abcfv \|] +.RB [\| \-n +.RB number \|] +.RB [\| \-s +.RB delay \|] +.SH DESCRIPTION +.B aaflip +is an ASCII art video player which supports the fli and flc formats. +.PP +fli files are limited to a resolution of 320x200 pixel, while flc files can +have any resolution. +.PP +The default method of playing is to load the first frame of the animation +sequence and display it. After this the remainder of the file is loaded +into memory, and the animation starts. The animation ends when q or ctrl-c +is pressed. +.SH OPTIONS +.TP +.B \-a +Remove frames from memory after processing. Using this option leaves more +memory for other processes, but relies on the buffer cache for continuous +animation. +.TP +.B \-b +Process frames immediately as they are loaded. When using this option the +animation frames are shown as soon as the player has read them, so you don't +have to wait until the entire file has been read. The disadvantage is that the +animation becomes jumpy if the speed set by the animation is higher than the +speed of loading. +.TP +.B \-c +Keep the screen black while loading the animation. This conflicts with option +.BR -b , +which can give interesting results. +.TP +.B \-f +Switch off clock synchronization. Animation will run as fast as possible. +.TP +.B \-v +Show information on flic file. +.TP +.B "\-n number" +Play the animation sequence +.I number +times. +.TP +.B "\-s delay" +Set delay between frames to +.I delay +milliseconds. Option +.B "\-s 0" +is the same as +.BR \-f . +.SH BUGS +Please report any bugs you find to Jan Hubicka . +.SH LICENSE +.B aaflip +is covered by the GNU General Public License (GPL). +.SH HISTORY +.B aaflip +is based on the FLI Player written by John Remyn . +.SH "SEE ALSO" +.BR aafire (1), +.BR aainfo (1), +.BR aasavefont (1), +.BR aatest (1), +.BR aview (1), +.BR asciiview (1), +.BR aa3d (1), +.BR aatv (1), +.BR bb (1), +.BR xaos (6). +.SH AUTHOR +Jan Hubicka +.PP +This manual page was written by Edward Betts and +Aaron Lehmann , for the Debian GNU/Linux system +(but may be used by others). --- aview-1.3.0rc1.orig/debian/control +++ aview-1.3.0rc1/debian/control @@ -0,0 +1,30 @@ +Source: aview +Section: graphics +Priority: optional +Maintainer: Uwe Hermann +Build-Depends: cdbs, debhelper (>= 4.1.46), libaa1-dev +Standards-Version: 3.6.1.0 + +Package: aview +Architecture: any +Depends: ${shlibs:Depends} +Suggests: imagemagick, netpbm +Description: A high quality ASCII art image viewer and video player + aview is a high quality ASCII art image viewer and video player. It is + especially useful with a text-based browser such as lynx, links or w3m. + . + It supports the pnm, pgm, pbm and ppm image formats, as well as + the FLI and FLC video formats. It also supports output via stdio, + (n)curses and slang and even has support for gpm. + . + Features + * High quality ASCII art rendering + * Portable + * Save into many formats (HTML, text, ANSI, more/less etc...) + * Contrast, Bright, Gamma control + * Image zooming/unzooming + * Three dithering modes + * Hidden "bonus" features :) + * Inversion + * Support for bright, dim, inverse attributes/extended character set + --- aview-1.3.0rc1.orig/debian/compat +++ aview-1.3.0rc1/debian/compat @@ -0,0 +1 @@ +4 --- aview-1.3.0rc1.orig/debian/copyright +++ aview-1.3.0rc1/debian/copyright @@ -0,0 +1,30 @@ +This package was debianized by Uwe Hermann on +Thu, 25 Oct 2001 16:25:52 +0200. + +This package was originally debianized by Michael Bramer , +who also maintained it up to version 1.3.0rc1-3. + +It was downloaded from +http://prdownloads.sourceforge.net/aa-project/aview-1.3.0rc1.tar.gz + +Upstream Author: Jan Hubicka + +Copyright: + + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 dated June, 1991. + + This package 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 General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. + +On Debian GNU/Linux systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + --- aview-1.3.0rc1.orig/debian/docs +++ aview-1.3.0rc1/debian/docs @@ -0,0 +1,6 @@ +NEWS +README +README.flip +TODO +AUTHORS +ANNOUNCE --- aview-1.3.0rc1.orig/debian/rules +++ aview-1.3.0rc1/debian/rules @@ -0,0 +1,18 @@ +#!/usr/bin/make -f + +# Include cdbs debhelper support. +include /usr/share/cdbs/1/rules/debhelper.mk + +# Include cdbs autotools support. +include /usr/share/cdbs/1/class/autotools.mk + +# Install additional manpages. +DEB_INSTALL_MANPAGES_aview := debian/aaflip.1 + +# Create symlinks. +DEB_DH_LINK_ARGS = usr/share/man/man1/aview.1 usr/share/man/man1/asciiview.1 + +# Remove asciiview.1, so we can create the symlink above. +binary-pre-install/aview:: + rm -f $(CURDIR)/debian/aview/usr/share/man/man1/asciiview.1 + --- aview-1.3.0rc1.orig/debian/rules.old +++ aview-1.3.0rc1/debian/rules.old @@ -0,0 +1,85 @@ +#!/usr/bin/make -f +# Sample debian/rules that uses debhelper. +# GNU copyright 1997 to 1999 by Joey Hess. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +# This is the debhelper compatability version to use. +export DH_COMPAT=3 + +configure: configure-stamp +configure-stamp: + dh_testdir + +ifeq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) + CFLAGS="-O2 -Wall" ./configure --prefix=/usr --mandir=\$${prefix}/share/man +else + CFLAGS="-g -O2 -Wall" ./configure --prefix=/usr --mandir=\$${prefix}/share/man +endif + + # Don't use -rpath... + cat Makefile | sed 's/-Wl,-rpath,\/usr\/lib//g' > Makefile.new; sleep 1 + mv Makefile.new Makefile + + 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 + $(MAKE) install prefix=$(CURDIR)/debian/aview/usr + + # Remove useless manpage, asciiview is documented in aview(1), now. + rm -f $(CURDIR)/debian/aview/usr/share/man/man1/asciiview.1 + +# 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_testdir + dh_testroot +# dh_installdebconf + dh_installdocs + #dh_installexamples + dh_installmenu +# dh_installlogrotate +# dh_installemacsen +# dh_installpam +# dh_installmime +# dh_installinit + #dh_installcron + dh_installman debian/aaflip.1 + #dh_installinfo +# dh_undocumented + dh_installchangelogs ChangeLog + dh_link usr/share/man/man1/aview.1 usr/share/man/man1/asciiview.1 + 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