--- xfishtank-2.2.orig/xfish.c +++ xfishtank-2.2/xfish.c @@ -33,6 +33,8 @@ #include #endif +#include + #include #ifdef sgi #define _BSD_SIGNALS @@ -40,7 +42,8 @@ #include #include #include -#include +#include +#include #include "vroot.h" #include "xfishy.h" @@ -172,43 +175,13 @@ { int c, i; - char *p; extern int optind; extern char *optarg; extern double atof(); pname = argv[0]; - strcpy(sname, getenv("DISPLAY")); + strncpy(sname, getenv("DISPLAY"),sizeof(sname)-1); strcpy(cname, "MediumAquamarine"); - picname[0] = '\0'; - - if ((p = XGetDefault(Dpy, pname, "BubbleLimit")) != NULL) - blimit = atoi(p); - if ((p = XGetDefault(Dpy, pname, "ColorLimit")) != NULL) - climit = atoi(p); - if ((p = XGetDefault(Dpy, pname, "MedianCutLimit")) != NULL) - mlimit = atoi(p); - if ((p = XGetDefault(Dpy, pname, "DoClipping")) != NULL) - DoClipping = atoi(p); - if ((p = XGetDefault(Dpy, pname, "DoubleBuffer")) != NULL) - DoubleBuf = atoi(p); - if ((p = XGetDefault(Dpy, pname, "Overlap")) != NULL) - Overlap = atoi(p); - if ((p = XGetDefault(Dpy, pname, "Color")) != NULL) - strcpy(cname, p); - if ((p = XGetDefault(Dpy, pname, "Picture")) != NULL) - strcpy(picname, p); - if ((p = XGetDefault(Dpy, pname, "FishLimit")) != NULL) - flimit = atoi(p); - if ((p = XGetDefault(Dpy, pname, "IncMult")) != NULL) - smooth = atof(p); - if ((p = XGetDefault(Dpy, pname, "Rate")) != NULL) - rate = atof(p); - if ((p = XGetDefault(Dpy, pname, "Secure")) != NULL) - for (i = 0; i < 6; i++) - if (strcmp(p, yess[i]) == 0) - pmode = 0; - while ((c = getopt(argc, argv, "dDob:C:c:p:m:f:i:r:s")) != EOF) { switch (c) { case 'd': @@ -230,10 +203,10 @@ mlimit = atoi(optarg); break; case 'c': - strcpy(cname, optarg); + strncpy(cname, optarg,sizeof(cname)-1); break; case 'p': - strcpy(picname, optarg); + strncpy(picname, optarg,sizeof(picname)-1); break; case 'f': flimit = atoi(optarg); @@ -263,17 +236,14 @@ } } - if (optind < argc) - strcpy(sname, argv[optind]); + if (optind < argc) { + char *display; + strncpy(sname, argv[optind], sizeof(sname)-1); + display = (char *)malloc(strlen(sname) + 9); + snprintf(display,sizeof(display)-1, "DISPLAY=%s", sname); + putenv(display); + } - /* - * DoubleBuf is only useful if we are doing clipping on our - * own background picture, otherwise turn it off. - */ - if ((DoubleBuf)&&((!DoClipping)||(picname[0] == '\0'))) - { - DoubleBuf = 0; - } } @@ -869,7 +839,7 @@ XColor def_colrs[256]; int NumCells; - if( visual_info == NULL && DefaultDepth(Dpy, DefaultScreen(Dpy)) >= 16 ) + if( visual_info == NULL && DefaultDepth(Dpy, DefaultScreen(Dpy)) > 8 ) { visual_info = DefaultVisual(Dpy, DefaultScreen(Dpy)); r_mask = visual_info->red_mask; @@ -1044,7 +1014,7 @@ colormap = XDefaultColormap(Dpy, screen); - if (colormap == NULL) + if (colormap == (Colormap)NULL) { return; } @@ -1627,6 +1597,7 @@ XSizeHints xsh; XImage *pimage; int i, size, cnt; + char *p; unsigned char *ndata; unsigned char *ptr1, *ptr2; @@ -1634,6 +1605,45 @@ width = winfo.width; height = winfo.height; + + picname[0] = '\0'; + if ((p = XGetDefault(Dpy, pname, "BubbleLimit")) != NULL) + blimit = atoi(p); + if ((p = XGetDefault(Dpy, pname, "ColorLimit")) != NULL) + climit = atoi(p); + if ((p = XGetDefault(Dpy, pname, "MedianCutLimit")) != NULL) + mlimit = atoi(p); + if ((p = XGetDefault(Dpy, pname, "DoClipping")) != NULL) + DoClipping = atoi(p); + if ((p = XGetDefault(Dpy, pname, "DoubleBuffer")) != NULL) + DoubleBuf = atoi(p); + if ((p = XGetDefault(Dpy, pname, "Overlap")) != NULL) + Overlap = atoi(p); + if ((p = XGetDefault(Dpy, pname, "Color")) != NULL) + strcpy(cname, p); + if ((p = XGetDefault(Dpy, pname, "Picture")) != NULL) + strcpy(picname, p); + if ((p = XGetDefault(Dpy, pname, "FishLimit")) != NULL) + flimit = atoi(p); + if ((p = XGetDefault(Dpy, pname, "IncMult")) != NULL) + smooth = atof(p); + if ((p = XGetDefault(Dpy, pname, "Rate")) != NULL) + rate = atof(p); + if ((p = XGetDefault(Dpy, pname, "Secure")) != NULL) + for (i = 0; i < 6; i++) + if (strcmp(p, yess[i]) == 0) + pmode = 0; + + /* + * DoubleBuf is only useful if we are doing clipping on our + * own background picture, otherwise turn it off. + */ + if ((DoubleBuf)&&((!DoClipping)||(picname[0] == '\0'))) + { + DoubleBuf = 0; + } + + init_colormap(); if (picname[0] != '\0') @@ -1653,7 +1663,7 @@ free((char *)ndata); i = DisplayPlanes(Dpy, screen); PicMap = XCreatePixmap(Dpy, DefaultRootWindow(Dpy), Pwidth, Pheight, i); - if (PicMap == NULL) + if (PicMap == (Pixmap)NULL) { fprintf(stderr, "Cannot create background pixmap\n"); picname[0] = '\0'; @@ -2083,9 +2093,10 @@ high_res_sleep(seconds) double seconds; { - int fds = 0; + fd_set fds; struct timeval timeout; + FD_ZERO(&fds); timeout.tv_sec = seconds; timeout.tv_usec = (seconds - timeout.tv_sec) * 1000000.0; select(0, &fds, &fds, &fds, &timeout); @@ -2094,7 +2105,7 @@ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -void +int main(argc, argv) int argc; char **argv; @@ -2102,13 +2113,13 @@ int i; XEvent ev; - if ((Dpy = XOpenDisplay("")) == 0) + parse(argc, argv); + if ((Dpy = XOpenDisplay(sname)) == 0) msgdie("XOpenDisplay failed"); screen = DefaultScreen(Dpy); white = WhitePixel(Dpy, screen); black = BlackPixel(Dpy, screen); - parse(argc, argv); initialize(); srand((unsigned) getpid()); @@ -2147,5 +2158,7 @@ else XRaiseWindow(Dpy, wid); } + + return 0; } --- xfishtank-2.2.orig/Imakefile +++ xfishtank-2.2/Imakefile @@ -2,10 +2,11 @@ LOCAL_LIBRARIES = $(XLIB) DEPLIBS = $(DEPXLIB) SYS_LIBRARIES = -lm - CDEBUGFLAGS = -g + CDEBUGFLAGS = -O3 + MANSRCSUFFIX=1x - SRCS = xfish.c medcut.c read.c gifread.c - OBJS = xfish.o medcut.o read.o gifread.o + SRCS = xfish.c medcut.c read.c + OBJS = xfish.o medcut.o read.o ComplexProgramTarget(xfishtank) --- xfishtank-2.2.orig/makeh.c +++ xfishtank-2.2/makeh.c @@ -1,5 +1,6 @@ #include +#include main() { --- xfishtank-2.2.orig/read.c +++ xfishtank-2.2/read.c @@ -1,5 +1,7 @@ #include #include +#include +#include #include "compact.h" #include "medcut.h" @@ -676,11 +678,11 @@ return(bit_data); } rewind(fp); - bit_data = ReadGifBitmap(fp, w, h, colrs); +/* bit_data = ReadGifBitmap(fp, w, h, colrs); if (bit_data != NULL) { return(bit_data); - } + } */ rewind(fp); bit_data = ReadXbmBitmap(fp, w, h, colrs); if (bit_data != NULL) --- xfishtank-2.2.orig/xfishtank.1x +++ xfishtank-2.2/xfishtank.1x @@ -0,0 +1,88 @@ +.\" +.\" xfishtank.man +.\" +.\" ## +.\" +.\" Copyright (c) 1988-92 (xfishtank) +.\" Jonathan Greenblatt +.\" Dave Lemke +.\" Eric Bina +.\" +.\" Copyright (c) 1996 Vincent Renardias (This manpage) +.\" +.\" All Rights Reserved +.\" +.\" Permission to use, copy, modify, and distribute this software and +.\" its documentation for any purpose and without fee is hereby granted, +.\" provided that the above copyright notice appear in all copies and +.\" that both that copyright notice and this permission notice appear in +.\" supporting documentation, and that the name of the author not be +.\" used in advertising or publicity pertaining to distribution of the +.\" software without specific, written prior permission. +.\" +.\" This program is distributed in the hope that it will be "playable", +.\" but WITHOUT ANY WARRANTY; without even the implied warranty of +.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +.\" +.TH XFISHTANK 1 "29 November 1996" "V2.2" +.SH NAME +xfishtank \- Fish swimming across your Root Window +.SH SYNOPSIS +.B xfishtank +[-c ] [-b ] [-f ] [-i ] [-r ] [-m ] +[-C ] [-d] [-p ] [host:display] +.SH DESCRIPTION +.LP +xfishtank is a animation program to simulate an Aquarium on your X desktop. +.LP +Each fish can have up to 255 colors, but on startup the program +takes all the colors from all the fish, and squeezes them down to all fit +into the default colormap as best it can. Any fish can be any size in +width and height. To make them look more like they are swimming, fish are +animated (Very simple 2 frame animation). Fish CANNOT swim over each other, they +will turn around if they are about to collide. +.SH OPTIONS +.TP 8 +.B \-c \fIcolor\fP +Background color of the fishtank +.TP 8 +.B \-b \fIlimit\fP +Number of bubbles (Default is set to 32) +.TP 8 +.B \-f \fIlimit\fP +Number of fishes (Default is set to 10) +.TP 8 +.B \-i \fIinter\fP +Move interval (Default is set to 0.2) +.TP 8 +.B \-r \fIrate\fP +Move frequency (Default is set to 0.2) +.TP 8 +.B \-m \fInum\fP +Median cut to this many colors +.TP 8 +.B \-C \fInum\fP +Use only this many color cells +.TP 8 +.B \-d +Clip fish, swim on root window +.TP 8 +.B \-p \fIfile\fP +Fish swim on picture in file +.TP 8 +.B \-\fIhost\fP:\fIdpy\fP +This option specifies the X server to contact. +.SH SEE ALSO +.LP +X(1), xsetroot(1x) +.SH AUTHORS +Eric Bina, <\fIebina@ncsa.uiuc.edu\fP> (Original author) +.LP +Dave Black, <\fIdlbb0@amdahl.com\fP> (Linux port) +.LP +TJ Phan, <\fIphan@aur.alcatel.com\fP> (TrueColor Support) +.LP +Vincent Renardias <\fIvincent@waw.com\fP> (man page, Debian packaging) +.LP +Send bugs (or their reports, or fixes) here: +.RI < http://www.debian.org/Bugs/ >. --- xfishtank-2.2.orig/vroot.h +++ xfishtank-2.2/vroot.h @@ -1,3 +1,29 @@ +/* -*- Mode: C; tab-width: 2 -*- */ +/*****************************************************************************/ +/** Copyright 1991 by Andreas Stolcke **/ +/** Copyright 1990 by Solbourne Computer Inc. **/ +/** Longmont, Colorado **/ +/** **/ +/** All Rights Reserved **/ +/** **/ +/** Permission to use, copy, modify, and distribute this software and **/ +/** its documentation for any purpose and without fee is hereby **/ +/** granted, provided that the above copyright notice appear in all **/ +/** copies and that both that copyright notice and this permis- **/ +/** sion notice appear in supporting documentation, and that the **/ +/** name of Solbourne not be used in advertising **/ +/** in publicity pertaining to distribution of the software without **/ +/** specific, written prior permission. **/ +/** **/ +/** ANDREAS STOLCKE AND SOLBOURNE COMPUTER INC. DISCLAIMS ALL WARRANTIES **/ +/** WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF **/ +/** MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL ANDREAS STOLCKE **/ +/** OR SOLBOURNE BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL **/ +/** DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA **/ +/** OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER **/ +/** TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE **/ +/** OR PERFORMANCE OF THIS SOFTWARE. **/ +/*****************************************************************************/ /* * vroot.h -- Virtual Root Window handling header file * @@ -14,64 +40,111 @@ * Most simple root window changing X programs can be converted to using * virtual roots by just including * - * #include "vroot.h" + * #include * * after all the X11 header files. It has been tested on such popular * X clients as xphoon, xfroot, xloadimage, and xaqua. + * It also works with the core clients xprop, xwininfo, xwd, and editres + * (and is necessary to get those clients working under tvtwm). + * It does NOT work with xsetroot; get the xsetroot replacement included in + * the tvtwm distribution instead. * - * Andreas Stolcke (stolcke@ICSI.Berkeley.EDU), 9/7/90 + * Andreas Stolcke , 9/7/90 + * - replaced all NULL's with properly cast 0's, 5/6/91 + * - free children list (suggested by Mark Martin ), 5/16/91 + * - include X11/Xlib.h and support RootWindowOfScreen, too 9/17/91 + * + * Jamie Zawinski , 28-Apr-1997 + * - use ANSI C + * + * Jamie Zawinski , 3-Sep-2003 + * - if the environment variable "XSCREENSAVER_WINDOW" is set, use that + * as the root window instead of searching for __SWM_VROOT. */ +#ifndef _VROOT_H_ +#define _VROOT_H_ +#define _XSCREENSAVER_VROOT_H_ + +#if !defined(lint) && !defined(SABER) +static const char vroot_rcsid[] = + "#Id: vroot.h,v 1.5 2003/09/04 01:04:38 jwz Exp #" "\n" + "#Id: vroot.h,v 1.4 1991/09/30 19:23:16 stolcke Exp stolcke #"; +#endif + #include #include +#include static Window -VirtualRootWindow(dpy, screen) -Display *dpy; +#ifdef __STDC__ /* ANSIfication added by jwz, to avoid superfluous warnings. */ +VirtualRootWindowOfScreen(Screen *screen) +#else /* !__STDC__ */ +VirtualRootWindowOfScreen(screen) Screen *screen; +#endif /* !__STDC__ */ { - static Display *save_dpy = (Display *)0; - static int save_screen = -1; + static Screen *save_screen = (Screen *)0; static Window root = (Window)0; - Atom __SWM_VROOT = None; - int i; - Window rootReturn, parentReturn, *children; - unsigned int numChildren; + if (screen != save_screen) { + Display *dpy = DisplayOfScreen(screen); + Atom __SWM_VROOT = None; + int i; + Window rootReturn, parentReturn, *children; + unsigned int numChildren; + + /* first check for a hex or decimal window ID in the environment */ + const char *xss_id = getenv("XSCREENSAVER_WINDOW"); + if (xss_id && *xss_id) { + unsigned long id = 0; + char c; + if (1 == sscanf (xss_id, " 0x%lx %c", &id, &c) || + 1 == sscanf (xss_id, " %lu %c", &id, &c)) { + root = (Window) id; + save_screen = screen; + return root; + } + } - if ( dpy != save_dpy || screen != save_screen ) { - root = RootWindow(dpy, screen); + root = RootWindowOfScreen(screen); /* go look for a virtual root */ __SWM_VROOT = XInternAtom(dpy, "__SWM_VROOT", False); - XQueryTree(dpy, root, &rootReturn, &parentReturn, - &children, &numChildren); - for (i = 0; i < numChildren; i++) { - Atom actual_type; - int actual_format; - unsigned long nitems, bytesafter; - Window *newRoot = (Window *)0; - - if (XGetWindowProperty(dpy, children[i], __SWM_VROOT, - 0, 1, False, XA_WINDOW, - &actual_type, &actual_format, - &nitems, &bytesafter, - (unsigned char **) &newRoot) == Success - && newRoot) { - root = *newRoot; - break; + if (XQueryTree(dpy, root, &rootReturn, &parentReturn, + &children, &numChildren)) { + for (i = 0; i < numChildren; i++) { + Atom actual_type; + int actual_format; + unsigned long nitems, bytesafter; + Window *newRoot = (Window *)0; + + if (XGetWindowProperty(dpy, children[i], + __SWM_VROOT, 0, 1, False, XA_WINDOW, + &actual_type, &actual_format, + &nitems, &bytesafter, + (unsigned char **) &newRoot) == Success + && newRoot) { + root = *newRoot; + break; + } } + if (children) + XFree((char *)children); } - save_dpy = dpy; save_screen = screen; } return root; } -#undef DefaultRootWindow -#define DefaultRootWindow(dpy) RootWindow(dpy, DefaultScreen(dpy)) +#undef RootWindowOfScreen +#define RootWindowOfScreen(s) VirtualRootWindowOfScreen(s) #undef RootWindow -#define RootWindow(dpy,screen) VirtualRootWindow(dpy,screen) +#define RootWindow(dpy,screen) VirtualRootWindowOfScreen(ScreenOfDisplay(dpy,screen)) + +#undef DefaultRootWindow +#define DefaultRootWindow(dpy) VirtualRootWindowOfScreen(DefaultScreenOfDisplay(dpy)) +#endif /* _VROOT_H_ */ --- xfishtank-2.2.orig/debian/README.maintainer +++ xfishtank-2.2/debian/README.maintainer @@ -0,0 +1,4 @@ +The upstream source contains gif code. This would put the package in +non-free. To fix, you need to run this command: + + rm -f gifread.c fishtogif/writegif.c giftofish/gifread.c gifread.c --- xfishtank-2.2.orig/debian/changelog +++ xfishtank-2.2/debian/changelog @@ -0,0 +1,197 @@ +xfishtank (2.2-25.2) unstable; urgency=medium + + * Non-maintainer upload. + * Fix Copyright as proposed by Bernhard R. Link and Daniel T Chen + (Closes: #642116) + * Set urgency to medium due to rc bug fix + + -- Alexander Reichle-Schmehl Fri, 02 Dec 2011 16:51:43 +0100 + +xfishtank (2.2-25.1) unstable; urgency=low + + * Non-maintainer upload. + * Correct build dependencies (Closes: #485546, #515415) + * Remove obsolete source and diff targets. + * Don't ignore errors by make clean. + * Add a dependency on misc:Depends + * Add a versioned dependency on debhelper 7 + + -- Raphael Geissert Wed, 08 Jul 2009 03:01:55 -0500 + +xfishtank (2.2-25) unstable; urgency=low + + * Maintainer Upload, incorporates NMU + * Updated dh compat level to v7 + + -- Eric Schwartz (Skif) Wed, 10 Sep 2008 20:22:17 -0500 + +xfishtank (2.2-24.1) unstable; urgency=medium + + * Non-maintainer upload. + * Build-depend on libxext-dev, fixes FTBFS (Closes: #486972) + + -- Moritz Muehlenhoff Fri, 27 Jun 2008 21:44:24 +0200 + +xfishtank (2.2-24) unstable; urgency=low + + * Move binaries out of /usr/X11R6/bin (Closes: #362906) + + -- Eric Schwartz (Skif) Fri, 21 Jul 2006 01:44:19 -0600 + +xfishtank (2.2-23.1) unstable; urgency=low + + * Non-maintainer upload to help xlibs-dev transition + * debian/control: Replace xlibs-dev build-dep. (Closes: #346831) + + -- Marc 'HE' Brockschmidt Fri, 20 Jan 2006 14:47:32 +0100 + +xfishtank (2.2-23) unstable; urgency=low + + * Updated vroot.h to handle Xinerama (closes: #217490) + + -- Eric Schwartz Tue, 18 Nov 2003 22:09:50 -0700 + +xfishtank (2.2-22) unstable; urgency=low + + * Applied patch from Steve Kemp (closes: #176686) + + -- Eric Schwartz Mon, 7 Apr 2003 19:10:04 -0600 + +xfishtank (2.2-21) unstable; urgency=low + + * Checks for DefaultDepth > 8, instead of >= 16, as per patch by + Matthew Marjanovic (closes: #144091) + * Uses latest vroot.h from ftp.x.org/contrib/libraries (closes: #134253) + + -- Eric Schwartz Tue, 28 May 2002 22:55:56 -0600 + +xfishtank (2.2-20) unstable; urgency=low + + * Added MANSRCSUFFIX, per patch provided by tomas@groupe-internet.com + (closes: #107801) + * Added patch from Randolph Chung to build on ia64 (closes: #110214) + * Patch also fixes build problems reported by Lamont (closes: #105115) + + -- Eric Schwartz Tue, 28 Aug 2001 09:01:17 -0600 + +xfishtank (2.2-19) unstable; urgency=low + + * fixed build-deps to include xutils (closes: #102280) + + -- Eric Schwartz Tue, 26 Jun 2001 02:26:50 -0600 + +xfishtank (2.2-18) unstable; urgency=low + + * rewrote option parsing code (closes: #63725) + + -- Eric Schwartz Sat, 23 Jun 2001 18:21:00 -0600 + +xfishtank (2.2-17) unstable; urgency=low + + * Updated Maintainer + + -- Eric M. Schwartz Mon, 21 Aug 2000 21:52:00 -0700 + +xfishtank (2.2-16) unstable; urgency=low + + * Build deps. + + -- Joey Hess Sat, 4 Dec 1999 18:20:14 -0800 + +xfishtank (2.2-15) unstable; urgency=low + + * FHS + + -- Joey Hess Mon, 20 Sep 1999 21:14:45 -0700 + +xfishtank (2.2-14) unstable; urgency=low + + * Removed space after \ continuation character in menu file. + + -- Joey Hess Wed, 5 Aug 1998 14:23:36 -0700 + +xfishtank (2.2-13) unstable; urgency=low + + * Fixed minor lintian errors. + + -- Joey Hess Sat, 14 Mar 1998 20:32:57 -0800 + +xfishtank (2.2-12) unstable; urgency=low + + * Move man page into proper directory. + + -- Joey Hess Mon, 16 Feb 1998 14:10:58 -0800 + +xfishtank (2.2-11) unstable; urgency=low + + * Updated to latest standards version (was already compilent, AFAIK) + #16781 + + -- Joey Hess Wed, 7 Jan 1998 12:03:54 -0500 + +xfishtank (2.2-10) unstable; urgency=low + + * Package got corrupted on master, reupload of .orig.tar.gz. + + -- Joey Hess Wed, 3 Dec 1997 13:38:18 -0500 + +xfishtank (2.2-9) unstable; urgency=low + + * Fixed copyright file to actually give the copyright info (#14965), as + well as the upstream source location. + * Use debhelper. + * I noticed that the source package contained gif code. Rather than move + this package to non-free, I have created a new source package, with the + gif code removed. + + -- Joey Hess Sun, 16 Nov 1997 20:05:26 -0500 + +xfishtank (2.2-8) unstable; urgency=low + + * Complied with libc6 xlib (#11954). + * New maintainer. + * Added a menu file. + + -- Joey Hess Wed, 10 Sep 1997 01:15:13 -0400 + +xfishtank (2.2-7) unstable; urgency=low + + * Orphaned the package. + + -- Vincent Renardias Fri, 2 May 1997 01:16:46 +0200 + +xfishtank (2.2-6) unstable; urgency=low + + * Recompiled with libc6. + + -- Vincent Renardias Fri, 2 May 1997 01:16:46 +0200 + +xfishtank (2.2-5) unstable; urgency=low + + * Wrote manpage. (Corrects Bug #5592) + + -- Vincent Renardias Sat, 14 Dec 1996 03:42:09 +0100 + +xfishtank (2.2-4) unstable; urgency=medium + + * Maintainer changed + * Some typo. corrections + * Changed compile options, strip executable + * Added some doc. files + * Added link to undocumented.7 + + -- Vincent Renardias Sat, 19 Oct 1996 04:37:37 +0200 + +xfishtank (2.2-3) unstable; urgency=medium + + * Full Color support enabled (Will hopefully cure problems with 16bpp) + as well + + -- Christoph Lameter Thu, 08 Sep 1996 15:37:25 +0100 + +xfishtank (2.2-2) unstable; urgency=low + + * Switched to new way of doing packages + * Included copyright information etc + + -- Christoph Lameter Thu, 01 Sep 1996 15:37:25 +0100 --- xfishtank-2.2.orig/debian/rules +++ xfishtank-2.2/debian/rules @@ -0,0 +1,47 @@ +#!/usr/bin/make -f +# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +build: build-stamp +build-stamp: + dh_testdir + xmkmf -a + $(MAKE) + touch build-stamp + +clean: + dh_testdir + dh_testroot + rm -f build-stamp + [ ! -f Makefile ] || $(MAKE) clean + dh_clean Makefile + +# Build architecture-independent files here. +binary-indep: build +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build + dh_testdir + dh_testroot + dh_clean + dh_installdirs + $(MAKE) DESTDIR=debian/tmp install + dh_install + dh_installdocs README* + dh_installmenu + dh_installman xfishtank.1x + dh_installchangelogs + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary --- xfishtank-2.2.orig/debian/xfishtank.install +++ xfishtank-2.2/debian/xfishtank.install @@ -0,0 +1 @@ +xfishtank usr/bin \ No newline at end of file --- xfishtank-2.2.orig/debian/menu +++ xfishtank-2.2/debian/menu @@ -0,0 +1,4 @@ +?package(xfishtank):needs="x11" section="Games/Toys" \ + title="xfishtank - start" command="xfishtank" +?package(xfishtank):needs="x11" section="Games/Toys" \ + title="xfishtank - stop" command="killall -KILL xfishtank" --- xfishtank-2.2.orig/debian/control +++ xfishtank-2.2/debian/control @@ -0,0 +1,13 @@ +Source: xfishtank +Section: x11 +Priority: optional +Build-Depends: debhelper(>= 7), libx11-dev, xutils-dev, libxext-dev +Maintainer: Eric Schwartz (Skif) +Standards-Version: 3.5.9.0 + +Package: xfishtank +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: turns your X root into an aquarium + Enjoy an animated aquarium background on your screen, with a variety of + tropical fish swimming in it. --- xfishtank-2.2.orig/debian/compat +++ xfishtank-2.2/debian/compat @@ -0,0 +1 @@ +7 \ No newline at end of file --- xfishtank-2.2.orig/debian/copyright +++ xfishtank-2.2/debian/copyright @@ -0,0 +1,71 @@ +This is a Debian prepackaged version of xfishtank. + +This package was put together by Joey Hess , using +sources from: + ftp://ftp.x.org/R5contrib/xfishtank.tar.Z + +I tracked down John Bradley , who wrote the xfish +program back around 1987, that xfishtank is derived from. He stated the +following copyright: + +> It doesn't have one - do whatever you'd like with it. Enjoy! +> +> --jhb + +rasttofish/rasttofish.c has this copyright: + +** Copyright (C) 1989, 1991 by Jef Poskanzer. +** +** Permission to use, copy, modify, and distribute this software and its +** documentation for any purpose and without fee is hereby granted, provided +** that the above copyright notice appear in all copies and that both that +** copyright notice and this permission notice appear in supporting +** documentation. This software is provided "as is" without express or +** implied warranty. + +vroot.h has this copyright: + +/** Copyright 1991 by Andreas Stolcke **/ +/** Copyright 1990 by Solbourne Computer Inc. **/ +/** Longmont, Colorado **/ +/** **/ +/** All Rights Reserved **/ +/** **/ +/** Permission to use, copy, modify, and distribute this software and **/ +/** its documentation for any purpose and without fee is hereby **/ +/** granted, provided that the above copyright notice appear in all **/ +/** copies and that both that copyright notice and this permis- **/ +/** sion notice appear in supporting documentation, and that the **/ +/** name of Solbourne not be used in advertising **/ +/** in publicity pertaining to distribution of the software without **/ +/** specific, written prior permission. **/ +/** **/ +/** ANDREAS STOLCKE AND SOLBOURNE COMPUTER INC. DISCLAIMS ALL WARRANTIES **/ +/** WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF **/ +/** MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL ANDREAS STOLCKE **/ +/** OR SOLBOURNE BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL **/ +/** DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA **/ +/** OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER **/ +/** TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE **/ +/** OR PERFORMANCE OF THIS SOFTWARE. **/ + +README.TrueColor has this copyright: + +You may use, redistribute this version as long as you keep all the READMEs and +copyright stuff with the code. This is to ensure credit goes to those deserve. +After all, I did not write this code. I only add TrueColor support. + +There no warranty of any kind. Use this code at your own risk. Don't blame me +for any damage it may cause. Bugfixes and comments are welcome. + +Enjoy, + +TJ Phan +phan@aur.alcatel.com + +xfishtank.1x has this copyright: + +Copyright (c) 1988-92 (xfishtank) + Jonathan Greenblatt + Dave Lemke + Eric Bina