[SCM] Debian package of greed branch, master, updated. upstream/3.6-63-g6fff3e6

Sat Jan 15 19:45:26 UTC 2011

The following commit has been merged in the master branch:
commit 6fff3e610e2d2b1f634a691197ec2355bf6ecc8e
Author: Josue Abarca <jmaslibre at debian.org.gt>
Date:   Sat Jan 15 13:43:39 2011 -0600

    debian/patches/* updated/removed

diff --git a/debian/changelog b/debian/changelog
index b2c0c76..5704c27 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+greed (3.6-2) unstable; urgency=low
+
+  * Imported Upstream version 3.7.
+  * debian/patch/fix_quit_option.diff removed because the bug was fixed by
+    upstreamer.
+  * debian/patch/fix_quit_option.diff removed because the bug was fixed by
+    upstreamer.
+  * debian/patch/Makefile.diff updated.
+
+ -- Josue Abarca <jmaslibre at debian.org.gt>  Sat, 15 Jan 2011 13:42:23 -0600
+
 greed (3.6-1) unstable; urgency=low
 
   * Imported Upstream version 3.6.
diff --git a/debian/patches/Makefile.diff b/debian/patches/Makefile.diff
index 2b79966..2cdfd25 100644
--- a/debian/patches/Makefile.diff
+++ b/debian/patches/Makefile.diff
@@ -6,38 +6,22 @@ Description: This patch changes the place
 Forwarded: Yes
 Author: Pierre Machard <pmachard at debian.org>, Josué Abarca <jmaslibre at debian.org.gt>
 Bug-Debian: http://bugs.debian.org/437088
-Last-Update: 2010-06-14
-
+Last-Update: 2011-01-15
 --- a/Makefile
 +++ b/Makefile
-@@ -11,14 +11,14 @@
+@@ -4,9 +4,9 @@
+ 
+ VERS=$(shell sed <greed.spec -n -e '/Version: \(.*\)/s//\1/p')
  
- # 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 @@
- #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
+ 	$(CC) -DSCOREFILE=\"$(SFILE)\" -DRELEASE=\"$(VERS)\" -o greed greed.c -O3 -lcurses
+@@ -19,10 +19,10 @@
  
  install: greed.6 uninstall
  	cp greed $(BIN)
@@ -49,4 +33,4 @@ Last-Update: 2010-06-14
 +	rm -f $(BIN)/greed $(DESTDIR)/usr/share/man/man6/greed.6
  
  clean:
- 	rm -f *~ *.o greed greed-*.tar.gz  greed*.rpm
+ 	rm -f *~ *.o greed greed-*.tar.gz  greed*.rpm *.html
diff --git a/debian/patches/fix_quit_option.diff b/debian/patches/fix_quit_option.diff
deleted file mode 100644
index 9b12a22..0000000
--- a/debian/patches/fix_quit_option.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-Description: Pressing "q" in the game
- returns the question: Really quit?
- Independent of the key pressed, the game
- quits however. This includes "n".
- With this patch the function tunnel
- doesn't return -1 when pressing q, and
- delegates the responsibility to the
- quit() function.
-Forwarded: Yes
-Bug-Debian: http://bugs.debian.org/214086
-Author: Helge Kreutzmann <kreutzm at itp.uni-hannover.de>
-Last-Update: 2004-04-01
-
---- a/greed.c
-+++ b/greed.c
-@@ -383,7 +383,7 @@
- 		return (1);
- 	case 'q': case 'Q':
- 		quit();
--		return(-1);
-+		return(1);
- 	case '?':
- 		help();
- 		return (1);
diff --git a/debian/patches/fix_warnings.diff b/debian/patches/fix_warnings.diff
deleted file mode 100644
index f4a6a55..0000000
--- a/debian/patches/fix_warnings.diff
+++ /dev/null
@@ -1,52 +0,0 @@
-Description: This patch fixes some 
- "incompatible implicit declaration
- of built-in functions" warnings
- adding stdlib.h and string.h.
-Forwarded: Yes
-Author: Josué Abarca <jmaslibre at debian.org.gt>
-Last-Update: 2010-04-26
-
---- a/greed.c
-+++ b/greed.c
-@@ -68,8 +68,9 @@
- #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 @@
- 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 */
-@@ -547,7 +546,6 @@
- 	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 @@
- 					 * 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/debian/patches/greed.xml.diff b/debian/patches/greed.xml.diff
index 09a7afd..0bec34c 100644
--- a/debian/patches/greed.xml.diff
+++ b/debian/patches/greed.xml.diff
@@ -18,7 +18,7 @@ Last-Update: 2010-04-16
  <refentry id='greed.6'>
  <refmeta>
  <refentrytitle>greed</refentrytitle>
-@@ -76,7 +77,7 @@
+@@ -79,7 +80,7 @@
  <refsect1 id='files'><title>FILES</title>
  <variablelist remap='TP'>
  <varlistentry>
diff --git a/debian/patches/series b/debian/patches/series
index 171c44f..5ffacfd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
-Makefile.diff
 greed.xml.diff
-fix_quit_option.diff
-fix_warnings.diff
+Makefile.diff

-- 
Debian package of greed

