[nethack] 01/01: Imported Debian patch 3.2.3-3
James Cowgill
jcowgill-guest at moszumanska.debian.org
Mon Mar 7 17:53:05 UTC 2016
This is an automated email from the git hooks/post-receive script.
jcowgill-guest pushed a commit to annotated tag debian/3.2.3-3
in repository nethack.
commit 8b3d746816aaae3227ee844ef3181f48ba096067
Merge: c68cbec 9969444
Author: Ben Gertzfield <che at debian.org>
Date: Tue Dec 28 23:12:01 1999 -0800
Imported Debian patch 3.2.3-3
README | 2 +-
dat/opthelp | 1 +
debian/NetHack.ad | 153 +++++++++++++++++++++++++++++++++++++++
debian/{readme => README.Debian} | 0
debian/changelog | 68 +++++++++++++++++
debian/conffiles | 3 +-
debian/control | 2 +-
debian/dirs | 8 ++
debian/nethackrc.x11 | 3 +-
debian/postinst | 24 +++++-
debian/postrm | 11 ++-
debian/preinst | 4 +
debian/rules | 118 +++++++++++++-----------------
debian/xnethack.6 | 1 +
debian/xnethack.sh | 5 ++
doc/Guidebook.mn | 3 +
doc/Guidebook.tex | 4 +
doc/Guidebook.txt | 4 +
include/flag.h | 1 +
include/patchlevel.h | 26 +++++--
include/system.h | 4 +
src/cmd.c | 17 ++++-
src/end.c | 16 +++-
src/hacklib.c | 35 ++++++++-
src/mail.c | 7 +-
src/mkmaze.c | 5 +-
src/music.c | 2 +
src/options.c | 1 +
src/pager.c | 2 +-
src/pray.c | 3 +-
src/sp_lev.c | 23 +++++-
src/topten.c | 52 +++++--------
src/trap.c | 3 +
src/version.c | 26 ++++---
sys/mac/macwin.c | 4 +
sys/msdos/Makefile.GCC | 2 +-
win/tty/termcap.c | 5 +-
37 files changed, 509 insertions(+), 139 deletions(-)
diff --cc dat/opthelp
index a9cb0fe,a9cb0fe..6cd6f95
--- a/dat/opthelp
+++ b/dat/opthelp
@@@ -15,6 -15,6 +15,7 @@@ null allow nulls to be sent t
try turning this option off (forcing NetHack to use its own
delay code) if moving objects seem to teleport across rooms
number_pad use the number keys to move instead of yuhjklbn [FALSE]
++paranoid_quit ask for explicit 'yes' when quitting [FALSE]
perm_invent keep inventory in a permanent window [FALSE]
rest_on_space count the space bar as a rest character [FALSE]
safe_pet prevent you from (knowingly) attacking your pet(s) [TRUE]
diff --cc debian/NetHack.ad
index 0000000,0000000..6732999
new file mode 100644
--- /dev/null
+++ b/debian/NetHack.ad
@@@ -1,0 -1,0 +1,153 @@@
++! The display_file, tombstone, and menu windows are all formatted assuming
++! a fixed width font. Text windows may or may not be formatted as above.
++! The rip window applies if the GRAPHIC_TOMBSTONE option is turned on, and
++! requires a 12 pixel font for correct appearance.
++!
++NetHack*font: variable
++NetHack*display_file*font: fixed
++NetHack*tombstone*font: fixed
++NetHack*rip*font: -*-times-medium-r-*-*-12-*-*-*-*-*-*-*
++NetHack*menu*font: fixed
++!NetHack*text*font: fixed
++NetHack*map*font: nh10
++
++! To use full-color tiles for the map, uncomment the tile file name.
++! If you use a 100dpi (or greater) monitor you may wish to double the
++! tile size so you can see the figures. If NetHack was compiled to
++! use XPM (USE_XPM in config.h), the tile_file is a standard XPM file.
++! Otherwise, it is a custom format. double_tile_size only applies to
++! the custom format - to enlarge an XPM file, use processing tools
++! such as XV or preferably PBMplus.
++!
++NetHack.tile_file: x11tiles
++NetHack.double_tile_size: True
++!
++! The annotation of pets.
++NetHack.pet_mark_bitmap: pet_mark.xbm
++NetHack.pet_mark_color: Red
++
++! Tombstone
++! The image file
++NetHack.tombstone: rip.xpm
++! Text starts at (tombtext_x, tombtext_y) and subsequent lines
++! are displaced by (tombtext_dx, tombtext_dy) pixels. If you
++NetHack.tombtext_x: 155
++NetHack.tombtext_y: 78
++NetHack.tombtext_dx: 0
++NetHack.tombtext_dy: 13
++! The color to use for the text on the hero's tombstone
++NetHack*rip*foreground: black
++
++! Translation tables. There are currently several actions in nethack, but
++! the only one you should be using is "input()", which, with no parameters,
++! uses XLookupString to translate your keypress into a command. You
++! can optionally give it parameters to change the behavior, see the example
++! below. Note that you have to specify the translations in every appropriate
++! window.
++NetHack*message*translations: <KeyPress>: input()
++!
++! Example extra translations for the map window.
++!
++!NetHack*map*translations: #override \
++! !<Key>Left: input(h) \n\
++! !<Key>Right: input(l) \n\
++! !<Key>Up: input(k) \n\
++! !<Key>Down: input(j)
++!
++! The icon to use; supported values are nh72, nh56, and nh32; nh72 is the
++! default. Some window managers may not support the larger icon sizes.
++! It is not guaranteed that the window manager will honor the icon selection.
++!NetHack*icon: nh56
++!
++! If True, a popup for y/n questions is _not_ used.
++NetHack*slow: True
++!
++! The number of lines the message window will show without scrolling.
++NetHack*message_lines: 12
++!
++! If True, the message window has a line that seperates old and new messages.
++NetHack*message_line: True
++!
++! If True, force keyboard to attach to popup windows. Some window managers
++! enforce a click-to-focus-keyboard policy (e.g. the DECwindows wm). NetHack
++! has a lot of popups and is almost unplayable without some kind of autofocus.
++NetHack*autofocus: True
++!
++! Specify the number of rows and columns of the map window. The default
++! is the standard 80x21 window. Note: this _does_not_ change nethack's
++! level size, only what you see of it.
++NetHack*map*rows: 21
++NetHack*map*columns: 80
++
++! Parts of the fancy status display.
++!
++NetHack*status_condition.borderWidth: 0
++NetHack*status_info*borderWidth: 0
++
++! Sample color screen entries.
++!
++NetHack*nethack.background: wheat
++NetHack*map*yellow: gold
++NetHack*map*brown: tan
++NetHack*map*gray: grey85
++NetHack*map*foreground: wheat
++NetHack*map*background: grey40
++
++NetHack*fancy_status.skipAdjust: True
++NetHack*fancy_status.background: wheat
++NetHack*status_info*foreground: Sienna
++NetHack*status_info*background: wheat
++NetHack*status_info.background: wheat
++NetHack*status_attributes*foreground: black
++NetHack*status_attributes*background: white
++NetHack*status_condition*foreground: red
++NetHack*status_condition*background: wheat
++NetHack*Scrollbar*foreground: Sienna
++NetHack*Scrollbar*background: wheat
++NetHack*status_info*showGrip: False
++NetHack*status_attributes*showGrip: False
++
++NetHack*player_selection*random.borderColor: blue
++NetHack*player_selection*random.borderWidth: 2
++NetHack*player_selection*random.foreground: blue
++NetHack*player_selection*random.accelerators: #override\n\
++ <Key>Return: set() notify() unset()
++NetHack*player_selection*quit.borderColor: blue
++NetHack*player_selection*quit.foreground: blue
++NetHack*player_selection*Command.borderColor: red
++NetHack*player_selection*Command.foreground: red
++NetHack*player_selection*quit.accelerators: #override\n\
++ <Key>Escape: set() notify() unset()
++
++NetHack*extended_commands*dismiss.borderColor: blue
++NetHack*extended_commands*dismiss.foreground: blue
++NetHack*extended_commands*help.borderColor: blue
++NetHack*extended_commands*help.foreground: blue
++NetHack*extended_commands*Command.borderColor: red
++NetHack*extended_commands*Command.foreground: red
++NetHack*extended_commands*help.accelerators: #override\n\
++ :<Key>?: set() notify() unset()
++NetHack*extended_commands*dismiss.accelerators: #override\n\
++ <Key>Escape: set() notify() unset()
++!
++!
++! The following are the default 15 colors that the nethack map uses.
++! If they don't look good on your screen, change them.
++!
++! The foreground color is used as "no color".
++!
++!NetHack*map*black: black
++!NetHack*map*red: red
++!NetHack*map*green: pale green
++!NetHack*map*brown: brown
++!NetHack*map*blue: blue
++!NetHack*map*magenta: magenta
++!NetHack*map*cyan: light cyan
++!NetHack*map*gray: gray
++!NetHack*map*orange: orange
++!NetHack*map*bright_green: green
++!NetHack*map*yellow: yellow
++!NetHack*map*bright_blue: royal blue
++!NetHack*map*bright_magenta: violet
++!NetHack*map*bright_cyan: cyan
++!NetHack*map*white: white
diff --cc debian/README.Debian
index 90c7ad9,0000000..90c7ad9
mode 100644,000000..100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
diff --cc debian/changelog
index c5358a8,0000000..a93cc15
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,130 -1,0 +1,198 @@@
++nethack (3.2.3-3) stable; urgency=low
++
++ * Make sure we chmod +x nethack.6 as we aren't using dh_installmanpages
++ (Closes: #53668)
++
++ -- Ben Gertzfield <che at debian.org> Tue, 28 Dec 1999 23:12:01 -0800
++
++nethack (3.2.3-2) stable; urgency=low
++
++ * Don't use dh_installmanpages/dh_installdocs because there's
++ no way to force them not to install into /usr/share/doc and
++ /usr/share/man for slink..
++
++ -- Ben Gertzfield <che at debian.org> Mon, 20 Dec 1999 09:34:50 -0800
++
++nethack (3.2.3-1) stable; urgency=HIGH
++
++ * This may be more acceptable for a stable update. It includes
++ only Y2K and critical bug fixes. (Closes: #52730)
++
++ -- Ben Gertzfield <che at debian.org> Tue, 14 Dec 1999 15:56:44 -0800
++
++nethack (3.2.2-16) unstable; urgency=low
++
++ * Use Richard Braakman's wonderful patch to fix color support in
++ Nethack with ncurses 4.2. (Fixes: #27817)
++ * Use Hartmut Koptein's patch for glibc 2.1 prototypes checking.
++ (Fixes: #32012)
++
++ -- Ben Gertzfield <che at debian.org> Thu, 21 Jan 1999 07:00:41 -0800
++
++nethack (3.2.2-15) frozen unstable; urgency=low
++
++ * Recompile with ncurses 4.2.
++
++ -- Ben Gertzfield <che at debian.org> Fri, 30 Oct 1998 12:38:12 -0800
++
++nethack (3.2.2-14) unstable; urgency=low
++
++ * Add test in preinst to make sure we don't check $2 on anything
++ but an upgrade, as dpkg can call the preinst with no $2 if
++ we're doing a fresh install, and that'll make my test to see
++ what version we're upgrading from crash. (Fixes: #27101)
++
++ -- Ben Gertzfield <che at debian.org> Sat, 26 Sep 1998 10:57:36 -0700
++
++nethack (3.2.2-13) unstable; urgency=low
++
++ * Applied David Damerell's paranoid_quit and big top 10 patches.
++ (Fixes: #26609)
++
++ -- Ben Gertzfield <che at debian.org> Mon, 21 Sep 1998 19:30:22 -0700
++
++nethack (3.2.2-12) unstable; urgency=low
++
++ * Made postinst really anal on checks for upgrades from old versions,
++ to make all permissions correct. (Fixes: #25881, #19588)
++ * Converted debian/rules to debhelper. (Fixes: #14492)
++ * /var/lib/games/nethack/{record,logfile,perm} are no longer conffiles,
++ and the management of them has moved to the postinst/postrm scripts.
++ * Enabled tiles by default when running with X enhancements.
++ * Created xnethack script to run the X-based nethack.
++ * Disabled the mail daemon mail-check in X-based nethack, as it
++ could cause nethack to freeze if run from the menu entry (as
++ opposed to from within an xterm).
++
++ -- Ben Gertzfield <che at debian.org> Tue, 18 Aug 1998 17:10:16 -0700
++
+nethack (3.2.2-11) unstable; urgency=low
+
+ * Hamm release of 3.2.2-10.
+
+ -- Ben Gertzfield <che at debian.org> Tue, 28 Oct 1997 17:38:11 -0800
+
+nethack (3.2.2-10) stable; urgency=low
+
+ * Re-built with libc5 libraries, as 3.2.2-7 was broken.
+ * Fixed text menu entry pausing bug.
+ * Took out dpkg-shlibdeps call for the lib5 build.
+ * Changed chmod /var/lib/games/nethack 04775 in postinst to 02775.
+
+ -- Ben Gertzfield <che at debian.org> Tue, 28 Oct 1997 12:53:37 -0800
+
+nethack (3.2.2-9) unstable; urgency=low
+
+ * Re-added fix for permissions on /var/lib/games/nethack to postinst;
+ fixes bug #13596.
+ * Added X NetHack entry to menu file, fixes wishlist #13036.
+ * Menu entry for text NetHack now pauses after the game ends, fixes
+ bug #13035.
+ * Built with all-glibc libraries, fixes bug #12793.
+ * Copied 'license' text-file to /usr/lib/games/nethack, fixes bug #13033.
+ * Upgraded to Standards-Version 2.3.0.0.
+
+ -- Ben Gertzfield <che at debian.org> Fri, 10 Oct 1997 16:17:46 -0700
+
+nethack (3.2.2-8) unstable; urgency=low
+
+ * New maintainer.
+ * Compiled under libc6.
+ * Added patch for proper IBM graphics support.
+ * Added patch for sound (speaker) support at the console.
+ * No longer writes to /usr/lib/games/nethack; fixes bug #10454.
+ * No longer uses i386-specific commands in makefile; fixes bug #10795.
+ * Re-added dgn_comp and lev_comp to package; fixes bug #11013.
+ * Created /etc/rc.boot/nethack to recover save-files on boot;
+ fixes bug #11012.
+ * Changed rules file to no longer use debstd.
+ * Made the recover utility setgid and removed the -d option to
+ prevent cheating.
+ * Really fixed bug #10149 -- both logfile and record are now
+ conffiles.
+ * If upgrading from a version with incompatible logfile/record files,
+ warns before clearing out /var/lib/games/nethack.
+
+ -- Ben Gertzfield <che at debian.org> Wed, 23 Jul 1997 20:33:26 -0500
+
+nethack (3.2.2-7) frozen unstable; urgency=low
+
+ * changes to makefile to force compiling under libc5
+ * fixed bug #10149: upgrading no longer kills the high score file
+ * fixed bug #9839: now provides nh10 font
+
+ -- Paul Haggart <phaggart at debian.org> Mon, 26 May 1997 22:34:36 -0400
+
+nethack (3.2.2-6) frozen unstable; urgency=low
+
+ * routine cleanup of makefiles
+ * fixed debian/rules to actually clean up on 'debian/rules clean'
+ * fixed bug #9288: debian/rules doesn't delete manpages until after build
+ * fixed bug #9287: X11 support added
+
+ -- Paul Haggart <phaggart at debian.org> Thu, 1 May 1997 19:32:57 -0400
+
+nethack (3.2.2-5) frozen unstable; urgency=low
+
+ * postinst tweak to allow saved games to actually save
+
+ -- Paul Haggart <phaggart at debian.org> Wed, 23 Apr 1997 22:55:20 -0400
+
+nethack (3.2.2-4) frozen unstable; urgency=low
+
+ * added postinst to fix bad permissions/owners on upgrades
+ * fixed termcap/terminfo bug
+
+ -- Paul Haggart <phaggart at debian.org> Tue, 8 Apr 1997 22:35:44 -0400
+
+nethack (3.2.2-3) unstable; urgency=high
+
+ * fixed -massive- error with lockfiles
+ * fixed gzip error with saved games
+ * now includes 'recovery' so you can try to restore a crashed game
+
+ -- Paul Haggart <phaggart at debian.org> Sat, 15 Feb 1997 18:43:48 -0500
+
+nethack (3.2.2-2) unstable; urgency=low
+
+ * changed email address from 'debian.com' to 'debian.org'
+
+ -- Paul Haggart <phaggart at debian.org> Wed, 12 Feb 1997 15:55:33 -0500
+
+nethack (3.2.2-1) unstable; urgency=low
+
+ * new upstream source (sorry this took so long to get done!)
+ * wizard patch removed .. it wouldn't patch into 3.2.2
+
+ -- Paul Haggart <phaggart at debian.com> Mon, 10 Feb 1997 22:08:09 -0500
+
+nethack (3.2.1-4) unstable; urgency=low
+
+ * removed qt interface because of policy complaints
+
+ -- Paul Haggart <phaggart at cybertap.com> Mon, 2 Dec 1996 15:08:15 -0500
+
+nethack (3.2.1-3) unstable; urgency=low
+
+ * added wizard patch
+
+ -- Paul Haggart <phaggart at cybertap.com> Mon, 18 Nov 1996 19:12:24 -0500
+
+nethack (3.2.1-2) unstable; urgency=low
+
+ * added qt interface
+ * added spoiler files
+
+ -- Paul Haggart <phaggart at cybertap.com> Sat, 16 Nov 1996 02:22:05 -0500
+
+nethack (3.2.1-1) unstable; urgency=low
+
+ * New maintainer
+ * Initial release
+
+ -- Paul Haggart <phaggart at cybertap.com> Sun, 27 Oct 1996 05:56:48 -0500
+
+Local variables:
+add-log-mailing-address: "che at debian.org"
+mode: debian-changelog
+End:
diff --cc debian/conffiles
index 1d072db,0000000..35ac0a7
mode 100644,000000..100644
--- a/debian/conffiles
+++ b/debian/conffiles
@@@ -1,2 -1,0 +1,1 @@@
- /var/lib/games/nethack/logfile
- /var/lib/games/nethack/record
++/etc/nethackrc.x11
diff --cc debian/control
index 1cdbe40,0000000..6f4c8f4
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,27 -1,0 +1,27 @@@
+Source: nethack
+Section: games
+Priority: optional
+Maintainer: Ben Gertzfield <che at debian.org>
- Standards-Version: 2.3.0.0
++Standards-Version: 2.4.0.0
+
+Package: nethack
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: Text-based/X11 overhead view D&D-style adventure game
+ Nethack is a wonderfully silly, yet quite addicting, Dungeons and
+ Dragons-style adventure game. You play the part of a fierce fighter,
+ wizard, or any of many other classes, fighting your way down to
+ retrieve the Amulet of Yendor (try saying THAT one backwards!) for
+ your god. On the way, you might encounter a quantum mechanic or two,
+ or perhaps a microscopic space fleet, or -- if you're REALLY lucky --
+ the Ravenous Bugblatter Beast of Traal.
+ .
+ The Debian package of Nethack includes spoiler files, to be read only
+ in sheer desperation, in /usr/doc/nethack/spoilers.
+ .
+ A few utilities -- recover, for retrieving your auto-save files in case
+ of a power failure, and dgn_comp and lev_comp, two utilities for making
+ your own Nethack levels and dungeons, have been included in
+ /usr/lib/games/nethack. 'recover' will be run every time your system
+ boots, if there are any auto-save files available.
+
diff --cc debian/dirs
index 0000000,0000000..0d8abc7
new file mode 100644
--- /dev/null
+++ b/debian/dirs
@@@ -1,0 -1,0 +1,8 @@@
++usr/games
++usr/X11R6/lib/X11/app-defaults
++usr/X11R6/lib/X11/fonts/misc
++usr/lib/games/nethack
++var/lib/games/nethack/save
++etc/rc.boot
++usr/man/man6
++usr/doc/nethack
diff --cc debian/nethackrc.x11
index b079038,0000000..41231a9
mode 100644,000000..100644
--- a/debian/nethackrc.x11
+++ b/debian/nethackrc.x11
@@@ -1,71 -1,0 +1,72 @@@
+#
+# System-wide NetHack configuration file for X-based NetHack.
+#
+
+OPTIONS=windowtype:x11,toptenwin,hilite_pet
- OPTIONS=fixinv,safe_pet,sortpack,tombstone
++OPTIONS=fixinv,safe_pet,sortpack,tombstone,color
+OPTIONS=verbose,news,fruit:yiffmelon
+OPTIONS=dogname:Kitsune
+OPTIONS=catname:Neko-chan
+OPTIONS=pickup_types:$
++OPTIONS=nomail
+
+#
+# There are 17 object symbols and various graphics symbols.
+# The descriptions of these symbols can be found in dat/opthelp.
+#
+#
+# Font: nh10 (10x20)
+#
+OBJECTS= 180 183 188 192 181 184 182 189 190 196 \
+ 191 194 193 187 185 186 195
+#
+DUNGEON= 032 025 018 013 012 014 011 015 023 024 \
+ 022 021 128 129 130 131 132 133 134 135 \
+ 136 137 145 146 144 143 142 141 140 149 \
+ 150 031 031 147 148 031 161 140
+#
+TRAPS= 138 138 138 138 138 138 138 138 138 138 \
+ 138 138 138 138 138 139 138 138 138 138 \
+ 138 138
+#
+EFFECTS= 151 152 153 154 155 156 157 158 \
+ 159 160 161 162 \
+ 163 164 165 166 167 168 169 170 \
+ 171 172 173 174 175 176 177 178 179
+#
+#
+# Font: ibm (8x14)
+#
+#OBJECTS= 207 210 215 219 208 211 209 216 217 223 \
+# 218 221 220 214 212 213 222
+#
+#DUNGEON= 032 128 129 130 131 132 133 134 135 136 \
+# 137 138 139 045 124 142 143 144 145 146 \
+# 147 148 155 156 227 154 153 152 151 159 \
+# 160 200 200 157 158 250 170 151
+#
+#TRAPS= 149 149 149 149 149 149 149 149 149 149 \
+# 149 149 149 149 149 150 149 149 149 149 \
+# 149 149
+#
+#EFFECTS= 161 162 163 164 165 166 167 168 \
+# 169 170 171 172 \
+# 173 174 175 176 177 178 179 180 \
+# 181 182 183 184 185 186 187 188 189
+#
+#
+# Font: a "standard" font like 6x13
+#
+#DUNGEON = 032 025 018 013 012 014 011 015 023 024 \
+# 022 021 031 045 124 043 043 031 035 001 \
+# 060 062 060 062 019 092 035 123 125 031 \
+# 125 046 046 035 035 046 127 125
+#
+#TRAPS= 094 094 094 094 094 094 094 094 094 094 \
+# 094 094 094 094 094 002 094 094 094 094 \
+# 094 094
+#
+#EFFECTS= 124 045 092 047 042 033 041 040 \
+# 048 035 064 042 \
+# 047 045 092 124 124 092 045 047 \
+# 047 064 092 064 064 064 092 064 047
diff --cc debian/postinst
index 1faecea,0000000..a5c3c87
mode 100644,000000..100644
--- a/debian/postinst
+++ b/debian/postinst
@@@ -1,18 -1,0 +1,38 @@@
+#!/bin/sh
+
+# Nethack post-installation script for Debian
+#
+# Ben Gertzfield (che at debian.org) 29 July 1997
+# Copyright 1997 Ben Gertzfield. This script is released under the
+# GNU General Public License, version 2 or later.
+
+# Modified 10 October 1997 to fix permissions on /var/lib/games/nethack.
++# Modified 18 August 1998 to fix more upgrade problems from ancient
++# nethacks
+
+set -e
+
- chmod 02775 /var/lib/games/nethack
++# This is super anal. It should work for all cases, for all upgrades.
++
++find /var/lib/games/nethack -print0 | xargs -r -0 chgrp games
++
++chmod 02775 /var/lib/games/nethack/
++
++find /var/lib/games/nethack -type f -print0 | xargs -r -0 chmod 664
++find /var/lib/games/nethack -type f -name '*lock*' -print0 | xargs -r -0 chmod 660
++
++chmod 02775 /var/lib/games/nethack/save/
++
++find /var/lib/games/nethack/save -type f -print0 | xargs -r -0 chmod 660
++
++# These have been moved to the postinst per policy; they should not be
++# conffiles. They are removed on purge in the postrm.
++
++touch /var/lib/games/nethack/{perm,record,logfile}
++chown root.games /var/lib/games/nethack/{perm,record,logfile}
++chmod 0664 /var/lib/games/nethack/{perm,record,logfile}
+
+if [ -x /usr/X11R6/bin/mkfontdir ] ; then /usr/X11R6/bin/mkfontdir \
+ /usr/X11R6/lib/X11/fonts/misc ; fi
+
- if [ -x /usr/bin/update-menus ] ; then /usr/bin/update-menus ; fi
++#DEBHELPER#
diff --cc debian/postrm
index ac7bdab,0000000..e830260
mode 100644,000000..100644
--- a/debian/postrm
+++ b/debian/postrm
@@@ -1,14 -1,0 +1,23 @@@
+#!/bin/sh
+
+# Nethack post-remove script for Debian
+#
+# Ben Gertzfield (che at debian.org) 29 July 1997
+# Copyright 1997 Ben Gertzfield. This script is released under the
+# GNU General Public License, version 2 or later.
+
++# Updated 18 August 1998 to rm -rf the score/save directory on a purge,
++# added debhelper comments
++
+set -e
+
+if [ -x /usr/X11R6/bin/mkfontdir ] ; then /usr/X11R6/bin/mkfontdir \
+ /usr/X11R6/lib/X11/fonts/misc ; fi
+
- if [ -x /usr/bin/update-menus ] ; then /usr/bin/update-menus ; fi
++if [ "$1" = "purge" ]; then
++ echo -n "Purging high-scores and save-files for Nethack... "
++ rm -rf /var/lib/games/nethack/
++ echo "done."
++fi
++
++#DEBHELPER#
diff --cc debian/preinst
index 2005536,0000000..7daf5d3
mode 100644,000000..100644
--- a/debian/preinst
+++ b/debian/preinst
@@@ -1,34 -1,0 +1,38 @@@
+#!/bin/sh
+
+# Nethack pre-installation script for Debian
+#
+# Ben Gertzfield (che at debian.org) 29 July 1997
+# Copyright 1997 Ben Gertzfield. This script is released under the
+# GNU General Public License, version 2 or later.
+
+set -e
+
++if [ $1 != "configure" ] ; then
++ exit 0
++fi
++
+dpkg --compare-versions $2 lt-nl 3.2.2 || exit 0
+
+cat <<EOF
+You seem to have a version of Nethack prior to this package's version,
+which is 3.2.2. Unfortunately, the save files and high scores that
+older versions used are incompatible with this version, and will be
+cleared if you continue installing this package.
+
+If you want to save these, back up /var/lib/games/nethack now!
+
+EOF
+
+echo -n "Do you want to continue? (Y/n) "
+read answer
+
+if [ "$answer" = "n" -o "$answer" = "N" ] ; then
+ echo "Aborting installation of Nethack."
+ exit 1
+else
+ echo "Removing old save files and high scores.."
+ rm -rf /var/lib/games/nethack
+fi
+
+
diff --cc debian/rules
index 377dc8d,0000000..7e17b09
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,126 -1,0 +1,110 @@@
+#!/usr/bin/make -f
+
+# Nethack build script for Debian
+#
+# Ben Gertzfield (che at debian.org) 29 July 1997
+# Copyright 1997 Ben Gertzfield. This script is released under the
+# GNU General Public License, version 2 or later.
+
- build:
- $(checkdir)
++build: build-stamp
++build-stamp:
++ dh_testdir
++
+ make all CFLAGS='-DDEBIAN -O2 -I../include \
+ -I/usr/X11R6/include -fomit-frame-pointer'
- touch build
++
+ cd util && make recover CFLAGS='-DDEBIAN -O2 -I../include \
+ -I/usr/X11R6/include -fomit-frame-pointer'
+
++ touch build-stamp
++
+clean:
- $(checkdir)
- -rm -f build nh10.pcf
++ dh_testdir
++ dh_testroot
++ -rm -f build-stamp nh10.pcf
+ -rm -f `find . -name "*.orig"`
+ -rm -f `find . -name "*~"`
+ -rm -rf debian/tmp debian/files* core debian/substvars
+ -make spotless
++ dh_clean
+
- binary-indep: checkroot build
- $(checkdir)
-
- binary-arch: checkroot build
- $(checkdir)
- install -d debian/tmp/usr/games
- install -d debian/tmp/usr/X11R6/lib/X11/app-defaults
- install -d debian/tmp/usr/X11R6/lib/X11/fonts/misc
- install -d -m 755 -o root -g games \
- debian/tmp/usr/lib/games/nethack
- install -d -m 2775 -o root -g games \
- debian/tmp/var/lib/games/nethack
- install -d -m 2775 -o root -g games \
- debian/tmp/var/lib/games/nethack/save
- install -d debian/tmp/usr/man/man6
- install -d debian/tmp/usr/lib/menu
- install -d debian/tmp/etc/rc.boot
- install -d debian/tmp/DEBIAN
- install -d debian/tmp/usr/doc/nethack
++binary-indep: build
++# Nothing to do by default
++
++binary-arch: build
++ dh_testdir
++ dh_testroot
++ dh_clean -k
++ dh_installdirs
++ chgrp games debian/tmp/usr/lib/games/nethack
++ chgrp -R games debian/tmp/var/lib/games/nethack
++ chmod -R 02775 debian/tmp/var/lib/games/nethack
+
+ install -m 0644 -o root -g root \
+ dat/{nhdat,x11tiles,pet_mark.xbm,rip.xpm,license} \
+ debian/tmp/usr/lib/games/nethack
+
+ install -m 0755 -o root -g games \
+ debian/nethack.sh debian/tmp/usr/games/nethack
+
++ install -m 0755 -o root -g games \
++ debian/xnethack.sh debian/tmp/usr/games/xnethack
++
+ install -m 2755 -o root -g games src/nethack \
+ debian/tmp/usr/lib/games/nethack/
-
- touch debian/tmp/var/lib/games/nethack/{perm,record,logfile}
- chown root.games debian/tmp/var/lib/games/nethack/{perm,record,logfile}
- chmod 0664 debian/tmp/var/lib/games/nethack/{perm,record,logfile}
-
++
+ # build the recover prog, and move it where it's supposed to be
+ install -o root -g games -m 2755 util/recover \
+ debian/tmp/usr/lib/games/nethack/recover
+
+ # install the dgn_comp and lev_comp programs
+ install -o root -g games -m 755 util/dgn_comp \
+ debian/tmp/usr/lib/games/nethack/dgn_comp
+
+ install -o root -g games -m 755 util/lev_comp \
+ debian/tmp/usr/lib/games/nethack/lev_comp
+
+ # install X11 stuff
- install -m 644 win/X11/NetHack.ad debian/tmp/usr/X11R6/lib/X11/app-defaults/NetHack
++ install -m 644 debian/NetHack.ad debian/tmp/usr/X11R6/lib/X11/app-defaults/NetHack
+ /usr/X11R6/bin/bdftopcf -o nh10.pcf win/X11/nh10.bdf
+ install -m 644 nh10.pcf debian/tmp/usr/X11R6/lib/X11/fonts/misc/
++ gzip debian/tmp/usr/X11R6/lib/X11/fonts/misc/nh10.pcf
+
+ # extract spoilers
+ uudecode -o /dev/stdout debian/spoilers.tar.uu | tar xf - -C debian/tmp/usr/doc/nethack
+
- # man pages
- install -m 644 -o root -g root doc/*.6 debian/tmp/usr/man/man6
-
- install -m 644 -o root -g root doc/Guidebook \
- debian/tmp/usr/doc/nethack
-
- install -m 644 -o root -g root debian/readme \
- debian/tmp/usr/doc/nethack/README.debian
-
+ # init.d script
+ install -m 755 -o root -g root debian/nethack.init \
+ debian/tmp/etc/rc.boot/nethack
+
+ # system-wide X nethack.rc file, thanks again joey :)
+ install -m 644 -o root -g root debian/nethackrc.x11 \
+ debian/tmp/etc/nethackrc.x11
-
- install -m 755 -o root -g root debian/postinst debian/tmp/DEBIAN
- install -m 755 -o root -g root debian/postrm debian/tmp/DEBIAN
- install -m 644 -o root -g root debian/conffiles debian/tmp/DEBIAN
- install -m 644 -o root -g root debian/changelog \
- debian/tmp/usr/doc/nethack/changelog.Debian
- install -m 644 -o root -g root debian/menu \
- debian/tmp/usr/lib/menu/nethack
- install -m 644 -o root -g root debian/copyright \
- debian/tmp/usr/doc/nethack/copyright
-
- -find debian/tmp/usr/{doc,man} -type f -not -name '*.gz' | \
- xargs gzip -9f
- dpkg-shlibdeps debian/tmp/usr/lib/games/nethack/{nethack,recover}
- dpkg-gencontrol -pnethack
- dpkg --build debian/tmp ..
-
- define checkdir
- test -f debian/rules
- endef
-
- # Below here is fairly generic really
-
- binary: binary-indep binary-arch
++
++ #dh_installdocs doc/Guidebook
++ cp debian/README.Debian debian/tmp/usr/doc/nethack
++ cp debian/copyright debian/tmp/usr/doc/nethack
++ cp doc/Guidebook debian/tmp/usr/doc/nethack
++ cp debian/changelog debian/tmp/usr/doc/nethack
++ dh_installmenu
++ # no can do; broken for slink
++ # dh_installmanpages sys/unix/spkr.7
++ cp doc/*.6 debian/tmp/usr/man/man6
++ cp debian/*.6 debian/tmp/usr/man/man6
++ # dh_installchangelogs
++ dh_strip
++ dh_compress
++ dh_fixperms -Xnethack
++ chmod 644 debian/tmp/usr/man/man6/nethack.6.gz
++ dh_installdeb
++ dh_shlibdeps
++ dh_gencontrol
++ dh_md5sums
++ dh_builddeb
+
+source diff:
+ @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
+
- checkroot:
- $(checkdir)
- test root = "`whoami`"
++binary: binary-indep binary-arch
++.PHONY: build clean binary-indep binary-arch binary
+
- .PHONY: binary binary-arch binary-indep clean checkroot
diff --cc debian/xnethack.6
index 0000000,0000000..d4952e6
new file mode 100644
--- /dev/null
+++ b/debian/xnethack.6
@@@ -1,0 -1,0 +1,1 @@@
++.so man6/nethack.6
diff --cc debian/xnethack.sh
index 0000000,0000000..2d4b1fb
new file mode 100644
--- /dev/null
+++ b/debian/xnethack.sh
@@@ -1,0 -1,0 +1,5 @@@
++#!/bin/sh
++
++set -e
++
++NETHACKOPTIONS=/etc/nethackrc.x11 /usr/games/nethack
diff --cc doc/Guidebook.mn
index 3ccd2b1,3ccd2b1..33c574b
--- a/doc/Guidebook.mn
+++ b/doc/Guidebook.mn
@@@ -1355,6 -1355,6 +1355,9 @@@ Cannot be set with the `O' command
Specify the order to list object types in (default ``\e")[%?+/=!(*`0_'').
The value of this option should be a string containing the
symbols for the various object types.
++.lp paranoid_quit
++If true, asks you to type the word ``yes'' when quitting or entering
++Explore mode, not just the letter ``y''.
.lp perm_invent
If true, always display your current inventory in a window. This only
makes sense for windowing system interfaces that implement this feature.
diff --cc doc/Guidebook.tex
index 235c33c,235c33c..21e6c12
--- a/doc/Guidebook.tex
+++ b/doc/Guidebook.tex
@@@ -1702,6 -1702,6 +1702,10 @@@ Specify the order to list object types
``\verb&\")[\%?+/=!(*`0_&''). The value of this option should be a string
containing the symbols for the various object types.
%.lp
++\item[\ib{paranoid\_quit}]
++If true, asks you to type the word ``yes'' when quitting or entering
++Explore mode, not just the letter ``y''.
++%.lp
\item[\ib{perm\_invent}]
If true, always display your current inventory in a window. This only
makes sense for windowing system interfaces that implement this feature.
diff --cc doc/Guidebook.txt
index 8cc9336,8cc9336..da37382
--- a/doc/Guidebook.txt
+++ b/doc/Guidebook.txt
@@@ -1738,6 -1738,6 +1738,10 @@@
``\")[%?+/=!(*`0_''). The value of this option should be a
string containing the symbols for the various object types.
++ paranoid_quit
++ If true, asks you to type the word ``yes'' when quitting or
++ entering Explore mode, not just the letter ``y''.
++
perm_invent
If true, always display your current inventory in a window.
This only makes sense for windowing system interfaces that
diff --cc include/flag.h
index 7cabf34,7cabf34..3dd9a81
--- a/include/flag.h
+++ b/include/flag.h
@@@ -54,6 -54,6 +54,7 @@@ struct flag
boolean nap; /* `timed_delay' option for display effects */
boolean nopick; /* do not pickup objects (as when running) */
boolean null; /* OK to send nulls to the terminal */
++ boolean paranoid_quit; /* Ask for a 'yes' (not 'y') when quitting */
#ifdef MAC
boolean page_wait; /* put up a --More-- after a page of messages */
#endif
diff --cc include/system.h
index a515be6,a515be6..dc760b9
--- a/include/system.h
+++ b/include/system.h
@@@ -281,6 -281,6 +281,9 @@@ E int FDECL(system, (const char *))
E long NDECL(fork);
#endif
++
++#if (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1)
++#else
#if defined(SYSV) || defined(VMS) || defined(MAC) || defined(SUNOS4) || defined(POSIX_TYPES)
# if defined(NHSTDC) || defined(POSIX_TYPES) || (defined(VMS) && !defined(ANCIENT_VAXC))
# if !defined(_AIX32) && !(defined(SUNOS4) && defined(__STDC__))
@@@ -307,6 -307,6 +310,7 @@@ E void *FDECL(memcpy, (char *,char *,in
E void *FDECL(memset, (char*,int,int));
# endif
#endif
++#endif
#if defined(MICRO) && !defined(LATTICE)
# if defined(TOS) && defined(__GNUC__)
diff --cc src/cmd.c
index babba42,babba42..e6ae855
--- a/src/cmd.c
+++ b/src/cmd.c
@@@ -335,14 -335,14 +335,25 @@@ domonability(
STATIC_PTR int
enter_explore_mode()
{
++ char buf[BUFSZ];
++ int really_explore = FALSE;
++
if(!discover && !wizard) {
pline("Beware! From explore mode there will be no return to normal game.");
-- if (yn("Do you want to enter explore mode?") == 'y') {
++ if (flags.paranoid_quit) {
++ getlin ("Do you want to enter explore mode? [yes/no]",
++ buf);
++ (void) lcase(buf);
++ if (!(strcmp(buf, "yes"))) really_explore = TRUE;
++ } else if (yn("Do you want to enter explore mode?") == 'y') {
++ really_explore = TRUE;
++ }
++
++ if (really_explore == TRUE) {
clear_nhwindow(WIN_MESSAGE);
You("are now in non-scoring explore mode.");
discover = TRUE;
-- }
-- else {
++ } else {
clear_nhwindow(WIN_MESSAGE);
pline("Resuming normal game.");
}
diff --cc src/end.c
index 8166ae0,b1fe3fb..e95fb9d
--- a/src/end.c
+++ b/src/end.c
@@@ -98,7 -98,7 +98,18 @@@ int sig_unused
int
done2()
{
-- if(yn("Really quit?") == 'n') {
++ char buf[BUFSZ];
++ int really_quit = FALSE;
++
++ if (flags.paranoid_quit) {
++ getlin ("Really quit? [yes/no]", buf);
++ (void) lcase(buf);
++ if (strcmp(buf, "yes") == 0) really_quit = TRUE;
++ } else if (yn("Really quit?") == 'y') {
++ really_quit = TRUE;
++ }
++
++ if (really_quit == FALSE) {
#ifndef NO_SIGNAL
(void) signal(SIGINT, (SIG_RET_TYPE) done1);
#endif
diff --cc src/options.c
index 8e4e693,8e4e693..a6d95be
--- a/src/options.c
+++ b/src/options.c
@@@ -113,6 -113,6 +113,7 @@@ static struct Bool_Op
#endif
{"null", &flags.null, TRUE},
{"number_pad", &iflags.num_pad, FALSE},
++ {"paranoid_quit", &flags.paranoid_quit, FALSE},
#ifdef MAC
{"page_wait", &flags.page_wait, TRUE},
#else
diff --cc src/topten.c
index 1ee73eb,c799594..894f962
--- a/src/topten.c
+++ b/src/topten.c
@@@ -32,9 -32,9 +32,9 @@@ static long final_fpos
#define dealloc_ttentry(ttent) free((genericptr_t) (ttent))
#define NAMSZ 10
#define DTHSZ 60
--#define PERSMAX 3 /* entries per name/uid per char. allowed */
++#define PERSMAX 10 /* entries per name/uid per char. allowed */
#define POINTSMIN 1 /* must be > 0 */
--#define ENTRYMAX 100 /* must be >= 10 */
++#define ENTRYMAX 1000 /* must be >= 10 */
#if !defined(MICRO) && !defined(MAC)
#define PERS_IS_UID /* delete for PERSMAX per name; now per uid */
diff --cc win/tty/termcap.c
index 2a7aa38,db3579d..10b85b0
--- a/win/tty/termcap.c
+++ b/win/tty/termcap.c
@@@ -828,7 -827,7 +828,10 @@@ init_hilite(
hilites[c] = HI;
hilites[CLR_GRAY] = hilites[NO_COLOR] = (char *)0;
-- if (tgetnum("Co") < 8 || (setf = tgetstr("Sf", (char **)0)) == (char *)0)
++ if (tgetnum("Co") < 8)
++ return;
++ if ((setf = tgetstr("Sf", (char **)0)) == (char *)0
++ && (setf = tgetstr("AF", (char **)0)) == (char *)0)
return;
for (c = 0; c < CLR_MAX / 2; c++) {
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/nethack.git
More information about the Pkg-games-commits
mailing list