debian/0000755000000000000000000000000012205127157007170 5ustar debian/spout.desktop0000644000000000000000000000023112204416346011731 0ustar [Desktop Entry] Type=Application Name=Spout Icon=spout.xpm Exec=/usr/games/spout Terminal=false Categories=Game;ArcadeGame Keywords=Cave;Fly;Game;Arcade debian/spout.xpm0000644000000000000000000000063712112647234011076 0ustar /* XPM */ static char * spout_xpm[] = { "15 16 4 1", " c None", ". c #FFFFFF", "+ c #000000", "@ c #555555", "...............", "........++++++.", "........++++++.", "........++..++.", "........++..++.", "........++++++.", "........++++++.", "..++...........", "..++...........", "........++.....", "........++.....", "....@@++.......", "....@@++.......", "@@.............", "@@.............", "@@............."}; debian/watch0000644000000000000000000000020312112275377010221 0ustar # Compulsory line, this is a version 3 file version=3 # http://njw.me.uk/spout/ spout-(.*)\.tar\.bz2 debian/changelog0000644000000000000000000000303412205127157011042 0ustar spout (1.4-2) unstable; urgency=low * Remove unnecessary explicit dpkg Pre-Depends. * Remove unnecessary explicit hardening flags and dependency. * Replaced hardening patch to take advantage of debhelper. * Add 'Keywords' field to .desktop file. * Upload to unstable. -- Scott Leggett Wed, 21 Aug 2013 22:11:01 +1000 spout (1.4-1) experimental; urgency=low * New Debian maintainer. (Closes: #691830) * Imported new upstream version 1.4. * New upstream maintainer and homepage. * Fix typo and other formatting issues in .desktop file. (Closes: #556938) * Apply 64-bit segfault patch to upstream. * Merge new upstream and old Debian man pages. * Build-depend on hardening-wrapper. * Patched hardening errors. * Updated packaging to use debhelper, quilt 3.0. * Bump standards version to 3.9.4. * Bump compat version to 9. * Add new packaging VCS information. -- Scott Leggett Mon, 25 Feb 2013 23:23:58 +1100 spout (1.3-2) unstable; urgency=low * Fix segfault on 64 bit builds. (Closes: #525722) Many thanks to Josh Tripplet and Steve Cotton. (sed -i "s,unsigned long,uint32_t,g" spout.c) * Bump standards version. * Update debian/copyright. * Document command line options in manpage. (Closes: #525723) * debian/rules: drop dh_desktop call. -- Gürkan Sengün Mon, 06 Jul 2009 09:36:48 +0200 spout (1.3-1) unstable; urgency=low * Initial release. (Closes: #356492) -- Gürkan Sengün Tue, 17 Mar 2009 09:43:03 +0200 debian/spout.manpages0000644000000000000000000000001012112370551012041 0ustar spout.6 debian/spout.install0000644000000000000000000000011712204407157011731 0ustar debian/spout.desktop usr/share/applications debian/spout.xpm usr/share/pixmaps debian/copyright0000644000000000000000000000461312204407157011127 0ustar Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: spout Source: http://njw.me.uk/spout/ Files: * Copyright: 2001-2006 Kuni 2010 Nick White License: MIT Copyright (c) 2002-2006 Kuni, 2010 Nick White . Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: . The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. . THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. Files: debian/* Copyright: 2008-2009 Gürkan Sengün 2012 Scott Leggett License: GPL-3+ 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; either version 3 of the License, or (at your option) any later version. . 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 program. If not, see . On Debian systems, the complete text of the GNU General Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". Comment: This package was originally debianized by: Javier Candeira on Mon, 6 Mar 2006 20:50:26 +0100. . It was downloaded from: http://www.din.or.jp/~ku_/junk/spout11.zip debian/spout.60000644000000000000000000000326412112275377010443 0ustar .\" with GNOME Manpages Editor Wizard .\" Rua .TH "spout" "6" "" "Javier Candeira " "" .SH "NAME" Spout \- abstract pixel shooter .SH "SYNOPSIS" .B spout .RI [ options ] .br .SH "DESCRIPTION" Spout is a small cave\-flying arcade game in black and white. The player has to navigate a spaceship upwards through a series of caves, avoiding the walls and the window borders, and getting through the checkpoints before the limited time runs out. The engine exhaust's plume can (and must) be used as a flamethrower for eroding the cave walls in order to make passages for the ship to go through. At the title screen, hit spacebar to begin playing. Your goal is to get as high as you possibly can, without crashing or your time running out. .SH "USAGE" Spout is played with the keyboard: \- left and right arrow keys: turn the ship around \- z, x, spacebar, or enter key: thrust/fire \- escape key: pause \- shift-escape: exit Instructions: \- Keep going up, up, up! \- Get through the next barrier before time runs out! \- Use the exhaust plume to make way! .SH OPTIONS A summary of options is included below. .TP .B f Fullscreen mode. .TP .B 1 Very small window mode. .TP .B 2 Default size window mode. .TP .B 7 Very big window mode. .SH "SEE ALSO" Spout Homepage (in Japanese): . Spout page at the Linux Game Tome: . .SH "AUTHOR" Spout was written for Windows by Kuni and ported to the Gnu/Debian system by Miriam Ruiz and Javier Candeira . This manual page was written for Debian by Javier Candeira . debian/menu0000644000000000000000000000013712112275377010065 0ustar ?package(spout):needs="X11" section="Games/Action"\ title="Spout" command="/usr/games/spout" debian/rules0000755000000000000000000000003612205114213010234 0ustar #!/usr/bin/make -f %: dh $@ debian/docs0000644000000000000000000000000712112275377010045 0ustar README debian/control0000644000000000000000000000135112205122636010570 0ustar Source: spout Section: games Priority: optional Maintainer: Scott Leggett Build-Depends: debhelper (>= 9.0.0), libsdl1.2-dev Standards-Version: 3.9.4 Homepage: http://njw.me.uk/spout/ Vcs-Git: git://github.com/smlx/package-spout.git Vcs-Browser: https://github.com/smlx/package-spout Package: spout Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends} Description: Tiny abstract black and white 2D cave-shooter This is a small, abstract shooting game from Japanese developer Kuni. It is a 'caveflier' in which the exhaust from the engine also serves as a tool to erode the cave walls. . Your goal is to fly upwards as long as you possibly can, without crashing against the cave walls and the window borders. debian/compat0000644000000000000000000000000212112643303010357 0ustar 9 debian/patches/0000755000000000000000000000000012205126475010621 5ustar debian/patches/0002-Fix-hardening-errors-from-unused-result.patch0000644000000000000000000000214612205126475021777 0ustar From: Scott Leggett Date: Mon, 5 Nov 2012 02:59:35 +1100 Subject: Fix hardening errors from unused result. --- spout.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/spout.c b/spout.c index a53e364..464e2ac 100644 --- a/spout.c +++ b/spout.c @@ -107,8 +107,12 @@ void pceAppInit(void) { int fa; if((fa = open(score_path, O_RDONLY)) != -1) { - read (fa, (void *) hiScore, 8); - close(fa); + if(read (fa, (void *) hiScore, 8) != -1) { + close(fa); + } else { + perror("read"); + exit(EXIT_FAILURE); + } } } @@ -145,8 +149,12 @@ void pceAppProc(int cnt) hiScore[0] = score; hiScore[1] = height; if((fa = open(score_path, O_CREAT | O_WRONLY | O_TRUNC)) != -1) { - write(fa, (void *) hiScore, 8); - close(fa); + if(write(fa, (void *) hiScore, 8) != -1) { + close(fa); + } else { + perror("write"); + exit(EXIT_FAILURE); + } } } } else { debian/patches/0003-Fix-call-to-open-with-missing-argument.patch0000644000000000000000000000123512205126475021501 0ustar From: Scott Leggett Date: Mon, 5 Nov 2012 03:11:01 +1100 Subject: Fix call to open with missing argument. --- spout.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spout.c b/spout.c index 464e2ac..953aceb 100644 --- a/spout.c +++ b/spout.c @@ -148,7 +148,7 @@ void pceAppProc(int cnt) int fa; hiScore[0] = score; hiScore[1] = height; - if((fa = open(score_path, O_CREAT | O_WRONLY | O_TRUNC)) != -1) { + if((fa = open(score_path, O_CREAT | O_WRONLY | O_TRUNC, S_IRUSR | S_IWUSR)) != -1) { if(write(fa, (void *) hiScore, 8) != -1) { close(fa); } else { debian/patches/0004-Fix-segfault-on-64-bit-platforms-due-to-incorrect-ty.patch0000644000000000000000000000473412205126475024026 0ustar From: Scott Leggett Date: Sun, 24 Feb 2013 13:31:54 +1100 Subject: Fix segfault on 64-bit platforms due to incorrect types. Thanks to previous packagers: sed -i "s,unsigned long,uint32_t,g" spout.c --- spout.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/spout.c b/spout.c index 953aceb..b0481b6 100644 --- a/spout.c +++ b/spout.c @@ -302,17 +302,17 @@ void pceAppProc(int cnt) } if(upperLine == 111 && height > 0) { - unsigned long *pL; - pL = (unsigned long *)(vbuff2 + 128 * 108 + 4); - while(pL < (unsigned long *)(vbuff2 + 128 * 109 - 4)) { + uint32_t *pL; + pL = (uint32_t *)(vbuff2 + 128 * 108 + 4); + while(pL < (uint32_t *)(vbuff2 + 128 * 109 - 4)) { *pL++ = 0; } pL += 2; - while(pL < (unsigned long *)(vbuff2 + 128 * 110 - 4)) { + while(pL < (uint32_t *)(vbuff2 + 128 * 110 - 4)) { *pL++ = 0xd3d3d3d3; } pL += 2; - while(pL < (unsigned long *)(vbuff2 + 128 * 111 - 4)) { + while(pL < (uint32_t *)(vbuff2 + 128 * 111 - 4)) { *pL++ = 0; } } @@ -361,13 +361,13 @@ void pceAppProc(int cnt) int i, j; if((upperLine & 31) == 0) { - unsigned long *pL; + uint32_t *pL; vBuffer = vbuff2 + ((upperLine - 24) & 127) * 128; pceFontSetBkColor(0); switch(upperLine / 32) { case 0: - pL = (unsigned long *)(vbuff2 + 12 + ((upperLine - 24) & 127) * 128); + pL = (uint32_t *)(vbuff2 + 12 + ((upperLine - 24) & 127) * 128); for(i = 0; i < 16; i ++) { for(j = 0; j < 26 / 2; j ++) { *pL = 0x91919191; @@ -620,13 +620,13 @@ void pceAppProc(int cnt) dispPos = upperLine; { - unsigned long *pL, *pL2, *pLe; - pL = (unsigned long *)(vbuff + 2 * 128); - pL2 = (unsigned long *)(vbuff2 + dispPos * 128); + uint32_t *pL, *pL2, *pLe; + pL = (uint32_t *)(vbuff + 2 * 128); + pL2 = (uint32_t *)(vbuff2 + dispPos * 128); pLe = pL2 + 128 * 78 / 4; - if(pLe > (unsigned long *)(vbuff2 + 128 * 128)) { - pLe = (unsigned long *)(vbuff2 + 128 * 128); + if(pLe > (uint32_t *)(vbuff2 + 128 * 128)) { + pLe = (uint32_t *)(vbuff2 + 128 * 128); } while(pL2 < pLe) { @@ -635,8 +635,8 @@ void pceAppProc(int cnt) pL2 ++; } - pL2 = (unsigned long *)(vbuff2); - while(pL < (unsigned long *)(vbuff + 128 * (78 + 2))) { + pL2 = (uint32_t *)(vbuff2); + while(pL < (uint32_t *)(vbuff + 128 * (78 + 2))) { *pL = *pL2 & 0x03030303; pL ++; pL2 ++; debian/patches/0001-Configure-correct-installation-paths.patch0000644000000000000000000000327612205126475021424 0ustar From: Scott Leggett Date: Mon, 5 Nov 2012 02:41:05 +1100 Subject: Configure correct installation paths. --- Makefile | 18 +++++++++--------- config.mk | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index ed43169..63270a3 100644 --- a/Makefile +++ b/Makefile @@ -54,16 +54,16 @@ dist: clean @echo $(NAME)-$(VERSION).tar.bz2 $(NAME)-$(VERSION).tar.bz2.sig install: all - @echo installing executables to $(DESTDIR)$(PREFIX)/bin - @mkdir -p $(DESTDIR)$(PREFIX)/bin + @echo installing executables to $(DESTDIR)$(PREFIX) + @mkdir -p $(DESTDIR)$(PREFIX) @for i in $(TARGETS); do \ - cp -f $$i $(DESTDIR)$(PREFIX)/bin/$$i; \ - chmod 755 $(DESTDIR)$(PREFIX)/bin/$$i; done - @echo installing manual pages to $(DESTDIR)$(MANPREFIX)/man1 - @mkdir -p $(DESTDIR)$(MANPREFIX)/man1 - @for i in $(MAN); do \ - sed "s/VERSION/$(VERSION)/g" < $$i > $(DESTDIR)$(MANPREFIX)/man1/$$i; \ - chmod 644 $(DESTDIR)$(MANPREFIX)/man1/$$i; done + cp -f $$i $(DESTDIR)$(PREFIX)/$$i; \ + chmod 755 $(DESTDIR)$(PREFIX)/$$i; done +# @echo installing manual pages to $(DESTDIR)$(MANPREFIX)/man1 +# @mkdir -p $(DESTDIR)$(MANPREFIX)/man1 +# @for i in $(MAN); do \ +# sed "s/VERSION/$(VERSION)/g" < $$i > $(DESTDIR)$(MANPREFIX)/man1/$$i; \ +# chmod 644 $(DESTDIR)$(MANPREFIX)/man1/$$i; done uninstall: @echo uninstalling executables from $(DESTDIR)$(PREFIX)/bin diff --git a/config.mk b/config.mk index 3cfc393..07f2a8f 100644 --- a/config.mk +++ b/config.mk @@ -3,8 +3,8 @@ VERSION = 1.4 # paths -PREFIX = /usr/local -MANPREFIX = ${PREFIX}/share/man +PREFIX = /usr/games +MANPREFIX = /usr/share/man # includes and libs SDLINC = $(shell pkg-config --cflags sdl) debian/patches/series0000644000000000000000000000046612205126475012044 0ustar 0001-Configure-correct-installation-paths.patch 0002-Fix-hardening-errors-from-unused-result.patch 0003-Fix-call-to-open-with-missing-argument.patch 0004-Fix-segfault-on-64-bit-platforms-due-to-incorrect-ty.patch 0005-Merge-old-and-new-man-pages.patch 0006-Use-debhelper-CPPFLAGS-CFLAGS-LDFLAGS-in-build.patch debian/patches/0005-Merge-old-and-new-man-pages.patch0000644000000000000000000000405612205126475017241 0ustar From: Scott Leggett Date: Sun, 24 Feb 2013 21:50:03 +1100 Subject: Merge old and new man pages. --- spout.1 | 34 ---------------------------------- spout.6 | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 34 deletions(-) delete mode 100644 spout.1 create mode 100644 spout.6 diff --git a/spout.1 b/spout.1 deleted file mode 100644 index 21cfc4f..0000000 --- a/spout.1 +++ /dev/null @@ -1,34 +0,0 @@ -.\" See COPYING file for copyright, license and warranty details. -.TH SPOUT 1 spout\-1.4 -.SH NAME -spout \- a simple caveflying game. -.SH SYNOPSIS -.B spout -.RB [-f] -.RB [-z\ zoom] -.SH DESCRIPTION -Spout is a simple caveflying game. The object is to get as high -as possible, avoiding or destroying obstacles. -.SH OPTIONS -.TP -.B \-f -Fullscreen -.TP -.B \-z zoom -Zooms the screen by zoom times (default: 4) -.SH USAGE -.TP -.B Left -Rotate left -.TP -.B Right -Rotate right -.TP -.B Space -Thrust -.TP -.B Escape -Pause -.TP -.B Shift\-Escape -Quit diff --git a/spout.6 b/spout.6 new file mode 100644 index 0000000..1916e4c --- /dev/null +++ b/spout.6 @@ -0,0 +1,42 @@ +.\" See COPYING file for copyright, license and warranty details. +.TH SPOUT 6 spout\-1.4 +.SH NAME +spout \- a simple cave-flying game. +.SH SYNOPSIS +.B spout +.RB [-f] +.RB [-z\ zoom] +.SH DESCRIPTION +Spout is a simple cave-flying game. The object is to get as high as possible, +avoiding or destroying obstacles using the ship's exhaust. Each checkpoint you +pass gives you a little more time! + +This is a new unix version of the game, based on the original Windows code. +.SH OPTIONS +.TP +.B \-f +Fullscreen +.TP +.B \-z zoom +Zooms the screen by zoom times (default: 4) +.SH USAGE +.TP +.B Left +Rotate left +.TP +.B Right +Rotate right +.TP +.B Space +Thrust +.TP +.B Escape +Pause +.TP +.B Shift\-Escape +Quit +.SH SEE ALSO +The homepage of the current maintainer . +.SH AUTHOR +This version of Spout was written for Windows by Kuni , and ported to unix by +Nick White . debian/patches/0006-Use-debhelper-CPPFLAGS-CFLAGS-LDFLAGS-in-build.patch0000644000000000000000000000160712205126475021622 0ustar From: Scott Leggett Date: Wed, 21 Aug 2013 22:05:42 +1000 Subject: Use debhelper CPPFLAGS, CFLAGS, LDFLAGS in build. --- Makefile | 2 +- config.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 63270a3..5a8463a 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ $(OBJ): config.mk config.h $(HEADERS) .c.o: @echo CC $< - @cc -c $(CFLAGS) $< + @cc -c $(CFLAGS) $(CPPFLAGS) $< $(TARGETS): $(OBJ) @echo LD $@ diff --git a/config.mk b/config.mk index 07f2a8f..f8d2f07 100644 --- a/config.mk +++ b/config.mk @@ -14,8 +14,8 @@ INCS = -I. -I/usr/include ${SDLINC} LIBS = -L/usr/lib -lc ${SDLLIB} # flags -CFLAGS = -std=gnu99 -Wall -Werror ${INCS} -DVERSION=\"${VERSION}\" -LDFLAGS = ${LIBS} +CFLAGS += -std=gnu99 -Wall -Werror ${INCS} -DVERSION=\"${VERSION}\" +LDFLAGS += ${LIBS} # compiler and linker CC = cc debian/source/0000755000000000000000000000000012112275377010475 5ustar debian/source/format0000644000000000000000000000001412112275377011703 0ustar 3.0 (quilt)