diff -u komi-1.04/komi.c komi-1.04/komi.c --- komi-1.04/komi.c +++ komi-1.04/komi.c @@ -2888,8 +2888,10 @@ if (strlen(directory) + strlen(filename) >= sizeof(fullpath)) // Check for buffer overflow on fullpath { fprintf(stderr, "Fatal error while loading %s:\n", filename); - fprintf(stderr, "Size of directory name (%d chars) plus size of file name (%d chars)\n", strlen(directory), strlen(filename)); - fprintf(stderr, "is too long (over %d chars), and would cause a buffer overflow...\n", sizeof(fullpath) - 1); + fprintf(stderr, "Size of directory name (%u chars) plus size of file name (%u chars)\n", + (unsigned int) strlen(directory), (unsigned int) strlen(filename)); + fprintf(stderr, "is too long (over %u chars), and would cause a buffer overflow...\n", + (unsigned int) (sizeof(fullpath) - 1)); cleanexit(1); } strcpy(fullpath, directory); @@ -3289,8 +3291,10 @@ if (strlen(directory) + strlen(filename) >= sizeof(fullpath)) // Check for buffer overflow on fullpath { fprintf(stderr, "Error while saving %s:\n", filename); - fprintf(stderr, "Size of directory name (%d chars) plus size of file name (%d chars)\n", strlen(directory), strlen(filename)); - fprintf(stderr, "is too long (over %d chars), and would cause a buffer overflow...\n", sizeof(fullpath) - 1); + fprintf(stderr, "Size of directory name (%u chars) plus size of file name (%u chars)\n", + (unsigned int) strlen(directory), (unsigned int) strlen(filename)); + fprintf(stderr, "is too long (over %u chars), and would cause a buffer overflow...\n", + (unsigned int) (sizeof(fullpath) - 1)); return; } strcpy(fullpath, directory); @@ -3638,8 +3642,10 @@ if (strlen(directory) + strlen(filename) >= sizeof(fullpath)) // Check for buffer overflow on fullpath { fprintf(stderr, "Error while saving %s:\n", filename); - fprintf(stderr, "Size of directory name (%d chars) plus size of file name (%d chars)\n", strlen(directory), strlen(filename)); - fprintf(stderr, "is too long (over %d chars), and would cause a buffer overflow...\n", sizeof(fullpath) - 1); + fprintf(stderr, "Size of directory name (%u chars) plus size of file name (%u chars)\n", + (unsigned int) strlen(directory), (unsigned int) strlen(filename)); + fprintf(stderr, "is too long (over %u chars), and would cause a buffer overflow...\n", + (unsigned int) (sizeof(fullpath) - 1)); return; } strcpy(fullpath, directory); @@ -3675,8 +3681,10 @@ if (strlen(directory) + strlen(filename) >= sizeof(fullpath)) // Check for buffer overflow on fullpath { fprintf(stderr, "Error while loading %s:\n", filename); - fprintf(stderr, "Size of directory name (%d chars) plus size of file name (%d chars)\n", strlen(directory), strlen(filename)); - fprintf(stderr, "is too long (over %d chars), and would cause a buffer overflow...\n", sizeof(fullpath) - 1); + fprintf(stderr, "Size of directory name (%u chars) plus size of file name (%u chars)\n", + (unsigned int) strlen(directory), (unsigned int) strlen(filename)); + fprintf(stderr, "is too long (over %u chars), and would cause a buffer overflow...\n", + (unsigned int) (sizeof(fullpath) - 1)); return; } strcpy(fullpath, directory); @@ -3753,8 +3761,10 @@ if (strlen(directory) + strlen(filename) >= sizeof(fullpath)) // Check for buffer overflow on fullpath { fprintf(stderr, "Error while loading %s:\n", filename); - fprintf(stderr, "Size of directory name (%d chars) plus size of file name (%d chars)\n", strlen(directory), strlen(filename)); - fprintf(stderr, "is too long (over %d chars), and would cause a buffer overflow...\n", sizeof(fullpath) - 1); + fprintf(stderr, "Size of directory name (%u chars) plus size of file name (%u chars)\n", + (unsigned int) strlen(directory), (unsigned int) strlen(filename)); + fprintf(stderr, "is too long (over %u chars), and would cause a buffer overflow...\n", + (unsigned int) (sizeof(fullpath) - 1)); return 1; } strcpy(fullpath, directory); diff -u komi-1.04/debian/compat komi-1.04/debian/compat --- komi-1.04/debian/compat +++ komi-1.04/debian/compat @@ -1 +1 @@ -5 +8 reverted: --- komi-1.04/debian/komi.6 +++ komi-1.04.orig/debian/komi.6 @@ -1,83 +0,0 @@ -.\" Hey, EMACS: -*- nroff -*- -.\" First parameter, NAME, should be all caps -.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection -.\" other parameters are allowed: see man(7), man(1) -.TH KOMI 6 "June 11, 2004" -.\" Please adjust this date whenever revising the manpage. -.\" -.\" Some roff macros, for reference: -.\" .nh disable hyphenation -.\" .hy enable hyphenation -.\" .ad l left justify -.\" .ad b justify to both left and right margins -.\" .nf disable filling -.\" .fi enable filling -.\" .br insert line break -.\" .sp insert n+1 empty lines -.\" for manpage-specific macros, see man(7) -.SH NAME -komi \- A simple game for one player. -.SH SYNOPSIS -.B komi -.RI [ options ] -.br -.SH DESCRIPTION -This manual page documents briefly the -.B komi -game. - -.SH "Playing" -Using the left and right arrow keys you may guide Komi the space from from left to right across the bottom of the screen. -Use the space bar to extend his longue tongue and capture the floating orange prizes, whilst avoiding the predators. - -.SH "OPTIONS" -The following command line options are supported: - -.TP -\fB\-\-delay \fR -Wait for x milliseconds between frames, so lower is faster. - -.TP -\fB\-\-fullscreen\fR -Run the game in fullscreen mode, rather than in a window of its own - -.TP -\fB\-\-hog\fR -Allow -.B komi -to hog CPU which may reduce jerkiness. - -.TP -\fB\-\-nosound\fR -.Sp -Disable all sound effects - -.TP -\fB\-\-nostars\fR -Disable the starfield simulation in the background of the game. - -.TP -\fB\-\-copying\fR -Show the terms under which -.B komi -may be copied. - -.TP -\fB\-\-help\fR -Display the command line options. - -.TP -\fB\-\-version\fR -Show the version number of -.B komi - - -.SH WEBSITE -.BR -The game has a website where you can find updates and source code. See the following URL for details: -.TP - http://komi.sourceforge.net/ - -.SH AUTHOR -This manual page was written by Steve Kemp , -for the Debian project (but may be used by others). diff -u komi-1.04/debian/rules komi-1.04/debian/rules --- komi-1.04/debian/rules +++ komi-1.04/debian/rules @@ -7,59 +7,53 @@ DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -CFLAGS = -Wall -g - ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 + OPT = -O0 else - CFLAGS += -O2 -endif -ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) - INSTALL_PROGRAM += -s + OPT = -O2 endif build: build-stamp +build-arch: build-stamp + +# Compile package build-stamp: dh_testdir - - # Add here commands to compile the package. - $(MAKE) DATAPATH=/usr/share/games/komi/ - + $(MAKE) DATAPATH=/usr/share/games/komi/ OPT="$(OPT)" touch build-stamp +build-indep: + # No architechture independant packages. Nothing to do. + +# Clean up clean: dh_testdir dh_testroot rm -f build-stamp - # Add here commands to clean up after the build process. - -$(MAKE) clean + $(MAKE) clean dh_clean +# Install binary files into debian/komi install: build dh_testdir dh_testroot - dh_clean -k + dh_prep dh_installdirs mkdir -p debian/komi dh_install debian/komi.xpm usr/share/pixmaps $(MAKE) install BINPATH=$(CURDIR)/debian/komi/usr/games/ DATAPATH=$(CURDIR)/debian/komi/usr/share/games/komi/ MANPATH=$(CURDIR)/debian/komi/usr/share/man/man6/ -# Build architecture-independent files here. -binary-indep: build install -# We have nothing to do by default. - -# Build architecture-dependent files here. +# Build package binary-arch: build install dh_testdir dh_testroot dh_installchangelogs CHANGELOG.txt dh_installdocs dh_installmenu - dh_installman debian/komi.6 dh_link dh_strip dh_compress @@ -73,2 +67,5 @@ -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install +binary-indep: build-indep + +binary: binary-arch + +.PHONY: build build-arch build-indep clean binary-indep binary-arch binary install diff -u komi-1.04/debian/changelog komi-1.04/debian/changelog --- komi-1.04/debian/changelog +++ komi-1.04/debian/changelog @@ -1,3 +1,29 @@ +komi (1.04-5) unstable; urgency=low + + * Fixed problem in Makefile that caused komi to link against many libraries + unnecessarily, and in some cases causes komi to fail to build. Fixes + shlibdeps warnings. (Closes: #655803) + * Debian rules no longer ignores make clean error. Fixes lintian warning. + * Copyright file now refers to GPL-2, rather than symlink GPL. Fixes lintian + pedantic warning. + * Removed unused and outdated debian/komi.6. Continue to use upstream man + page. + * Fixed man page warnings. Fixes lintian warning. + * Fixed several printf format warnings on amd64 and other architectures. + * Description no longer starts with the article, "a". + * Removed unnecessary code from rules, and other misc cosmetic fixes + * Added build-arch and build-indep targets to rules. + * Rules file now respects DEB_BUILD_OPTIONS noopt and includes debugging + symbols for nostrip. + * Rules file now calls dh_prep instead of deprecated dh_clean -k. Fixes + lintian warning. + * Upgrade debhelper requirements and version compatibility to 8 + * Set debian/source/format to 1.0. Fixes lintian info warning. + * Set Standards-Version to 3.9.2 (no changes needed) + * Removed duplicate entries from changelog + + -- Brandon Barnes Wed, 18 Jan 2012 13:54:00 -0800 + komi (1.04-4) unstable; urgency=low * Fixed watch file (Closes: #453575) @@ -108,61 +133,0 @@ - - -komi (1.03-4) unstable; urgency=low - - * Moved the project to the Alioth 'pkg-games' SVN repository. - http://wiki.debian.org/Games/SVN - * Updated the maintainer to the games-devel mailing list. - http://lists.alioth.debian.org/mailman/listinfo/pkg-games-devel - - -- Steve Kemp Sunday, 22 January 2006 10:48:06 +0000 - -komi (1.03-3) unstable; urgency=low - - * Build against libaa1-dev/libaa1 instead of aalib1. - (Closes: #320884) - - -- Steve Kemp Thu, 04 Aug 2005 15:48:55 +0000 - -komi (1.03-2) unstable; urgency=low - - * Updated standards version to 3.6.2 (no changes). - * Removed commented out debhelper lines from debian/rules - * Changed menu entry: - * Install to /usr/share/menu - * Moved to section 'Games/Arcade' - * Capitalise 'komi' - (Closes: #316280) - - -- Steve Kemp Fri, 01 Jul 2005 02:04:57 +0000 - -komi (1.03-1) unstable; urgency=low - - * New upstream release. - - -- Steve Kemp Mon, 12 Jul 2004 15:37:21 +0000 - -komi (1.01-1) unstable; urgency=low - - * Uploaded to the Debian archives. - (Closes: #257166) - * Changed maintainer address to my @debian.org email. - * Changed the saving of the preferences to the users home directory, - this will be folded in upstream for the next release :) - - -- Steve Kemp Fri, 2 Jul 2004 18:47:15 +0000 - -komi (0.8b-2) unstable; urgency=low - - * Move manpage into section 6. - * Updated manpage. - - -- Steve Kemp Fri, 11 Jun 2004 15:23:02 +0000 - -komi (0.8b-1) unstable; urgency=low - - * Initial package. - * Moved binary to /usr/games/komi - * Moved data to /usr/share/games/komi - * Added manpage. - - -- Steve Kemp Thurs, 10 Jun 2004 21:40:11 +0000 diff -u komi-1.04/debian/control komi-1.04/debian/control --- komi-1.04/debian/control +++ komi-1.04/debian/control @@ -2,14 +2,14 @@ Section: games Maintainer: Brandon Barnes Priority: optional -Build-Depends: debhelper (>= 5), libsdl-mixer1.2-dev, libsdl1.2-dev -Standards-Version: 3.8.0 +Build-Depends: debhelper (>= 8), libsdl-mixer1.2-dev, libsdl1.2-dev +Standards-Version: 3.9.2 Homepage: http://komi.sf.net Package: komi Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Description: A single player arcade game with Komi the Space Frog! +Description: Single player arcade game with Komi the Space Frog! Komi is a space frog, and your aim in this single player arcade game is to feed him by capturing food with your giant tongue. . diff -u komi-1.04/debian/copyright komi-1.04/debian/copyright --- komi-1.04/debian/copyright +++ komi-1.04/debian/copyright @@ -25 +25 @@ -in /usr/share/common-licenses/GPL file. +in /usr/share/common-licenses/GPL-2 file. only in patch2: unchanged: --- komi-1.04.orig/Makefile +++ komi-1.04/Makefile @@ -11,9 +11,9 @@ MANPATH=/usr/local/man/man6/ MIXER=-lSDL_mixer -SDL_LIB=$(shell sdl-config --static-libs) $(MIXER) +SDL_LIB=$(shell sdl-config --libs) $(MIXER) -CFLAGS=-Wall -pedantic -std=c99 -O2 \ +CFLAGS=-Wall -pedantic -std=c99 -g $(OPT) \ $(shell sdl-config --cflags) \ -DDATAPATH=\"$(DATAPATH)\" only in patch2: unchanged: --- komi-1.04.orig/komi.6 +++ komi-1.04/komi.6 @@ -48,7 +48,6 @@ .TP \fB\-\-nosound\fR -.Sp Disable all sound effects. .TP only in patch2: unchanged: --- komi-1.04.orig/sprites.h +++ komi-1.04/sprites.h @@ -146,8 +146,10 @@ if (strlen(directory) + strlen(filename) >= sizeof(fullpath)) // Check for buffer overflow on fullpath { fprintf(stderr, "Fatal error while loading %s:\n", filename); - fprintf(stderr, "Size of directory name (%d chars) plus size of file name (%d chars)\n", strlen(directory), strlen(filename)); - fprintf(stderr, "is too long (over %d chars), and would cause a buffer overflow...\n", sizeof(fullpath) - 1); + fprintf(stderr, "Size of directory name (%u chars) plus size of file name (%u chars)\n", + (unsigned int) strlen(directory), (unsigned int) strlen(filename)); + fprintf(stderr, "is too long (over %u chars), and would cause a buffer overflow...\n", + (unsigned int) (sizeof(fullpath) - 1)); cleanexit(1); } strcpy(fullpath, directory); only in patch2: unchanged: --- komi-1.04.orig/debian/source/format +++ komi-1.04/debian/source/format @@ -0,0 +1 @@ +1.0