r5907 - in packages/trunk/freesweep: . debian
Ansgar Burchardt
ansgar-guest at alioth.debian.org
Sat Feb 23 10:29:28 UTC 2008
Author: ansgar-guest
Date: 2008-02-23 10:29:28 +0000 (Sat, 23 Feb 2008)
New Revision: 5907
Added:
packages/trunk/freesweep/debian/
packages/trunk/freesweep/debian/changelog
packages/trunk/freesweep/debian/compat
packages/trunk/freesweep/debian/control
packages/trunk/freesweep/debian/copyright
packages/trunk/freesweep/debian/freesweep.dirs
packages/trunk/freesweep/debian/freesweep.docs
packages/trunk/freesweep/debian/freesweep.menu
packages/trunk/freesweep/debian/rules
Modified:
packages/trunk/freesweep/Makefile
packages/trunk/freesweep/configure
packages/trunk/freesweep/configure.in
packages/trunk/freesweep/files.c
packages/trunk/freesweep/pbests.c
packages/trunk/freesweep/sweep.h
packages/trunk/freesweep/sweep.h.in
Log:
[svn-inject] Applying Debian modifications to trunk
Modified: packages/trunk/freesweep/Makefile
===================================================================
--- packages/trunk/freesweep/Makefile 2008-02-23 10:29:21 UTC (rev 5906)
+++ packages/trunk/freesweep/Makefile 2008-02-23 10:29:28 UTC (rev 5907)
@@ -15,13 +15,13 @@
srcdir = .
-prefix = /usr/local
+prefix = /usr
exec_prefix = ${prefix}
#bindir = $(exec_prefix)/bin
bindir = ${exec_prefix}/bin
CC = gcc
-CFLAGS = -Wall -DVERSION=\"$(VERSION)\" -I/usr/include -g -O2
+CFLAGS = -Wall -DVERSION=\"$(VERSION)\" -I/usr/include -O2
LIBS = -lm -lncurses -L/usr/lib
LDFLAGS =
OBJS = $(SRCS:.c=.o)
@@ -59,8 +59,8 @@
install: $(TARGET) $(TARGET).6
touch sweeptimes
./install-sh -c -m 2555 -o root -g games -s $(TARGET) $(bindir)/$(TARGET)
- ./install-sh -c -m 0664 -o root -g games sweeptimes no/sweeptimes
- ./install-sh -c -m 0644 -o root -g games sweeprc /usr/local/share/sweeprc
+ ./install-sh -c -m 0664 -o root -g games sweeptimes /var/games/sweeptimes
+ ./install-sh -c -m 0644 -o root -g games sweeprc /etc/sweeprc
./install-sh -c -m 0444 -o root -g games $(TARGET).6 ${prefix}/man/man6/$(TARGET).6
distclean:
Modified: packages/trunk/freesweep/configure
===================================================================
--- packages/trunk/freesweep/configure 2008-02-23 10:29:21 UTC (rev 5906)
+++ packages/trunk/freesweep/configure 2008-02-23 10:29:28 UTC (rev 5907)
@@ -9,7 +9,6 @@
# Defaults:
ac_help=
-subdirs=
ac_default_prefix=/usr/local
# Any additions from configure.in:
ac_help="$ac_help
@@ -56,6 +55,7 @@
mandir='${prefix}/man'
# Initialize some other variables.
+subdirs=
MFLAGS= MAKEFLAGS=
SHELL=${CONFIG_SHELL-/bin/sh}
# Maximum number of lines to put in a shell here document.
@@ -139,27 +139,6 @@
# Obsolete; use --with-gas.
with_gas=yes ;;
- --help-noheader | --help-noheade | --help-nohead | --help-nohea \
- | --help-nohe | --help-noh )
- if test -n "$ac_help"; then
- echo "--enable and --with options recognized:$ac_help"
- fi
-
- # Not as good as srcdir, but we don't have that yet
- ac_prog=$0
- ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
- test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
-
- for subdir in dummy_for_shell_syntax $subdirs; do
- if test "x$ac_confdir" != "xdummy_for_shell_syntax"; then
- if test -x $ac_confdir/$subdir/configure; then
- $ac_confdir/$subdir/configure --help-noheader
- fi
- fi
- done
-
- exit 0 ;;
-
-help | --help | --hel | --he)
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
@@ -169,7 +148,6 @@
Configuration:
--cache-file=FILE cache test results in FILE
--help print this message
- --help-noheader print only the non-default options
--no-create do not create output files
--quiet, --silent do not print \`checking...' messages
--version print the version of autoconf that created configure
@@ -214,21 +192,6 @@
if test -n "$ac_help"; then
echo "--enable and --with options recognized:$ac_help"
fi
-
-
- # Not as good as srcdir, but we don't have that yet
- ac_prog=$0
- ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
- test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
-
- for subdir in dummy_for_shell_syntax $subdirs; do
- if test "x$ac_confdir" != "xdummy_for_shell_syntax"; then
- if test -x $ac_confdir/$subdir/configure; then
- $ac_confdir/$subdir/configure --help-noheader
- fi
- fi
- done
-
exit 0 ;;
-host | --host | --hos | --ho)
@@ -592,7 +555,7 @@
fi
echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:596: checking host system type" >&5
+echo "configure:559: checking host system type" >&5
host_alias=$host
case "$host_alias" in
@@ -616,7 +579,7 @@
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:620: checking for $ac_word" >&5
+echo "configure:583: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -646,7 +609,7 @@
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:650: checking for $ac_word" >&5
+echo "configure:613: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -697,7 +660,7 @@
# Extract the first word of "cl", so it can be a program name with args.
set dummy cl; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:701: checking for $ac_word" >&5
+echo "configure:664: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -729,7 +692,7 @@
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:733: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:696: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
ac_ext=c
# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -740,12 +703,12 @@
cat > conftest.$ac_ext << EOF
-#line 744 "configure"
+#line 707 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
-if { (eval echo configure:749: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:712: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
ac_cv_prog_cc_works=yes
# If we can't run a trivial program, we are probably using a cross compiler.
if (./conftest; exit) 2>/dev/null; then
@@ -771,12 +734,12 @@
{ echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:775: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:738: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
cross_compiling=$ac_cv_prog_cc_cross
echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:780: checking whether we are using GNU C" >&5
+echo "configure:743: checking whether we are using GNU C" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -785,7 +748,7 @@
yes;
#endif
EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:789: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:752: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
ac_cv_prog_gcc=yes
else
ac_cv_prog_gcc=no
@@ -804,7 +767,7 @@
ac_save_CFLAGS="$CFLAGS"
CFLAGS=
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:808: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:771: checking whether ${CC-cc} accepts -g" >&5
if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -836,7 +799,7 @@
fi
echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:840: checking whether ln -s works" >&5
+echo "configure:803: checking whether ln -s works" >&5
if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -857,7 +820,7 @@
fi
echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:861: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:824: checking whether ${MAKE-make} sets \${MAKE}" >&5
set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -886,7 +849,7 @@
# Extract the first word of "tar", so it can be a program name with args.
set dummy tar; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:890: checking for $ac_word" >&5
+echo "configure:853: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_TAR'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -920,7 +883,7 @@
# Extract the first word of "gzip", so it can be a program name with args.
set dummy gzip; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:924: checking for $ac_word" >&5
+echo "configure:887: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_GZIP'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -954,7 +917,7 @@
# Extract the first word of "rm", so it can be a program name with args.
set dummy rm; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:958: checking for $ac_word" >&5
+echo "configure:921: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_RM'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1027,7 +990,7 @@
if test "$NCURSES_HINT" = 'no' ; then
echo $ac_n "checking for main in -lcurses""... $ac_c" 1>&6
-echo "configure:1031: checking for main in -lcurses" >&5
+echo "configure:994: checking for main in -lcurses" >&5
ac_lib_var=`echo curses'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -1035,14 +998,14 @@
ac_save_LIBS="$LIBS"
LIBS="-lcurses $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1039 "configure"
+#line 1002 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:1046: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1009: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -1074,7 +1037,7 @@
else
if test "$NCURSES_HINT" = 'yes' || test "$NCURSES_HINT" = 'default' ; then
- if test "$host_os" = 'linux' || test "$host_os" = 'linux-gnu' ; then
+ if test "$host_os" = 'linux' || test "$host_os" = 'linux-gnu' || test "$host_os" = 'gnu0.2'; then
NCURSES_HINT='/usr'
else
NCURSES_HINT='/usr/local'
@@ -1086,7 +1049,7 @@
LIBS="-L$NCURSES_HINT/lib $LIBS"
echo $ac_n "checking for main in -lncurses""... $ac_c" 1>&6
-echo "configure:1090: checking for main in -lncurses" >&5
+echo "configure:1053: checking for main in -lncurses" >&5
ac_lib_var=`echo ncurses'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -1094,14 +1057,14 @@
ac_save_LIBS="$LIBS"
LIBS="-lncurses $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1098 "configure"
+#line 1061 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:1105: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1068: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -1130,7 +1093,7 @@
if test "$ac_cv_lib_ncurses_main" = 'no' ; then
echo $ac_n "checking for main in -lcurses""... $ac_c" 1>&6
-echo "configure:1134: checking for main in -lcurses" >&5
+echo "configure:1097: checking for main in -lcurses" >&5
ac_lib_var=`echo curses'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -1138,14 +1101,14 @@
ac_save_LIBS="$LIBS"
LIBS="-lcurses $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1142 "configure"
+#line 1105 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:1149: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1112: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -1178,7 +1141,7 @@
fi
echo $ac_n "checking for main in -lm""... $ac_c" 1>&6
-echo "configure:1182: checking for main in -lm" >&5
+echo "configure:1145: checking for main in -lm" >&5
ac_lib_var=`echo m'_'main | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -1186,14 +1149,14 @@
ac_save_LIBS="$LIBS"
LIBS="-lm $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1190 "configure"
+#line 1153 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:1197: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1160: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -1221,7 +1184,7 @@
fi
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1225: checking how to run the C preprocessor" >&5
+echo "configure:1188: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
@@ -1236,13 +1199,13 @@
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp.
cat > conftest.$ac_ext <<EOF
-#line 1240 "configure"
+#line 1203 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1246: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1209: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -1253,13 +1216,13 @@
rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF
-#line 1257 "configure"
+#line 1220 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1263: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1226: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -1270,13 +1233,13 @@
rm -rf conftest*
CPP="${CC-cc} -nologo -E"
cat > conftest.$ac_ext <<EOF
-#line 1274 "configure"
+#line 1237 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1280: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1243: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
@@ -1301,12 +1264,12 @@
echo "$ac_t""$CPP" 1>&6
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:1305: checking for ANSI C header files" >&5
+echo "configure:1268: checking for ANSI C header files" >&5
if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1310 "configure"
+#line 1273 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
@@ -1314,7 +1277,7 @@
#include <float.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1318: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1281: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -1331,7 +1294,7 @@
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
-#line 1335 "configure"
+#line 1298 "configure"
#include "confdefs.h"
#include <string.h>
EOF
@@ -1349,7 +1312,7 @@
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
-#line 1353 "configure"
+#line 1316 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
@@ -1370,7 +1333,7 @@
:
else
cat > conftest.$ac_ext <<EOF
-#line 1374 "configure"
+#line 1337 "configure"
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -1381,7 +1344,7 @@
exit (0); }
EOF
-if { (eval echo configure:1385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1348: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
:
else
@@ -1408,17 +1371,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1412: checking for $ac_hdr" >&5
+echo "configure:1375: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1417 "configure"
+#line 1380 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1422: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1385: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -1445,12 +1408,12 @@
done
echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:1449: checking for working const" >&5
+echo "configure:1412: checking for working const" >&5
if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1454 "configure"
+#line 1417 "configure"
#include "confdefs.h"
int main() {
@@ -1499,7 +1462,7 @@
; return 0; }
EOF
-if { (eval echo configure:1503: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1466: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_const=yes
else
@@ -1520,12 +1483,12 @@
fi
echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:1524: checking for size_t" >&5
+echo "configure:1487: checking for size_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1529 "configure"
+#line 1492 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@@ -1554,12 +1517,12 @@
echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:1558: checking return type of signal handlers" >&5
+echo "configure:1521: checking return type of signal handlers" >&5
if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1563 "configure"
+#line 1526 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <signal.h>
@@ -1576,7 +1539,7 @@
int i;
; return 0; }
EOF
-if { (eval echo configure:1580: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1543: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_type_signal=void
else
@@ -1597,12 +1560,12 @@
for ac_func in strdup memset memmove fileno lockf flock get_current_dir_name
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1601: checking for $ac_func" >&5
+echo "configure:1564: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1606 "configure"
+#line 1569 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -1625,7 +1588,7 @@
; return 0; }
EOF
-if { (eval echo configure:1629: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -1655,12 +1618,12 @@
for ac_func in snprintf
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1659: checking for $ac_func" >&5
+echo "configure:1622: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1664 "configure"
+#line 1627 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -1683,7 +1646,7 @@
; return 0; }
EOF
-if { (eval echo configure:1687: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1650: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -1711,12 +1674,12 @@
for ac_func in sprintf
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1715: checking for $ac_func" >&5
+echo "configure:1678: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1720 "configure"
+#line 1683 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -1739,7 +1702,7 @@
; return 0; }
EOF
-if { (eval echo configure:1743: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1706: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -1767,12 +1730,12 @@
for ac_func in vsnprintf
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1771: checking for $ac_func" >&5
+echo "configure:1734: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1776 "configure"
+#line 1739 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -1795,7 +1758,7 @@
; return 0; }
EOF
-if { (eval echo configure:1799: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1762: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -1823,12 +1786,12 @@
for ac_func in vsprintf
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1827: checking for $ac_func" >&5
+echo "configure:1790: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1832 "configure"
+#line 1795 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -1851,7 +1814,7 @@
; return 0; }
EOF
-if { (eval echo configure:1855: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1818: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -1879,12 +1842,12 @@
for ac_func in getopt_long
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1883: checking for $ac_func" >&5
+echo "configure:1846: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1888 "configure"
+#line 1851 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -1907,7 +1870,7 @@
; return 0; }
EOF
-if { (eval echo configure:1911: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1874: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -1935,12 +1898,12 @@
for ac_func in getopt
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1939: checking for $ac_func" >&5
+echo "configure:1902: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1944 "configure"
+#line 1907 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -1963,7 +1926,7 @@
; return 0; }
EOF
-if { (eval echo configure:1967: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1930: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
Modified: packages/trunk/freesweep/configure.in
===================================================================
--- packages/trunk/freesweep/configure.in 2008-02-23 10:29:21 UTC (rev 5906)
+++ packages/trunk/freesweep/configure.in 2008-02-23 10:29:28 UTC (rev 5907)
@@ -52,7 +52,7 @@
if test "$NCURSES_HINT" = 'yes' || test "$NCURSES_HINT" = 'default' ; then
dnl Linux uses ncurses, but not in /usr/local
- if test "$host_os" = 'linux' || test "$host_os" = 'linux-gnu' ; then
+ if test "$host_os" = 'linux' || test "$host_os" = 'linux-gnu' || test "$host_os" = 'gnu0.2'; then
NCURSES_HINT='/usr'
else
dnl Set NCURSES_HINT to /usr/local, which is it's default.
Property changes on: packages/trunk/freesweep/debian
___________________________________________________________________
Name: mergeWithUpstream
+ 1
Added: packages/trunk/freesweep/debian/changelog
===================================================================
--- packages/trunk/freesweep/debian/changelog (rev 0)
+++ packages/trunk/freesweep/debian/changelog 2008-02-23 10:29:28 UTC (rev 5907)
@@ -0,0 +1,149 @@
+freesweep (0.88-4.3) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * debian/rules:
+ + Fix bashism (Closes: #459065).
+ + Remove DH_COMPAT.
+ * debian/control:
+ + Bump Standards-Version to 3.7.3 (no changes needed).
+ + Add Homepage field.
+ * Add compat file.
+
+ -- Marco Rodrigues <gothicx at sapo.pt> Thu, 24 Jan 2008 22:36:41 +0000
+
+freesweep (0.88-4.2) unstable; urgency=low
+
+ * Porter NMU.
+ * Update config.guess/config.sub at build time (closes: #345221, #299277)
+
+ -- Aurelien Jarno <aurel32 at debian.org> Sun, 10 Dec 2006 22:25:23 +0100
+
+freesweep (0.88-4.1) unstable; urgency=high
+
+ * NMU
+ * Urgency high due to security fixes.
+ * Apply patch from Steve Kemp <sxk at debian.org> to fix buffer overflow in
+ environmental variable handling which allowed local GID games attack
+ (CAN-2003-0828).
+ * This NMU will allow the security update for Woody to go in by the
+ sheer fact of increasing the version number (closes: #242616);
+ security updates can't go in if the versions in unstable and stable
+ are identical (hence the 0-day NMU).
+ * Remove duplicate conffile entry.
+
+ -- Romain Francoise <rfrancoise at debian.org> Wed, 7 Apr 2004 21:38:19 +0200
+
+freesweep (0.88-4) unstable; urgency=low
+
+ * debian/control: Standards-Version: 3.5.5
+ * debian/copyright: cleaned up copyright
+ * config.{guess,sub}: updated files to version from libtool package
+ (Closes: Bug#103374)
+
+ -- Edward Betts <edward at debian.org> Wed, 4 Jul 2001 11:26:34 +0200
+
+freesweep (0.88-3) unstable; urgency=low
+
+ * configure.in: quick hack to reduce the severity of Bug#98053.
+ I will endeavor to find a more long term solution in the near future.
+
+ -- Edward Betts <edward at debian.org> Mon, 21 May 2001 11:15:46 +0100
+
+freesweep (0.88-2) unstable; urgency=low
+
+ * debian/control: added build-depends on autoconf
+ * debian/rules: make config.h.in (Closes: Bug#94550)
+
+ -- Edward Betts <edward at debian.org> Thu, 19 Apr 2001 17:56:57 -0600
+
+freesweep (0.88-1) unstable; urgency=low
+
+ * New upstream release
+ * debian/control: Standards-Version: 3.5.2
+ * debian/rules: Changed to debhelper 3
+ * debian/rules: Changed dh_installmanpages to dh_installman
+ * debian/rules: configure --disable-debug-log (Closes: Bug#88475)
+ * debian/rules: Removed dh_suidregister
+ * debian/rules: Removed dh_testversion
+ * debian/rules: Support DEB_BUILD_OPTIONS
+ * Makefile.in: remove config.h.in from list of files to delete on clean
+
+ -- Edward Betts <edward at debian.org> Wed, 11 Apr 2001 14:52:46 -0600
+
+freesweep (0.87-7) unstable; urgency=low
+
+ * Update config.{guess,sub} to versions from the automake package.
+ Should now compile better on ARM (closes: Bug#56548).
+
+ -- Edward Betts <edward at debian.org> Thu, 3 Feb 2000 09:26:01 +0000
+
+freesweep (0.87-6) unstable; urgency=low
+
+ * recompile against libncurses5.
+ * debian/control: updated Standards-Version to 3.1.1
+ * debian/control: added Build-Depends.
+ * debian/copyright: updated to reflect change of debian maintainer.
+ * debian/dirs: removed dirs created by other dh_* tools.
+ * debian/rules: rewritten.
+
+ -- Edward Betts <edward at debian.org> Thu, 6 Jan 2000 23:05:30 +0000
+
+freesweep (0.87-5) unstable; urgency=low
+
+ * debian/rules: changed to debhelper.
+
+ -- Edward Betts <edward at debian.org> Sat, 13 Nov 1999 14:25:53 +0000
+
+freesweep (0.87-4) unstable; urgency=low
+
+ * New maintainer.
+
+ -- Edward Betts <edward at debian.org> Sat, 13 Nov 1999 14:25:53 +0000
+
+freesweep (0.87-3) unstable; urgency=low
+
+ * sweep.h.in.orig: removed.
+
+ -- Antti-Juhani Kaijanaho <ajk at debian.org> Fri, 22 Oct 1999 18:59:12 +0300
+
+freesweep (0.87-2) unstable; urgency=low
+
+ * debian/{prerm,postinst}: Implement the /usr/doc transition.
+ * debian/rules: Install DEBIAN/conffiles as nonex, not script.
+
+ -- Antti-Juhani Kaijanaho <ajk at debian.org> Thu, 7 Oct 1999 23:17:00 +0300
+
+freesweep (0.87-1) unstable; urgency=low
+
+ * New upstream release
+ * debian/rules: Use the new preferences and scores options to ./configure.
+ * debian/rules: Install a manual page.
+ * debian/{postinst,prerm}: Manage the scorefile, treating it as if it was
+ part of the package, but don't overwrite on upgrade.
+ * debian/{postinst,prerm}: Use suidmanager to handle the sgid executable.
+ * debian/rules: Install debian/prerm.
+ * debian/rules: Modernized
+ + Factorize the install program into a variable
+ + Use target-specific variables to handle the package names.
+ + Don't use $(install_zipped); use $(GZIP) instead
+ + Use stamp files.
+ + Remove $(rootdir) at the start of a binary rule.
+ + Don't test for rootness.
+ + Use pre- and post-binary variables.
+ + Split the clean target into clean-build and clean-binary.
+
+ -- Antti-Juhani Kaijanaho <ajk at debian.org> Sun, 5 Sep 1999 04:34:26 +0300
+
+freesweep (0.86-2) unstable; urgency=low
+
+ * Added Debian menu support.
+ * Moved the binary to /usr/games as required by FHS 2.0.
+ * debian/control: Fixed a typo in description.
+
+ -- Antti-Juhani Kaijanaho <ajk at debian.org> Wed, 4 Aug 1999 23:59:28 +0300
+
+freesweep (0.86-1) unstable; urgency=low
+
+ * Initial packaging.
+
+ -- Antti-Juhani Kaijanaho <ajk at debian.org> Fri, 23 Jul 1999 21:45:10 +0300
Added: packages/trunk/freesweep/debian/compat
===================================================================
--- packages/trunk/freesweep/debian/compat (rev 0)
+++ packages/trunk/freesweep/debian/compat 2008-02-23 10:29:28 UTC (rev 5907)
@@ -0,0 +1 @@
+4
Added: packages/trunk/freesweep/debian/control
===================================================================
--- packages/trunk/freesweep/debian/control (rev 0)
+++ packages/trunk/freesweep/debian/control 2008-02-23 10:29:28 UTC (rev 5907)
@@ -0,0 +1,17 @@
+Source: freesweep
+Maintainer: Edward Betts <edward at debian.org>
+Section: games
+Priority: optional
+Standards-Version: 3.7.3
+Build-Depends: debhelper (>= 4.0.0), libncurses5-dev, autoconf, autotools-dev
+Homepage: http://www.upl.cs.wisc.edu/~hartmann/sweep/
+
+Package: freesweep
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: a text-based minesweeper
+ Freesweep is an implementation of the popular minesweeper game, where
+ one tries to find all the mines without igniting any, based on hints given
+ by the computer. Unlike most implementations of this game, Freesweep
+ works in any visual text display - in Linux console, in an xterm, and in
+ most text-based terminals currently in use.
Added: packages/trunk/freesweep/debian/copyright
===================================================================
--- packages/trunk/freesweep/debian/copyright (rev 0)
+++ packages/trunk/freesweep/debian/copyright 2008-02-23 10:29:28 UTC (rev 5907)
@@ -0,0 +1,31 @@
+This package has been Debianised by Antti-Juhani Kaijanaho <ajk at debian.org>
+from sources fetched at 1999-09-05 03:30 UTC from
+<URL:http://www.upl.cs.wisc.edu/~hartmann/sweep/freesweep.tar.gz>
+
+It was taken over by Edward Betts <edward at debian.org> on
+Sat, 13 Nov 1999 14:25:53 +0000
+
+Upstream Authors: Gus Hartmann <hartmann at upl.cs.wisc.edu>
+ Pete Keller <psilord at upl.cs.wisc.edu>
+
+Copyright:
+
+ freesweep - a curses minesweeper-style game
+ Copyright (C) 1999 Gus Hartmann & Peter Keller
+
+ 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+On Debian GNU/Linux systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
Added: packages/trunk/freesweep/debian/freesweep.dirs
===================================================================
--- packages/trunk/freesweep/debian/freesweep.dirs (rev 0)
+++ packages/trunk/freesweep/debian/freesweep.dirs 2008-02-23 10:29:28 UTC (rev 5907)
@@ -0,0 +1,2 @@
+usr/games
+etc
Added: packages/trunk/freesweep/debian/freesweep.docs
===================================================================
--- packages/trunk/freesweep/debian/freesweep.docs (rev 0)
+++ packages/trunk/freesweep/debian/freesweep.docs 2008-02-23 10:29:28 UTC (rev 5907)
@@ -0,0 +1 @@
+README
Added: packages/trunk/freesweep/debian/freesweep.menu
===================================================================
--- packages/trunk/freesweep/debian/freesweep.menu (rev 0)
+++ packages/trunk/freesweep/debian/freesweep.menu 2008-02-23 10:29:28 UTC (rev 5907)
@@ -0,0 +1,6 @@
+?package(freesweep):\
+ needs=text\
+ section=Games/Puzzles\
+ title="Freesweep"\
+ command="/usr/games/freesweep"
+
Added: packages/trunk/freesweep/debian/rules
===================================================================
--- packages/trunk/freesweep/debian/rules (rev 0)
+++ packages/trunk/freesweep/debian/rules 2008-02-23 10:29:28 UTC (rev 5907)
@@ -0,0 +1,87 @@
+#!/usr/bin/make -f
+# debian/rules for freesweep
+# modifications by Edward Betts <edward at debian.org>
+# Based on:
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+CFLAGS = -O2
+ifeq "$(findstring debug,$(DEB_BUILD_OPTIONS))" "debug"
+ CFLAGS += -g
+endif
+
+build: build-stamp
+build-stamp:
+ dh_testdir
+
+ cp /usr/share/misc/config.sub .
+ cp /usr/share/misc/config.guess .
+ $(MAKE) config.h.in
+ CFLAGS="$(CFLAGS)" ./configure --prefix=/usr --with-prefsdir=/etc \
+ --with-scoresdir=/var/games --disable-debug-log --with-ncurses=/usr
+ $(MAKE)
+
+ touch build-stamp
+
+clean:
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp
+ rm -f config.guess
+ rm -f config.sub
+
+ [ ! -f Makefile ] || $(MAKE) clean
+
+ dh_clean freesweep.6
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+
+ install -o root -g games -m 2755 -s freesweep \
+ `pwd`/debian/freesweep/usr/games
+ install -o root -g root -m 644 sweeprc \
+ `pwd`/debian/freesweep/etc
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+ dh_testdir
+ dh_testroot
+# dh_installdebconf
+ dh_installdocs
+ dh_installexamples
+ dh_installmenu
+# dh_installemacsen
+# dh_installpam
+# dh_installmime
+# dh_installinit
+ dh_installcron
+ dh_installman freesweep.6
+ dh_installinfo
+# dh_undocumented
+ dh_installchangelogs CHANGES
+ dh_link
+ dh_strip
+ dh_compress
+ dh_fixperms
+ chmod 2755 `pwd`/debian/freesweep/usr/games/freesweep
+ chown root:games `pwd`/debian/freesweep/usr/games/freesweep
+# dh_makeshlibs
+ dh_installdeb
+# dh_perl
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install
Property changes on: packages/trunk/freesweep/debian/rules
___________________________________________________________________
Name: svn:executable
+ *
Modified: packages/trunk/freesweep/files.c
===================================================================
--- packages/trunk/freesweep/files.c 2008-02-23 10:29:21 UTC (rev 5906)
+++ packages/trunk/freesweep/files.c 2008-02-23 10:29:28 UTC (rev 5907)
@@ -104,9 +104,7 @@
perror("SourceHomeFile::getenv");
return 1;
}
- strcpy(Pathname,Buffer);
- strcat(Pathname,"/");
- strcat(Pathname,DFL_PREFS_FILE);
+ snprintf(Pathname,MAX_LINE-1,"%s/%s", Buffer, DFL_PREFS_FILE);
if ((PrefsFile=fopen(Pathname,"r"))==NULL)
{
@@ -166,11 +164,9 @@
perror("WriteHomeFile::getenv");
return 1;
}
+
+ snprintf(Pathname,MAX_LINE-1, "%s/%s", Buffer, DFL_PREFS_FILE);
- strcpy(Pathname,Buffer);
- strcat(Pathname,"/");
- strcat(Pathname,DFL_PREFS_FILE);
-
if ((PrefsFile=fopen(Pathname,"w"))==NULL)
{
perror("WritePrefsFile::fopen");
Modified: packages/trunk/freesweep/pbests.c
===================================================================
--- packages/trunk/freesweep/pbests.c 2008-02-23 10:29:21 UTC (rev 5906)
+++ packages/trunk/freesweep/pbests.c 2008-02-23 10:29:28 UTC (rev 5907)
@@ -382,7 +382,7 @@
SweepError("You do not have a username!");
buf = "unknown";
}
- strcpy(b->name, buf);
+ strncpy(b->name, buf,sizeof(b->name)-1);
/* get the real time it was completed */
time(&now);
Modified: packages/trunk/freesweep/sweep.h
===================================================================
--- packages/trunk/freesweep/sweep.h 2008-02-23 10:29:21 UTC (rev 5906)
+++ packages/trunk/freesweep/sweep.h 2008-02-23 10:29:28 UTC (rev 5907)
@@ -9,6 +9,8 @@
#define mkstr(s) # s
+#define RETSIGTYPE void
+
/* The library header files. */
#ifdef HAVE_UNISTD_H
#include <unistd.h>
@@ -18,6 +20,9 @@
#include <string.h>
#endif /* HAVE_STRING_H */
+/* debian-specific, will be properly fixed by upstream soon - ajk*/
+#include <string.h>
+
#ifdef HAVE_GETOPT_H
#include <getopt.h>
#endif /* HAVE_GETOPT_H */
@@ -71,7 +76,7 @@
/* These are all the defines used in freesweep */
/* These are defines for convenience */
#define DELIMITERS " \t="
-#define DFL_GROUP_PATH "no"
+#define DFL_GROUP_PATH "/var/games"
#define MAGIC_NUMBER 128
#ifdef __CYGWIN__
@@ -82,7 +87,7 @@
#define DFL_BESTS_FILE ".sweeptimes"
#endif /* __CYGWIN__ */
-#define GLOBAL_PREFS_FILE "/usr/local/share/sweeprc"
+#define GLOBAL_PREFS_FILE "/etc/sweeprc"
/* used for the superclick feature in the game */
#define SUPERCLICK 0
Modified: packages/trunk/freesweep/sweep.h.in
===================================================================
--- packages/trunk/freesweep/sweep.h.in 2008-02-23 10:29:21 UTC (rev 5906)
+++ packages/trunk/freesweep/sweep.h.in 2008-02-23 10:29:28 UTC (rev 5907)
@@ -9,6 +9,8 @@
#define mkstr(s) # s
+#define RETSIGTYPE void
+
/* The library header files. */
#ifdef HAVE_UNISTD_H
#include <unistd.h>
@@ -18,6 +20,9 @@
#include <string.h>
#endif /* HAVE_STRING_H */
+/* debian-specific, will be properly fixed by upstream soon - ajk*/
+#include <string.h>
+
#ifdef HAVE_GETOPT_H
#include <getopt.h>
#endif /* HAVE_GETOPT_H */
More information about the Pkg-games-commits
mailing list