[Pkg-nethack-devel] nethack/debian/patches 00list,1.12,1.13 14_common_config.dpatch,1.2,1.3 90_enh_hpmon.dpatch,1.2,1.3 91_enh_menucolors.dpatch,1.1,1.2 03_char_signedness.dpatch,1.1,NONE 07_explore_mode_save.dpatch,1.2,NONE 13_qt_warning_fixes.dpatch,1.1,NONE
Joshua Kwan
joshk-guest@quantz.debian.org
Tue, 09 Dec 2003 16:52:04 +0000
Update of /cvsroot/pkg-nethack/nethack/debian/patches
In directory quantz:/tmp/cvs-serv11681/patches
Modified Files:
00list 14_common_config.dpatch 90_enh_hpmon.dpatch
91_enh_menucolors.dpatch
Removed Files:
03_char_signedness.dpatch 07_explore_mode_save.dpatch
13_qt_warning_fixes.dpatch
Log Message:
First landing of 3.4.3 Debian modifications.
Index: 00list
===================================================================
RCS file: /cvsroot/pkg-nethack/nethack/debian/patches/00list,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- 00list 9 Dec 2003 16:06:49 -0000 1.12
+++ 00list 9 Dec 2003 16:52:02 -0000 1.13
@@ -1,15 +1,12 @@
01_fix_qt
02_SECURITY_recover_secure
-03_char_signedness
04_manpage_paths
05_build_cflags
06_x11_data
-07_explore_mode_save
08_linux_specifics
09_use_gnu_source
10_gnome_add_quiver
12_lisp_windowing
-13_qt_warning_fixes
14_common_config
15_recover_errormsg
16_pixmapdir
Index: 90_enh_hpmon.dpatch
===================================================================
RCS file: /cvsroot/pkg-nethack/nethack/debian/patches/90_enh_hpmon.dpatch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- 90_enh_hpmon.dpatch 18 Nov 2003 05:08:07 -0000 1.2
+++ 90_enh_hpmon.dpatch 9 Dec 2003 16:52:02 -0000 1.3
@@ -99,7 +99,7 @@
@@ -345,6 +345,9 @@
#define EXP_ON_BOTL /* Show experience on bottom line */
- #define PARANOID /* Confirm hitting peaceful monsters */
+ #define PARANOID
+
+#define HPMON /* Color HP monitor */
+
Index: 14_common_config.dpatch
===================================================================
RCS file: /cvsroot/pkg-nethack/nethack/debian/patches/14_common_config.dpatch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- 14_common_config.dpatch 23 Oct 2003 05:23:33 -0000 1.2
+++ 14_common_config.dpatch 9 Dec 2003 16:52:02 -0000 1.3
@@ -9,8 +9,8 @@
exit 1
fi
case "$1" in
- -patch) patch -f --no-backup-if-mismatch -p1 < $0;;
- -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;;
+ -patch) patch -f --no-backup-if-mismatch -p0 < $0;;
+ -unpatch) patch -f --no-backup-if-mismatch -R -p0 < $0;;
*)
echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
exit 1;;
@@ -18,20 +18,19 @@
exit 0
---- nethack/include/config.h~ 2003-10-11 23:10:24.000000000 -0700
-+++ nethack/include/config.h 2003-10-11 23:11:44.000000000 -0700
-@@ -1,4 +1,4 @@
--/* SCCS Id: @(#)config.h 3.4 2003/02/19 */
-+/* SCCS Id: @(#)config.h 3.4 2002/03/17 */
- /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
- /* NetHack may be freely redistributed. See license for details. */
-
-@@ -42,12 +42,20 @@
+Index: include/config.h
+===================================================================
+RCS file: /cvsroot/pkg-nethack/nethack/include/config.h,v
+retrieving revision 1.2
+diff -u -r1.2 config.h
+--- include/config.h 9 Dec 2003 16:14:43 -0000 1.2
++++ include/config.h 9 Dec 2003 16:33:15 -0000
+@@ -42,12 +42,19 @@
* Define all of those you want supported in your binary.
* Some combinations make no sense. See the installation document.
*/
+
-+#ifndef LISP_GRAPHICS /* exception to the rule */
++#ifndef LISP_GRAPHICS
#define TTY_GRAPHICS /* good old tty based graphics */
/* #define X11_GRAPHICS */ /* X11 interface */
/* #define QT_GRAPHICS */ /* Qt interface */
@@ -39,25 +38,26 @@
/* #define MSWIN_GRAPHICS */ /* Windows NT, CE, Graphics */
+/* Debian default window system is always tty; they have to set their
-+ * own if they want another one (or just use the scripts)
-+ */
++ * own if they want another one (or just use the scripts */
+#define DEFAULT_WINDOW_SYS "tty"
+#endif
+
/*
* Define the default window system. This should be one that is compiled
* into your system (see defines above). Known window systems are:
-@@ -83,9 +91,7 @@
+@@ -83,11 +90,7 @@
#endif
#ifdef QT_GRAPHICS
-# define DEFAULT_WC_TILED_MAP /* Default to tiles if users doesn't say wc_ascii_map */
# define USER_SOUNDS /* Use sounds */
--# define USER_SOUNDS_REGEX
+-# ifndef __APPLE__
+-# define USER_SOUNDS_REGEX
+-# endif
# define USE_XPM /* Use XPM format for images (required) */
# define GRAPHIC_TOMBSTONE /* Use graphical tombstone (rip.ppm) */
# ifndef DEFAULT_WINDOW_SYS
-@@ -124,7 +131,7 @@
+@@ -126,7 +129,7 @@
* would allow:
* xpmtoppm <x11tiles.xpm | pnmscale 1.25 | ppmquant 90 >x11tiles_big.xpm
*/
@@ -66,18 +66,7 @@
# ifdef USE_XPM
# define GRAPHIC_TOMBSTONE /* Use graphical tombstone (rip.xpm) */
# endif
-@@ -133,24 +139,22 @@
-
- /*
- * Section 2: Some global parameters and filenames.
-- * Commenting out WIZARD, LOGFILE, NEWS or PANICLOG removes that
-- * feature from the game; otherwise set the appropriate wizard
-- * name. LOGFILE, NEWS and PANICLOG refer to files in the
-- * playground.
-+ * Commenting out WIZARD, LOGFILE, or NEWS removes that feature
-+ * from the game; otherwise set the appropriate wizard name.
-+ * LOGFILE and NEWS refer to files in the playground.
- */
+@@ -143,16 +146,15 @@
#ifndef WIZARD /* allow for compile-time or Makefile changes */
# ifndef KR1ED
@@ -96,55 +85,53 @@
/*
* If COMPRESS is defined, it should contain the full path name of your
-@@ -167,11 +171,11 @@
+@@ -169,11 +171,8 @@
#ifdef UNIX
/* path and file name extension for compression program */
-#define COMPRESS "/usr/bin/compress" /* Lempel-Ziv compression */
-#define COMPRESS_EXTENSION ".Z" /* compress's extension */
-+/* #define COMPRESS "/usr/bin/compress" */ /* Lempel-Ziv compression */
-+/* #define COMPRESS_EXTENSION ".Z" */ /* compress's extension */
- /* An example of one alternative you might want to use: */
+-/* An example of one alternative you might want to use: */
-/* #define COMPRESS "/usr/local/bin/gzip" */ /* FSF gzip compression */
-/* #define COMPRESS_EXTENSION ".gz" */ /* normal gzip extension */
-+#define COMPRESS "/bin/gzip" /* FSF gzip compression */
-+#define COMPRESS_EXTENSION ".gz" /* normal gzip extension */
++#define COMPRESS "/bin/gzip" /* FSF gzip compression */
++#define COMPRESS_EXTENSION ".gz" /* normal gzip extension */
#endif
#ifndef COMPRESS
-@@ -183,7 +187,7 @@
+@@ -185,7 +184,7 @@
* a tar-like file, thus making a neater installation. See *conf.h
* for detailed configuration.
*/
-/* #define DLB */ /* not supported on all platforms */
-+#define DLB /* not supported on all platforms */
++#define DLB /* not supported on all platforms */
/*
* Defining INSURANCE slows down level changes, but allows games that
-@@ -205,7 +209,7 @@
- # ifdef __APPLE__
- # define HACKDIR "nethackdir" /* nethack directory */
- # else
--# define HACKDIR "/usr/games/lib/nethackdir"
-+# define HACKDIR "/usr/lib/games/nethack"
- # endif
+@@ -204,7 +203,7 @@
+ * otherwise it will be the current directory.
+ */
+ # ifndef HACKDIR
+-# define HACKDIR "/usr/games/lib/nethackdir"
++# define HACKDIR "/usr/lib/games/nethack"
# endif
-@@ -216,7 +220,8 @@
+ /*
+@@ -214,7 +213,8 @@
* since the user might create files in a directory of his choice.
* Of course SECURE is meaningful only if HACKDIR is defined.
*/
-/* #define SECURE */ /* do setuid(getuid()) after chdir() */
-+#define SECURE /* do setuid(getuid()) after chdir() */
-+#define PIXMAPDIR "/usr/share/pixmaps/nethack/"
++#define SECURE /* do setuid(getuid()) after chdir() */
++#define PIXMAPDIR "/usr/share/games/nethack/"
/*
* If it is desirable to limit the number of people that can play Hack
-@@ -340,6 +344,7 @@
+@@ -338,6 +338,7 @@
#endif
#define EXP_ON_BOTL /* Show experience on bottom line */
-+#define PARANOID /* Confirm hitting peaceful monsters */
++#define PARANOID
/* #define SCORE_ON_BOTL */ /* added by Gary Erickson (erickson@ucivax) */
/*
Index: 91_enh_menucolors.dpatch
===================================================================
RCS file: /cvsroot/pkg-nethack/nethack/debian/patches/91_enh_menucolors.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- 91_enh_menucolors.dpatch 13 Oct 2003 01:05:52 -0000 1.1
+++ 91_enh_menucolors.dpatch 9 Dec 2003 16:52:02 -0000 1.2
@@ -114,9 +114,9 @@
+#ifdef MENU_COLOR
+E boolean FDECL(add_menu_coloring, (char *));
+#endif
-
- /* ### pager.c ### */
-
+ #ifdef AUTOPICKUP_EXCEPTIONS
+ E int FDECL(add_autopickup_exception, (const char *));
+ E void NDECL(free_autopickup_exceptions);
diff -Nurd --exclude-from=diff_ignore_files.txt nethack-3.4.2-orig/include/flag.h nethack-3.4.2-menucolor/include/flag.h
--- nethack-3.4.2-orig/include/flag.h 2003-08-30 03:07:17.000000000 +0300
+++ nethack-3.4.2-menucolor/include/flag.h 2003-09-04 21:06:26.000000000 +0300
--- 13_qt_warning_fixes.dpatch DELETED ---
--- 03_char_signedness.dpatch DELETED ---
--- 07_explore_mode_save.dpatch DELETED ---