From: Marius Gavrilescu Date: Sat, 11 Mar 2023 11:22:42 +0000 (+0200) Subject: Update upstream source from tag 'upstream/3.1.1' X-Git-Url: http://git.ieval.ro/?p=xfishtank.git;a=commitdiff_plain;h=da1c4a843de05b6ee70dc60fa1fcb4b5ec2d606e;hp=4c1bd65b5f48075ff80be1e401beb5ff21b4b89e Update upstream source from tag 'upstream/3.1.1' Update to upstream version '3.1.1' with Debian dir 4e65b84494ba86a0dd6b828bbd70a94fdff055a2 --- diff --git a/debian/README.maintainer.old-copyright b/debian/README.maintainer.old-copyright new file mode 100644 index 0000000..23011c7 --- /dev/null +++ b/debian/README.maintainer.old-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 diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..416ad9a --- /dev/null +++ b/debian/changelog @@ -0,0 +1,234 @@ +xfishtank (2.5-1) unstable; urgency=low + + * New upstream version + * Re-add background image support (Closes: #645128) + + -- Marius Gavrilescu Fri, 09 Aug 2013 16:22:51 +0300 + +xfishtank (2.3-2) unstable; urgency=low + + * Fix segfault when there is no DISPLAY in environment (Closes: #716500) + + -- Marius Gavrilescu Thu, 11 Jul 2013 10:56:46 +0300 + +xfishtank (2.3-1) unstable; urgency=low + + * New maintainer (Closes: #540830) + * New upstream version + * Move xfishtank to /usr/games + * Set Standards-Version to 3.9.4 + * Add hardening + * Remove the -p switch from the manpage + * Make package lintian-clean + * Add Homepage and Vcs-* to debian/control + + -- Marius Gavrilescu Tue, 09 Jul 2013 19:26:17 +0300 + +xfishtank (2.2-26) unstable; urgency=low + + * QA upload. + * Maintainer field set to QA group. + * Moved to section "games" to fix override disparities. + * build-{arch,indep} targets added. + * Standards-Version set to 3.9.3. + * Set debhelper compatibility level to 9. + + -- Emanuele Rocca Sat, 16 Jun 2012 16:35:09 +0000 + +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 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..ec63514 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..52f07d8 --- /dev/null +++ b/debian/control @@ -0,0 +1,16 @@ +Source: xfishtank +Section: games +Priority: optional +Build-Depends: debhelper (>= 9), libx11-dev, xutils-dev, libimlib2-dev +Maintainer: Marius Gavrilescu +Homepage: http://jim.rees.org/computers/xfishtank.html +Vcs-Browser: http://git.ieval.ro/?p=xfishtank.git;a=summary +Vcs-Git: http://git.ieval.ro/git/xfishtank.git +Standards-Version: 3.9.4 + +Package: xfishtank +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: turns your X root into an aquarium + Enjoy an animated aquarium background with a variety of tropical fish + swimming in it on your screen. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..79924c3 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,76 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: xfishtank +Source: https://github.com/jim-rees/xfishtank +Upstream-Contact: Jim Rees + +Files: * +Copyright: 1988-1992, Jonathan Greenblatt + 1988-1992, Dave Lemke + 1988-1992, Eric Bina +License: main license + 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. +Comment: + The original debian/copyright said: + . + # 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 + # 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 + +Files: vroot.h +Copyright: 1991, Andres Stolcke + 1990, Solbourne Computer Inc. +License: vroot license + 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. + +Files: xfishtank.1x +Copyright: 1996, Vincent Renardias +License: manpage + 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. diff --git a/debian/menu b/debian/menu new file mode 100644 index 0000000..9243cf1 --- /dev/null +++ b/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" diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..09c8b60 --- /dev/null +++ b/debian/rules @@ -0,0 +1,8 @@ +#!/usr/bin/make -f +%: + dh $@ +override_dh_auto_build: + xmkmf -a + dh_auto_build -- CCOPTIONS="$(shell dpkg-buildflags --get CFLAGS)" EXTRA_LOAD_FLAGS="$(shell dpkg-buildflags --get LDFLAGS)" SYS_LIBRARIES="-lImlib2" EXTENSIONLIB= +override_dh_auto_install: + dh_auto_install -- BINDIR=/usr/games diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..4bf8b4d --- /dev/null +++ b/debian/watch @@ -0,0 +1,3 @@ +version=3 + +https://github.com/jim-rees/xfishtank/tags .*/v(.*)\.tar\.gz diff --git a/debian/xfishtank.docs b/debian/xfishtank.docs new file mode 100644 index 0000000..a6fb622 --- /dev/null +++ b/debian/xfishtank.docs @@ -0,0 +1,4 @@ +README +README.debian +README.Linux +README.TrueColor diff --git a/debian/xfishtank.lintian-overrides b/debian/xfishtank.lintian-overrides new file mode 100644 index 0000000..1902563 --- /dev/null +++ b/debian/xfishtank.lintian-overrides @@ -0,0 +1,2 @@ +# We use killall in menu +xfishtank binary: menu-command-not-in-package