I am uploading a NMU to DELAYED/10 in order to fix this.
Please find the debdiff attached.
diff -Nru komi-1.04/Makefile komi-1.04/Makefile
--- komi-1.04/Makefile 2024-02-21 12:50:34.000000000 +0000
+++ komi-1.04/Makefile 2004-07-14 21:48:52.000000000 +0000
@@ -11,9 +11,9 @@
MANPATH=/usr/local/man/man6/
MIXER=-lSDL_mixer
-SDL_LIB=$(shell sdl-config --libs) $(MIXER)
+SDL_LIB=$(shell sdl-config --static-libs) $(MIXER)
-CFLAGS=-Wall -pedantic -std=c99 -g $(OPT) \
+CFLAGS=-Wall -pedantic -std=c99 -O2 \
$(shell sdl-config --cflags) \
-DDATAPATH=\"$(DATAPATH)\"
diff -Nru komi-1.04/debian/changelog komi-1.04/debian/changelog
--- komi-1.04/debian/changelog 2024-02-21 12:50:34.000000000 +0000
+++ komi-1.04/debian/changelog 2024-02-21 12:38:22.000000000 +0000
@@ -1,3 +1,14 @@
+komi (1.04-5.1) unstable; urgency=medium
+
+ * Non-maintainer upload
+ * Convert to source format 3.0 (Closes: #1007427)
+ * d/copyright: Convert to machine-readable format.
+
+ [ Helmut Grohne ]
+ * Fix FTCBFS: Let dh_auto_build pass cross tools to make. (Closes: #956023)
+
+ -- Bastian Germann <[email protected]> Wed, 21 Feb 2024 12:38:22 +0000
+
komi (1.04-5) unstable; urgency=low
* Fixed problem in Makefile that caused komi to link against many libraries
diff -Nru komi-1.04/debian/copyright komi-1.04/debian/copyright
--- komi-1.04/debian/copyright 2024-02-21 12:50:34.000000000 +0000
+++ komi-1.04/debian/copyright 2024-02-21 12:38:22.000000000 +0000
@@ -1,25 +1,29 @@
-This package was debianized by Steve Kemp <[email protected]> on
-Sat, 9 Aug 2003 19:35:43 +0100.
-
-It was downloaded from http://komi.sourceforge.net/
-
-Upstream Author: The upstream author for Komi is Allan Crossman
-
-Copyright (C) 2004 Allan Crossman
-
-This program 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 2
-of the License, or (at your option) any later version.
-
-This program 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, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-The complete text of the GNU General Public License can be found
-in /usr/share/common-licenses/GPL-2 file.
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Komi
+Comment:
+ This package was debianized by Steve Kemp <[email protected]> on
+ Sat, 9 Aug 2003 19:35:43 +0100.
+Source:
+ http://komi.sourceforge.net/
+Upstream-Contact:
+ Allan Crossman <[email protected]>
+
+Files: *
+Copyright: (C) 2004 Allan Crossman
+License: GPL-2+
+ This program 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 2
+ of the License, or (at your option) any later version.
+ .
+ This program 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, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
USA.
+Comment:
+ The complete text of the GNU General Public License can be found
+ in /usr/share/common-licenses/GPL-2 file.
diff -Nru komi-1.04/debian/patches/debian.patch
komi-1.04/debian/patches/debian.patch
--- komi-1.04/debian/patches/debian.patch 1970-01-01 00:00:00.000000000
+0000
+++ komi-1.04/debian/patches/debian.patch 2024-02-21 12:38:22.000000000
+0000
@@ -0,0 +1,142 @@
+--- komi-1.04.orig/Makefile
++++ komi-1.04/Makefile
+@@ -11,9 +11,9 @@ BINPATH=/usr/local/bin/
+ 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)\"
+
+--- komi-1.04.orig/komi.6
++++ komi-1.04/komi.6
+@@ -48,7 +48,6 @@ Run the game in fullscreen mode, rather
+
+ .TP
+ \fB\-\-nosound\fR
+-.Sp
+ Disable all sound effects.
+
+ .TP
+--- komi-1.04.orig/komi.c
++++ komi-1.04/komi.c
+@@ -242,6 +242,8 @@ void menu (void)
+ {
+ keymap.escape = 0; // So we don't respond to escape pressed in
game.
+ mousemap.button = 0; // Likewise for the mouse.
++ keymap.fire1 = 0; // Neither fire keys are likely to be down from
game,
++ keymap.fire2 = 0; // but could be.
+
+ manageevents();
+
+@@ -297,6 +299,17 @@ void menu (void)
+ {
+ cleanexit(0);
+ }
++
++ if (keymap.fire1 || keymap.fire2)
++ {
++ keymap.fire1 = keymap.fire2 = 0;
++ SDL_ShowCursor(SDL_DISABLE);
++ game();
++ SDL_ShowCursor(SDL_ENABLE);
++ setmaintitlebar();
++ drawmenu(highlight_start, highlight_quit, highlight_shuffle);
++ }
++
+ if (mousemap.button)
+ {
+ if (abs(mousemap.clickx - STARTBUTTON_X) < start_title.pixelmap->w /
2 && abs(mousemap.clicky - STARTBUTTON_Y) < start_title.pixelmap->h / 2)
+@@ -420,7 +433,7 @@ int playlevel (void)
+ SDL_UpdateRect(virtue, 0, 0, 0, 0);
+ updatetitlebar();
+
+- if (lives == 1 && givelastlifewarning && fullscreen)
++ if (lives == 1 && givelastlifewarning)
+ {
+ playsound(lastlife_sound);
+ givelastlifewarning = 0;
+@@ -2875,8 +2888,10 @@ void loadsound(Mix_Chunk ** thesound, ch
+ 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);
+@@ -3276,8 +3291,10 @@ void screenshot (SDL_Surface * surface,
+ 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);
+@@ -3625,8 +3642,10 @@ void saveprefs (char * directory, char *
+ 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);
+@@ -3662,8 +3681,10 @@ void loadprefs (char * directory, char *
+ 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);
+@@ -3740,8 +3761,10 @@ int playmusic (char * directory, char *
+ 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);
+--- komi-1.04.orig/sprites.h
++++ komi-1.04/sprites.h
+@@ -146,8 +146,10 @@ void loadsprite (struct sprite_struct *
+ 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);
diff -Nru komi-1.04/debian/patches/series komi-1.04/debian/patches/series
--- komi-1.04/debian/patches/series 1970-01-01 00:00:00.000000000 +0000
+++ komi-1.04/debian/patches/series 2024-02-21 12:38:22.000000000 +0000
@@ -0,0 +1 @@
+debian.patch
diff -Nru komi-1.04/debian/rules komi-1.04/debian/rules
--- komi-1.04/debian/rules 2024-02-21 12:50:34.000000000 +0000
+++ komi-1.04/debian/rules 2024-02-21 12:38:22.000000000 +0000
@@ -21,7 +21,7 @@
# Compile package
build-stamp:
dh_testdir
- $(MAKE) DATAPATH=/usr/share/games/komi/ OPT="$(OPT)"
+ dh_auto_build -- DATAPATH=/usr/share/games/komi/ OPT="$(OPT)"
touch build-stamp
build-indep:
diff -Nru komi-1.04/debian/source/format komi-1.04/debian/source/format
--- komi-1.04/debian/source/format 2024-02-21 12:50:34.000000000 +0000
+++ komi-1.04/debian/source/format 2024-02-21 12:37:52.000000000 +0000
@@ -1 +1 @@
-1.0
+3.0 (quilt)
diff -Nru komi-1.04/komi.6 komi-1.04/komi.6
--- komi-1.04/komi.6 2024-02-21 12:50:34.000000000 +0000
+++ komi-1.04/komi.6 2004-07-14 21:48:52.000000000 +0000
@@ -48,6 +48,7 @@
.TP
\fB\-\-nosound\fR
+.Sp
Disable all sound effects.
.TP
diff -Nru komi-1.04/komi.c komi-1.04/komi.c
--- komi-1.04/komi.c 2024-02-21 12:50:34.000000000 +0000
+++ komi-1.04/komi.c 2004-08-09 20:07:21.000000000 +0000
@@ -242,8 +242,6 @@
{
keymap.escape = 0; // So we don't respond to escape pressed in game.
mousemap.button = 0; // Likewise for the mouse.
- keymap.fire1 = 0; // Neither fire keys are likely to be down from
game,
- keymap.fire2 = 0; // but could be.
manageevents();
@@ -299,17 +297,6 @@
{
cleanexit(0);
}
-
- if (keymap.fire1 || keymap.fire2)
- {
- keymap.fire1 = keymap.fire2 = 0;
- SDL_ShowCursor(SDL_DISABLE);
- game();
- SDL_ShowCursor(SDL_ENABLE);
- setmaintitlebar();
- drawmenu(highlight_start, highlight_quit, highlight_shuffle);
- }
-
if (mousemap.button)
{
if (abs(mousemap.clickx - STARTBUTTON_X) < start_title.pixelmap->w /
2 && abs(mousemap.clicky - STARTBUTTON_Y) < start_title.pixelmap->h / 2)
@@ -433,7 +420,7 @@
SDL_UpdateRect(virtue, 0, 0, 0, 0);
updatetitlebar();
- if (lives == 1 && givelastlifewarning)
+ if (lives == 1 && givelastlifewarning && fullscreen)
{
playsound(lastlife_sound);
givelastlifewarning = 0;
@@ -2888,10 +2875,8 @@
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 (%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));
+ 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);
cleanexit(1);
}
strcpy(fullpath, directory);
@@ -3291,10 +3276,8 @@
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 (%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));
+ 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);
return;
}
strcpy(fullpath, directory);
@@ -3642,10 +3625,8 @@
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 (%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));
+ 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);
return;
}
strcpy(fullpath, directory);
@@ -3681,10 +3662,8 @@
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 (%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));
+ 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);
return;
}
strcpy(fullpath, directory);
@@ -3761,10 +3740,8 @@
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 (%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));
+ 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);
return 1;
}
strcpy(fullpath, directory);
diff -Nru komi-1.04/sprites.h komi-1.04/sprites.h
--- komi-1.04/sprites.h 2024-02-21 12:50:34.000000000 +0000
+++ komi-1.04/sprites.h 2004-07-14 21:48:52.000000000 +0000
@@ -146,10 +146,8 @@
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 (%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));
+ 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);
cleanexit(1);
}
strcpy(fullpath, directory);
