Your message dated Mon, 08 Feb 2010 17:02:55 +0000
with message-id <e1nex0h-0005hr...@ries.debian.org>
and subject line Bug#546399: fixed in searchandrescue 0.8.2-11
has caused the Debian Bug report #546399,
regarding searchandrescue: Blocked from testing due to libjsw depends and will
FTBFS with gcc 4.4.
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)
--
546399: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=546399
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: searchandrescue
Version: 0.8.2-10
Severity: serious
Tags: patch
Justification: no longer builds from source
Currently the package build-depends on libjsw-dev which has been removed from
Testing (and is unbuildable/installable in any case due to GTK 1.2 removal).
It still works with keyboard navigation when rebuilt without it.
Additionally, it FTBFS without libjsw-dev and with gcc 4.4.
The attached NMU diff resolves both issues.
-- System Information:
Debian Release: 5.0
APT prefers jaunty-updates
APT policy: (500, 'jaunty-updates'), (500, 'jaunty-security'), (500,
'jaunty-backports'), (500, 'jaunty')
Architecture: i386 (i686)
Kernel: Linux 2.6.28-15-generic (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Versions of packages searchandrescue depends on:
ii libc6 2.9-4ubuntu6 GNU C Library: Shared libraries
ii libgcc1 1:4.3.3-5ubuntu4 GCC support library
ii libgl1-mesa-glx [lib 7.4-0ubuntu3.2 A free implementation of the OpenG
ii libglu1-mesa [libglu 7.4-0ubuntu3.2 The OpenGL utility library (GLU)
ii libice6 2:1.0.4-1 X11 Inter-Client Exchange library
ii libsm6 2:1.1.0-1 X11 Session Management library
ii libstdc++6 4.3.3-5ubuntu4 The GNU Standard C++ Library v3
ii libx11-6 2:1.1.99.2-1ubuntu2 X11 client-side library
ii libxext6 2:1.0.99.1-0ubuntu3 X11 miscellaneous extension librar
ii libxmu6 2:1.0.4-1 X11 miscellaneous utility library
ii libxpm4 1:3.5.7-1 X11 pixmap library
ii libxxf86vm1 1:1.0.2-1 X11 XFree86 video mode extension l
ii liby2-14 2.14.5-5.1 Y Sound Server Library
pn searchandrescue-comm <none> (no description available)
ii searchandrescue-data 0.8.2-1 common data files for searchandres
Versions of packages searchandrescue recommends:
pn yiff-server <none> (no description available)
searchandrescue suggests no packages.
diff -u searchandrescue-0.8.2/sar/string.cpp searchandrescue-0.8.2/sar/string.cpp
--- searchandrescue-0.8.2/sar/string.cpp
+++ searchandrescue-0.8.2/sar/string.cpp
@@ -29,7 +29,9 @@
#ifdef __MSW__
int strcasecmp(const char *s1, const char *s2);
#endif
+#ifndef _GNU_SOURCE
char *strcasestr(const char *haystack, const char *needle) throw();
+#endif /* _GNU_SOURCE not defined */
int strpfx(const char *s, const char *pfx);
int strcasepfx(const char *s, const char *pfx);
@@ -214,6 +216,7 @@
}
#endif
+#ifndef _GNU_SOURCE
/*
* Case insensitive version of strstr(). Returns the pointer to
* needle in haystack if found or NULL on no match.
@@ -275,6 +278,7 @@
return(NULL);
}
+#endif /* _GNU_SOURCE not defined */
/*
* Checks if string pfx is a prefix of string s.
diff -u searchandrescue-0.8.2/debian/changelog searchandrescue-0.8.2/debian/changelog
--- searchandrescue-0.8.2/debian/changelog
+++ searchandrescue-0.8.2/debian/changelog
@@ -1,3 +1,22 @@
+searchandrescue (0.8.2-10.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+
+ [ Scott Kitterman ]
+ * Drop build-depend on libjsw-dev (being removed due to GTK 1.2 removal)
+ - Update package description and README.Debian to remove reference to
+ libjsw and joystick support
+ * Add missing #include <stdio.h> in sar/gctl.c for gcc 4.4 compatibility
+ * Remove deprecated dh_desktop calls from debian/rules
+ * Bump compat and debhelper version requirement to 5
+
+ [ Stefan Potyra ]
+ * sar/string.cpp, include/string.h: Disable strcasestr if _GNU_SOURCE
+ is defined (for gcc 4.4 compatibility), as this function is already part of
+ (e)glibc as a _GNU_SOURCE extension.
+
+ -- Scott Kitterman <sc...@kitterman.com> Sat, 12 Sep 2009 21:51:00 -0400
+
searchandrescue (0.8.2-10) unstable; urgency=low
* Add desktop file (closes: 476962).
diff -u searchandrescue-0.8.2/debian/rules searchandrescue-0.8.2/debian/rules
--- searchandrescue-0.8.2/debian/rules
+++ searchandrescue-0.8.2/debian/rules
@@ -73,7 +73,6 @@
dh_installdocs -i
dh_installmenu -i
# dh_installmanpages -i
- dh_desktop
dh_installchangelogs -i
dh_strip -i
dh_compress -i
@@ -91,7 +90,6 @@
dh_installdocs -a
dh_installmenu -a
# dh_installmanpages -a
- dh_desktop
dh_installchangelogs -a
dh_strip -a
dh_compress -a
diff -u searchandrescue-0.8.2/debian/control searchandrescue-0.8.2/debian/control
--- searchandrescue-0.8.2/debian/control
+++ searchandrescue-0.8.2/debian/control
@@ -2,7 +2,7 @@
Section: games
Priority: extra
Maintainer: Phil Brooke <p...@debian.org>
-Build-Depends: debhelper (>= 4), libjsw-dev (> 1.5.0-6), liby-dev (>= 2.14.2-2), libx11-dev, libxext-dev, libxpm-dev, libxxf86vm-dev, sharutils, bzip2, libsm-dev, libxmu-dev, libglu1-mesa-dev
+Build-Depends: debhelper (>= 5), liby-dev (>= 2.14.2-2), libx11-dev, libxext-dev, libxpm-dev, libxxf86vm-dev, sharutils, bzip2, libsm-dev, libxmu-dev, libglu1-mesa-dev
Standards-Version: 3.8.0
Homepage: http://wolfpack.twu.net/SearchAndRescue/
@@ -23,9 +23,9 @@
of mission type), and graphics minimized to suit slower computers
(minimum Pentium 166 with no graphics acceleration).
.
- This package has been configured to depend on libjsw for joystick support and
- libY2 for sound support. However, neither a joystick nor sound support is
- necessary to enjoy the game. (See README.Debian for more information.)
+ This package has been configured to depend on libY2 for sound support.
+ However, sound support is not necessary to enjoy the game. (See
+ README.Debian for more information.)
Package: searchandrescue-common
Architecture: all
diff -u searchandrescue-0.8.2/debian/README.Debian searchandrescue-0.8.2/debian/README.Debian
--- searchandrescue-0.8.2/debian/README.Debian
+++ searchandrescue-0.8.2/debian/README.Debian
@@ -1,14 +1,13 @@
-This package has been configured to depend on libjsw for joystick
-support and libY2 for sound support. You do not, however, need a
-joystick or a sound output device to play this game. This game will
-gracefully look towards the keyboard if no joystick is available.
+This package has been configured to depend on libY2 for sound
+support. You do not, however, need a sound output device to play
+this game. This game will gracefully look towards the keyboard if
+no joystick is available.
You will need the Y sound server running for sound: this is included
in the Debian package yiff-server.
You can safely install the libraries required even if you don't want
-sound or a joystick. However, if you don't want libjsw and/or libY2
-on your system, this game can be easily recompiled without joystick
-and/or sound support. (A recompilation will be necessary, since the
-binary is linked against both libjsw and liby2-12.)
+sound. However, if you don't want libY2 on your system, this game
+can be easily recompiled without sound support. (A recompilation
+will be necessary, since the binary is linked against liby2-12.)
diff -u searchandrescue-0.8.2/debian/compat searchandrescue-0.8.2/debian/compat
--- searchandrescue-0.8.2/debian/compat
+++ searchandrescue-0.8.2/debian/compat
@@ -1 +1 @@
-4
+5
only in patch2:
unchanged:
--- searchandrescue-0.8.2.orig/sar/gctl.c
+++ searchandrescue-0.8.2/sar/gctl.c
@@ -1,4 +1,5 @@
#include <stdlib.h>
+#include <stdio.h>
#include <sys/types.h>
#ifdef JS_SUPPORT
# include <jsw.h>
only in patch2:
unchanged:
--- searchandrescue-0.8.2.orig/include/string.h
+++ searchandrescue-0.8.2/include/string.h
@@ -43,7 +43,9 @@
#ifdef __MSW__
extern int strcasecmp(const char *s1, const char *s2);
#endif
+#ifndef _GNU_SOURCE
extern char *strcasestr(const char *haystack, const char *needle);
+#endif /* _GNU_SOURCE defined */
extern int strpfx(const char *s, const char *pfx);
extern int strcasepfx(const char *s, const char *pfx);
--- End Message ---
--- Begin Message ---
Source: searchandrescue
Source-Version: 0.8.2-11
We believe that the bug you reported is fixed in the latest version of
searchandrescue, which is due to be installed in the Debian FTP archive:
searchandrescue-common_0.8.2-11_all.deb
to main/s/searchandrescue/searchandrescue-common_0.8.2-11_all.deb
searchandrescue_0.8.2-11.diff.gz
to main/s/searchandrescue/searchandrescue_0.8.2-11.diff.gz
searchandrescue_0.8.2-11.dsc
to main/s/searchandrescue/searchandrescue_0.8.2-11.dsc
searchandrescue_0.8.2-11_i386.deb
to main/s/searchandrescue/searchandrescue_0.8.2-11_i386.deb
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to 546...@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Phil Brooke <p...@debian.org> (supplier of updated searchandrescue package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmas...@debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Format: 1.8
Date: Mon, 08 Feb 2010 16:28:45 +0000
Source: searchandrescue
Binary: searchandrescue searchandrescue-common
Architecture: source all i386
Version: 0.8.2-11
Distribution: unstable
Urgency: low
Maintainer: Phil Brooke <p...@debian.org>
Changed-By: Phil Brooke <p...@debian.org>
Description:
searchandrescue - fly aircraft to search (for) and rescue people in distress
searchandrescue-common - common files and documentation for searchandrescue
Closes: 546399
Changes:
searchandrescue (0.8.2-11) unstable; urgency=low
.
* Bump standards version to 3.8.4.
* Add ${misc:Depends} to Depends.
* Bump debian/compat to 6 (remove from rules) and build-depends on
debhelper.
* Homepage has gone away, remove from control file.
* Removed libjsw-dev dependency (removed due to GTK1.2 removal).
* Add comment to README.Debian about flight controls and update
control description.
* Add (parts of) patch from Scott Kitterman and Stefan Potyra --
thank you. (Closes: #546399.)
* Add missing #include <stdio.h> in sar/gctl.c for gcc 4.4
compatibility.
* Remove deprecated dh_desktop calls from debian/rules.
* sar/string.cpp, include/string.h: Disable strcasestr if
_GNU_SOURCE is defined (for gcc 4.4 compatibility), as this
function is already part of (e)glibc as a _GNU_SOURCE
extension.
Checksums-Sha1:
6d6818cdbed1abe1891097d9a87beaea1b648cf7 1188 searchandrescue_0.8.2-11.dsc
ee82d8bda017730c62e604cc680faae30e7cb426 17918 searchandrescue_0.8.2-11.diff.gz
8a7d766d658aaadbaba7bdeb732d86a48e91cb9a 63498
searchandrescue-common_0.8.2-11_all.deb
c948300c0d6d1b673768845514dbb93e222bd00c 360652
searchandrescue_0.8.2-11_i386.deb
Checksums-Sha256:
173f068ebdde9ebf418aeaa2f617e1c3a2c173824e5cb0480be78f35b19fe556 1188
searchandrescue_0.8.2-11.dsc
f1ce39ed6cedb37aab573afb57304a12095c622a2f828a64e56b672bd0a2ae0f 17918
searchandrescue_0.8.2-11.diff.gz
fe74130264771854cd9c853ec9c73c6ac0252fea61c231fa1e5b2a9530bef5db 63498
searchandrescue-common_0.8.2-11_all.deb
4507b4af83e5e899be296a9ed40ac1035bf3515a56e12f75442053ee87e88977 360652
searchandrescue_0.8.2-11_i386.deb
Files:
528127d8ae1354418e4705f3b2d7d6b1 1188 games extra searchandrescue_0.8.2-11.dsc
d93d042874e782d08c434abfcdbc9193 17918 games extra
searchandrescue_0.8.2-11.diff.gz
fb15924226f8c9ae38f9d4ff762f309a 63498 games extra
searchandrescue-common_0.8.2-11_all.deb
d4325f802a8fedddbb1176c2d1a34d07 360652 games extra
searchandrescue_0.8.2-11_i386.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: GnuPT 2.7.2
iEYEARECAAYFAktwQnsACgkQHb8HEVCXO5HP+wCfWFuQnbWNjf/4ngvAWi6DXtc8
y9sAniPlwtrfqRaBSOTN15QPaW8F37lc
=HMZd
-----END PGP SIGNATURE-----
--- End Message ---
