The following commit has been merged in the master branch:
commit 13159533f66588268ac696af62b6e7fef15cb62f
Author: Josue Abarca <[email protected]>
Date: Mon Jun 14 23:57:53 2010 -0600
Patches applied (quilt)
diff --git a/.pc/Makefile.diff/.timestamp b/.pc/Makefile.diff/.timestamp
new file mode 100644
index 0000000..e69de29
diff --git a/Makefile b/.pc/Makefile.diff/Makefile
similarity index 100%
copy from Makefile
copy to .pc/Makefile.diff/Makefile
diff --git a/debian/patches/series b/.pc/applied-patches
similarity index 100%
copy from debian/patches/series
copy to .pc/applied-patches
diff --git a/.pc/fix_quit_option.diff/.timestamp
b/.pc/fix_quit_option.diff/.timestamp
new file mode 100644
index 0000000..e69de29
diff --git a/greed.c b/.pc/fix_quit_option.diff/greed.c
similarity index 100%
copy from greed.c
copy to .pc/fix_quit_option.diff/greed.c
diff --git a/.pc/fix_warnings.diff/.timestamp b/.pc/fix_warnings.diff/.timestamp
new file mode 100644
index 0000000..e69de29
diff --git a/greed.c b/.pc/fix_warnings.diff/greed.c
similarity index 99%
copy from greed.c
copy to .pc/fix_warnings.diff/greed.c
index 631c291..91ecb0c 100644
--- a/greed.c
+++ b/.pc/fix_warnings.diff/greed.c
@@ -383,7 +383,7 @@ int * attribs;
return (1);
case 'q': case 'Q':
quit();
- return(-1);
+ return(1);
case '?':
help();
return (1);
diff --git a/.pc/greed.xml.diff/.timestamp b/.pc/greed.xml.diff/.timestamp
new file mode 100644
index 0000000..e69de29
diff --git a/greed.xml b/.pc/greed.xml.diff/greed.xml
similarity index 100%
copy from greed.xml
copy to .pc/greed.xml.diff/greed.xml
diff --git a/Makefile b/Makefile
index b2c30ff..884ce89 100644
--- a/Makefile
+++ b/Makefile
@@ -11,14 +11,14 @@ SYSDEF=NOTBSD
# Prepend "c:" (or whatever drive you use) to the following paths for MSDOS
# Location of high score file
-SFILE=/usr/games/lib/greed.hs
+SFILE=$(DESTDIR)/var/games/greed/greed.hs
# Location of game executable
-BIN=/usr/games
+BIN=$(DESTDIR)/usr/games
# Flags for use with the Linux ncurses package (recommended)
-CFLAGS = -O -s -DNOTBSD
+CFLAGS += -O -DNOTBSD
TERMLIB = -lncurses
-CC = gcc
+CC?= gcc
# Flags for use with stock curses
# CFLAGS = -O -s
@@ -30,17 +30,17 @@ CC = gcc
#TERMLIB = scurses.lib
greed: greed.c
- cc -DSCOREFILE=\"$(SFILE)\" -D$(SYSDEF) -DRELEASE=\"$(VERS)\" -o greed
greed.c $(CFLAGS) $(TERMLIB)
+ CC -DSCOREFILE=\"$(SFILE)\" -D$(SYSDEF) -DRELEASE=\"$(VERS)\" -o greed
greed.c $(CFLAGS) $(TERMLIB)
greed.6: greed.xml
xmlto man greed.xml
install: greed.6 uninstall
cp greed $(BIN)
- cp greed.6 /usr/share/man/man6/greed.6
+ cp greed.6 $(DESTDIR)/usr/share/man/man6/greed.6
uninstall:
- rm -f $(BIN)/install /usr/share/man/man6/greed.6
+ rm -f $(BIN)/greed $(DESTDIR)/usr/share/man/man6/greed.6
clean:
rm -f *~ *.o greed greed-*.tar.gz greed*.rpm
diff --git a/greed.c b/greed.c
index 631c291..55e6bc3 100644
--- a/greed.c
+++ b/greed.c
@@ -68,8 +68,9 @@ static char *version = "Greed v" RELEASE;
#include <sys/types.h>
#include <io.h>
-#include <stdlib.h>
#endif
+#include <stdlib.h>
+#include <string.h>
#ifdef NOTBSD
#ifndef crmode
@@ -200,11 +201,9 @@ int argc;
char *argv[];
{
register val = 1;
- extern long time();
int attribs[9];
#ifdef A_COLOR
char *colors;
- extern char *getenv(), *strchr();
#endif
cmdname = argv[0]; /* save the command name */
@@ -383,7 +382,7 @@ int * attribs;
return (1);
case 'q': case 'Q':
quit();
- return(-1);
+ return(1);
case '?':
help();
return (1);
@@ -547,7 +546,6 @@ register int newscore;
char *tptr = (char *) malloc(16), *boldon, *boldoff;
struct score *toplist = (struct score *) malloc(FILESIZE);
register struct score *ptrtmp, *eof = &toplist[MAXSCORE], *new = NULL;
- extern char *getenv(), *tgetstr();
#ifndef MSDOS
void lockit();
#else
@@ -628,8 +626,8 @@ register int newscore;
* any greed had been played? */
#ifndef MSDOS
if (new && tgetent(termbuf, getenv("TERM")) > 0) {
- boldon = tgetstr("so", &tptr); /* grab off inverse */
- boldoff = tgetstr("se", &tptr); /* video codes */
+ boldon = (char *) tgetstr("so", &tptr); /* grab off
inverse */
+ boldoff = (char *) tgetstr("se", &tptr); /*
video codes */
if (!boldon || !boldoff) boldon = boldoff = 0;
/* if only got one of the *
* codes, use neither */
diff --git a/greed.xml b/greed.xml
index 8ea9a95..95fe47d 100644
--- a/greed.xml
+++ b/greed.xml
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!DOCTYPE refentry PUBLIC
"-//OASIS//DTD DocBook XML V4.1.2//EN"
- "docbook/docbookx.dtd">
+ "/usr/share/sgml/docbook/dtd/xml/4.1.2/docbookx.dtd"
+ >
<refentry id='greed.6'>
<refmeta>
<refentrytitle>greed</refentrytitle>
@@ -76,7 +77,7 @@ defined.</para>
<refsect1 id='files'><title>FILES</title>
<variablelist remap='TP'>
<varlistentry>
-<term>/usr/lib/games/greed.hs</term>
+<term>/var/games/greed/greed.hs</term>
<listitem>
<para>Default location of Greed high scores.</para>
</listitem>
--
Debian package of greed
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
