diff --git a/AUTHORS b/AUTHORS index 3bfbef3..9967b5e 100644 --- a/AUTHORS +++ b/AUTHORS @@ -3,4 +3,5 @@ Xball Authors xball: David Nedde act_area.c: Written by Dan Heller filemenu.c: Po Cheung -Debian Packaging: Stephen Birch +Debian Packaging, 2004apr29: Stephen Birch +automake Package, 2021aug23: Joe Da Silva diff --git a/COPYING b/COPYING index c361694..a2cfebd 100644 --- a/COPYING +++ b/COPYING @@ -1,10 +1,4 @@ -This package was debianized by Stephen Birch on -Thu, 29 Apr 2004 10:59:00 +0100. The original source was taken from -a source rpm distributed with SuSE 8.0 (http://www.suse.com). - -xball is licensed using the following licenses: - -Upstream Author: David Nedde +ISC License (ISC) Copyright 1993 David Nedde Permission to use, copy, modify, and distribute this software @@ -20,7 +14,7 @@ One file has additional copying policies: Author: Po Cheung Copyright 1989 The University of Texas at Austin Copyright 1990 Microelectronics and Computer Technology Corporation - + 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 @@ -32,7 +26,7 @@ One file has additional copying policies: University of Texas and MCC makes no representations about the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. - + THE UNIVERSITY OF TEXAS AND MCC DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL THE UNIVERSITY OF TEXAS OR MCC BE LIABLE FOR @@ -40,6 +34,6 @@ One file has additional copying policies: 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. - + Author: Po Cheung Created: March 10, 1989 diff --git a/ChangeLog b/ChangeLog index c629da5..fdf8734 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,21 @@ +xball (3.1.0) + + * Debian Orphaned xball brought up to date and is buildable with current PCs. + * Dropped Debian packaging and reworked xball to be built with configure make. + * 'make dist' builds package that can be built by user using ./configure make. + * xball.pc package file added. + * freedesktop configuration added and improved to include *.xball to be seen + as xball scripts. You click demo.xball and it automatically runs xball demo + Also added desktop files for 64x64, 128x128, 256x256 icon files. + * run_demo is installed in same directory as xball and demo scripts are kept + in xball data directory. + * Corrected COPYING from boilerplate to what appears to be ISC license. + * xball manual is installed as xball.6 in games manual directory. + * rgb.txt now searched and found in /usr/X11 directory. + * Due to the upgrades, bumped minor value from 0 to 1, making this ver 3.1.0 + + -- Joe Da Silva Mon, 23 Aug 2021 1:32:00 +0800 + xball (3.0.1-2) unstable; urgency=medium * QA upload. diff --git a/Makefile.am b/Makefile.am index fd09690..113396d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -25,19 +25,54 @@ run_demos: run_demos.in cat ${srcdir}/run_demos.in >> run_demos chmod +x run_demos +do_subst = sed -e 's,[@]xball[@],$(datarootdir)\/xball,' $< > $@ + +demo1.xball : demo1.xball.in + $(do_subst) < $(srcdir)/demo1.xball.in > demo1.xball + +demo2.xball : demo2.xball.in + $(do_subst) < $(srcdir)/demo2.xball.in > demo2.xball + +demo3.xball : demo3.xball.in + $(do_subst) < $(srcdir)/demo3.xball.in > demo3.xball + +demo4.xball : demo4.xball.in + $(do_subst) < $(srcdir)/demo4.xball.in > demo4.xball + +demo5.xball : demo5.xball.in + $(do_subst) < $(srcdir)/demo5.xball.in > demo5.xball + +demo6.xball : demo6.xball.in + $(do_subst) < $(srcdir)/demo6.xball.in > demo6.xball + +demo12.xball : demo12.xball.in + $(do_subst) < $(srcdir)/demo12.xball.in > demo12.xball + +demo13.xball : demo13.xball.in + $(do_subst) < $(srcdir)/demo13.xball.in > demo13.xball + +demo14.xball : demo14.xball.in + $(do_subst) < $(srcdir)/demo14.xball.in > demo14.xball + # example demo programs -DEMOS = demo1.xball demo2.xball demo3.xball demo4.xball demo5.xball \ - demo6.xball demo7.xball demo8.xball demo9.xball demo10.xball \ - demo11.xball demo12.xball demo13.xball demo14.xball +dist_DEMOSin = demo1.xball.in demo2.xball.in demo3.xball.in demo4.xball.in \ + demo5.xball.in demo6.xball.in demo12.xball.in demo13.xball.in \ + demo14.xball.in + +nodist_DEMOS = demo1.xball demo2.xball demo3.xball demo4.xball demo5.xball \ + demo6.xball demo12.xball demo13.xball demo14.xball + +dist_DEMOS = demo7.xball demo8.xball demo9.xball demo10.xball demo11.xball + +IMAGES = xball-a.xbm xball-b.xbm xball-l.xbm xball.xbm xball-x.xbm \ + man.xbm off.xbm on.xbm sgi.xbm demosdir = ${datarootdir}/xball -demos_DATA = ${DEMOS} +demos_DATA = ${dist_DEMOS} ${nodist_DEMOS} ${IMAGES} -EXTRA_DIST = run_demos.in ${DEMOS} ${noinst_HEADERS} \ +EXTRA_DIST = run_demos.in ${dist_DEMOS} ${dist_DEMOSin} ${IMAGES} \ act_area.c bootstrap filemenu.c gen_fallback good_bitmaps \ - man.xbm off.xbm on.xbm sgi.xbm stipple.xbm XBall.ad \ - xball-a.xbm xball-b.xbm xball-l.xbm xball.xbm xball-x.xbm \ - xball.6 + stipple.xbm XBall.ad xball.6 ${noinst_HEADERS} MOSTLYCLEANFILES = run_demos DISTCLEANFILES = run_demos @@ -46,9 +81,10 @@ uninstall-hook: if test -d ${datarootdir}/xball; then rmdir ${datarootdir}/xball; fi clean-local: - -rm -rf run_demos + -rm -rf run_demos ${nodist_DEMOS} distclean-local: -rm *~ -rm -rf autom4te.cache -rm -rf .deps + -rm -rf ${nodist_DEMOS} diff --git a/configure.ac b/configure.ac index a53996f..494ab93 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ(2.61) -m4_define([xball_version], [3.0.1]) +m4_define([xball_version], [3.1.0]) AC_INIT([xball],[xball_version],[packages@qa.debian.org], [xball],[https://packages.debian.org/sid/xball]) AM_INIT_AUTOMAKE([foreign -Wall]) diff --git a/demo1.xball b/demo1.xball.in similarity index 90% rename from demo1.xball rename to demo1.xball.in index 1466e74..f632093 100644 --- a/demo1.xball +++ b/demo1.xball.in @@ -3,7 +3,7 @@ collide off perpetual off -load_bitmap xball.xbm 10,10 +load_bitmap @xball@/xball.xbm 10,10 #load_bitmap /usr/include/X11/bitmaps/left_ptr 0,0 gravity 0 iterate 50 diff --git a/demo12.xball b/demo12.xball deleted file mode 100644 index 856b178..0000000 --- a/demo12.xball +++ /dev/null @@ -1,13 +0,0 @@ - -load_bitmap xball-x.xbm 10,10 -iterate 10 -load_bitmap xball-b.xbm 90,10 -iterate 10 -load_bitmap xball-a.xbm 170,10 -iterate 10 -load_bitmap xball-l.xbm 250,10 -iterate 10 -load_bitmap xball-l.xbm 310,10 -iterate 200 - -exit diff --git a/demo12.xball.in b/demo12.xball.in new file mode 100644 index 0000000..ae51d7e --- /dev/null +++ b/demo12.xball.in @@ -0,0 +1,13 @@ + +load_bitmap @xball@/xball-x.xbm 10,10 +iterate 10 +load_bitmap @xball@/xball-b.xbm 90,10 +iterate 10 +load_bitmap @xball@/xball-a.xbm 170,10 +iterate 10 +load_bitmap @xball@/xball-l.xbm 250,10 +iterate 10 +load_bitmap @xball@/xball-l.xbm 310,10 +iterate 200 + +exit diff --git a/demo13.xball b/demo13.xball deleted file mode 100644 index d425ad7..0000000 --- a/demo13.xball +++ /dev/null @@ -1,14 +0,0 @@ -elasticity 50 - -load_bitmap xball-x.xbm 10,10 -iterate 20 -load_bitmap xball-b.xbm 10,10 -iterate 20 -load_bitmap xball-a.xbm 10,10 -iterate 20 -load_bitmap xball-l.xbm 10,10 -iterate 20 -load_bitmap xball-l.xbm 10,10 -iterate 200 - -exit diff --git a/demo13.xball.in b/demo13.xball.in new file mode 100644 index 0000000..d1dbd4c --- /dev/null +++ b/demo13.xball.in @@ -0,0 +1,14 @@ +elasticity 50 + +load_bitmap @xball@/xball-x.xbm 10,10 +iterate 20 +load_bitmap @xball@/xball-b.xbm 10,10 +iterate 20 +load_bitmap @xball@/xball-a.xbm 10,10 +iterate 20 +load_bitmap @xball@/xball-l.xbm 10,10 +iterate 20 +load_bitmap @xball@/xball-l.xbm 10,10 +iterate 200 + +exit diff --git a/demo14.xball b/demo14.xball deleted file mode 100644 index c2aa383..0000000 --- a/demo14.xball +++ /dev/null @@ -1,9 +0,0 @@ -elasticity 90 -load_bitmap man.xbm 10,10 -iterate 60 -load_bitmap man.xbm 160,10 -iterate 60 -load_bitmap man.xbm 310,10 -iterate 400 - -exit diff --git a/demo14.xball.in b/demo14.xball.in new file mode 100644 index 0000000..c9fb3a9 --- /dev/null +++ b/demo14.xball.in @@ -0,0 +1,9 @@ +elasticity 90 +load_bitmap @xball@/man.xbm 10,10 +iterate 60 +load_bitmap @xball@/man.xbm 160,10 +iterate 60 +load_bitmap @xball@/man.xbm 310,10 +iterate 400 + +exit diff --git a/demo2.xball b/demo2.xball.in similarity index 90% rename from demo2.xball rename to demo2.xball.in index 9375dc2..7e76712 100644 --- a/demo2.xball +++ b/demo2.xball.in @@ -4,7 +4,7 @@ collide off elasticity 100 -load_bitmap xball.xbm 0,0 +load_bitmap @xball@/xball.xbm 0,0 gravity 0 create_random 30,15 iterate 160 diff --git a/demo3.xball b/demo3.xball.in similarity index 87% rename from demo3.xball rename to demo3.xball.in index 386055c..18859ba 100644 --- a/demo3.xball +++ b/demo3.xball.in @@ -3,7 +3,7 @@ # once collide off -load_bitmap xball.xbm 0,0 +load_bitmap @xball@/xball.xbm 0,0 set_velocity abs 3,-10 gravity 10 elasticity 85 diff --git a/demo4.xball b/demo4.xball.in similarity index 88% rename from demo4.xball rename to demo4.xball.in index 3fbcab2..7ee9850 100644 --- a/demo4.xball +++ b/demo4.xball.in @@ -5,7 +5,7 @@ visible off collide off elasticity 100 gravity 0 -load_bitmap xball.xbm 0,0 +load_bitmap @xball@/xball.xbm 0,0 randomize -10,10,-10,10 backwards 100 diff --git a/demo5.xball b/demo5.xball.in similarity index 88% rename from demo5.xball rename to demo5.xball.in index f791d7c..9c46c67 100644 --- a/demo5.xball +++ b/demo5.xball.in @@ -4,7 +4,7 @@ visible off collide off elasticity 100 -load_bitmap xball.xbm 0,-60 +load_bitmap @xball@/xball.xbm 0,-60 gravity 10 randomize -3,3,0,3 #set_velocity rel 0,1 diff --git a/demo6.xball b/demo6.xball.in similarity index 87% rename from demo6.xball rename to demo6.xball.in index 969c618..31ce90c 100644 --- a/demo6.xball +++ b/demo6.xball.in @@ -1,7 +1,7 @@ # Xball word collides with itself horizontally -load_bitmap xball.xbm 0,0 +load_bitmap @xball@/xball.xbm 0,0 #load_bitmap /usr/include/X11/bitmaps/left_ptr 0,0 collide off