[nethack] 01/01: Imported Debian patch 3.4.3-11
James Cowgill
jcowgill-guest at moszumanska.debian.org
Mon Mar 7 17:53:30 UTC 2016
This is an automated email from the git hooks/post-receive script.
jcowgill-guest pushed a commit to annotated tag debian/3.4.3-11
in repository nethack.
commit 358159583b67e663db66b66968bd87a8a9df6f9b
Author: Joshua Kwan <joshk at triplehelix.org>
Date: Thu Sep 24 14:21:19 2009 -0700
Imported Debian patch 3.4.3-11
---
debian/README.source | 4 +
debian/changelog | 30 +++++++
debian/control | 2 +-
debian/nethack-common.postinst | 5 ++
debian/nethack-common.templates | 2 +-
debian/nethack-qt.desktop | 10 +++
debian/nethack-qt.install | 1 +
debian/nethack-x11.desktop | 10 +++
debian/nethack-x11.install | 1 +
debian/overrides/lintian/nethack-common | 8 +-
debian/overrides/lintian/nethack-console | 2 -
debian/overrides/lintian/nethack-gnome | 2 -
debian/overrides/lintian/nethack-lisp | 2 -
debian/overrides/lintian/nethack-qt | 2 -
debian/overrides/lintian/nethack-x11 | 2 -
debian/patches/04_manpage_paths.dpatch | 9 ++
debian/patches/12_lisp_windowing.dpatch | 136 +++++++++++++++++++++++++------
debian/patches/22_qt_savegame.dpatch | 8 ++
debian/po/cs.po | 59 ++++++++------
debian/po/vi.po | 101 ++++-------------------
debian/rules | 31 ++++---
21 files changed, 263 insertions(+), 164 deletions(-)
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..39a1b2d
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,4 @@
+To use this source package as intended, please install the dpatch package
+and read: /usr/share/doc/dpatch/README.source.gz
+
+ -- Joshua Kwan <joshk at triplehelix.org>
diff --git a/debian/changelog b/debian/changelog
index b244e94..3a6ec2c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,33 @@
+nethack (3.4.3-11) unstable; urgency=low
+
+ * Thanks for the NMUs, guys. There are so many bugs fixed as a result
+ of NMU I won't mention them here, but thanks to Christian Perrier for
+ managing everything. Certain things were fixed in 3.4.3-10.7 and have also
+ been marked as fixed prior to this upload.
+ * Apply translation updates:
+ - Vietnamese, thanks Clytie Siddall; closes: #548012
+ - Czech, thanks Jan Outrata; closes: #546453
+ * Update the nethack-lisp patch to the latest version. closes: #517437
+ (The new version is dated 2005-02-27.)
+ * Fix yet another incorrect path in the manpage. Thanks Iain. closes: #504925
+ * Disable nethack-common.init from 'stopping' when entering shutdown
+ runlevels. closes: #547471
+ * Change the default for making 'recover' setgid games to true. Thanks Iain.
+ closes: #504923, #405465
+ * Apply patch to give nethack-x11 and nethack-qt .desktop files. Thanks Iain.
+ closes: #504924
+ * Install dat/hh at /usr/lib/games/nethack/hh. I know this is a minor FHS
+ sin, but it is better than not having it at all right now. (Technically,
+ nhdat is a text file too!) closes: #425073
+ * Only install recover with gid games (since it may become setuid.) The
+ rest are installed with the root gid.
+ * Bump Standards-Version to 3.8.3.0.
+ * Clear out some outdated Lintian overrides.
+ * Make /var/games/nethack hierarchy setgid games (instead of merely owned
+ and writable by gid games.)
+
+ -- Joshua Kwan <joshk at triplehelix.org> Thu, 24 Sep 2009 14:21:19 -0700
+
nethack (3.4.3-10.7) unstable; urgency=low
* Non-maintainer upload to fix pending l10n issues.
diff --git a/debian/control b/debian/control
index 371cdbc..e1d6248 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: nethack
Section: games
Priority: optional
Maintainer: Joshua Kwan <joshk at triplehelix.org>
-Standards-Version: 3.7.2
+Standards-Version: 3.8.3.0
Build-Depends: flex, bison, groff-base, debhelper (>= 7), libx11-dev, libxt-dev, libxext-dev, libxmu-dev, bsdmainutils, libxaw7-dev | libxaw-dev, libncurses5-dev | libncurses-dev, libqt3-mt-dev (>= 3:3.3.4-7), dpatch, po-debconf, xfonts-utils
Package: nethack-common
diff --git a/debian/nethack-common.postinst b/debian/nethack-common.postinst
index 4bb60e6..bf9d614 100644
--- a/debian/nethack-common.postinst
+++ b/debian/nethack-common.postinst
@@ -60,6 +60,11 @@ if [ "$1" = "configure" ]; then
rm -f /etc/init.d/nethack
update-rc.d -f nethack remove
fi
+ if [ -f "/etc/rc0.d/K01nethack-common" ]; then
+ echo "Removing shutdown functionality for the nethack-common init script."
+ # dh_installinit takes care of the rest.
+ update-rc.d -f nethack-common remove
+ fi
fi
#DEBHELPER#
diff --git a/debian/nethack-common.templates b/debian/nethack-common.templates
index dd5a3cf..a7880ff 100644
--- a/debian/nethack-common.templates
+++ b/debian/nethack-common.templates
@@ -9,7 +9,7 @@
Template: nethack-common/recover-setgid
Type: boolean
-Default: false
+Default: true
_Description: Use setgid bit with NetHack's recover utility?
The "recover" program in the package nethack-common is traditionally
installed with the "setgid" bit set, so that all users can use it to
diff --git a/debian/nethack-qt.desktop b/debian/nethack-qt.desktop
new file mode 100644
index 0000000..227bf3d
--- /dev/null
+++ b/debian/nethack-qt.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Type=Application
+Encoding=UTF-8
+Name=Qt NetHack
+GenericName=NetHack (Qt interface)
+Comment=
+Icon=nethack
+Exec=/usr/games/nethack-qt
+Terminal=false
+Categories=Application;Game;AdventureGame;
diff --git a/debian/nethack-qt.install b/debian/nethack-qt.install
new file mode 100644
index 0000000..0c8932c
--- /dev/null
+++ b/debian/nethack-qt.install
@@ -0,0 +1 @@
+debian/nethack-qt.desktop usr/share/applications
diff --git a/debian/nethack-x11.desktop b/debian/nethack-x11.desktop
new file mode 100644
index 0000000..54919f0
--- /dev/null
+++ b/debian/nethack-x11.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Type=Application
+Encoding=UTF-8
+Name=X NetHack
+GenericName=NetHack (X interface)
+Comment=
+Icon=nethack
+Exec=/usr/games/xnethack
+Terminal=false
+Categories=Application;Game;AdventureGame;
diff --git a/debian/nethack-x11.install b/debian/nethack-x11.install
new file mode 100644
index 0000000..04aa3b2
--- /dev/null
+++ b/debian/nethack-x11.install
@@ -0,0 +1 @@
+debian/nethack-x11.desktop usr/share/applications
diff --git a/debian/overrides/lintian/nethack-common b/debian/overrides/lintian/nethack-common
index a8008ff..a70a908 100644
--- a/debian/overrides/lintian/nethack-common
+++ b/debian/overrides/lintian/nethack-common
@@ -1,8 +1,2 @@
-nethack-common: non-standard-executable-perm usr/lib/games/nethack/recover 0755 != 2755
-nethack-common: non-standard-executable-perm usr/lib/games/nethack/dgn_comp 0755 != 2755
-nethack-common: non-standard-executable-perm usr/lib/games/nethack/lev_comp 0755 != 2755
-nethack-common: non-standard-executable-perm usr/lib/games/nethack/dlb 0755 != 2755
-nethack-common: non-standard-dir-perm var/games/nethack/ 0775 != 0755
-nethack-common: non-standard-dir-perm var/games/nethack/save/ 0775 != 0755
-nethack-common: non-standard-dir-perm var/games/nethack/dumps/ 0775 != 0755
nethack-common: menu-command-not-in-package /usr/lib/menu/nethack-common:6 /usr/games/nethack
+nethack-common: non-standard-game-executable-perm usr/lib/games/nethack/recover 0755 != 2755
diff --git a/debian/overrides/lintian/nethack-console b/debian/overrides/lintian/nethack-console
index 086a068..19527c3 100644
--- a/debian/overrides/lintian/nethack-console
+++ b/debian/overrides/lintian/nethack-console
@@ -1,3 +1 @@
-nethack-console: non-standard-executable-perm usr/lib/games/nethack/nethack-console.sh 0755 != 2755
-nethack-console: non-standard-executable-perm usr/lib/games/nethack/nethack-console 0755 != 2755
nethack-console: menu-icon-missing /usr/share/pixmaps/nethack.xpm
diff --git a/debian/overrides/lintian/nethack-gnome b/debian/overrides/lintian/nethack-gnome
index f3e83c6..5ca9653 100644
--- a/debian/overrides/lintian/nethack-gnome
+++ b/debian/overrides/lintian/nethack-gnome
@@ -1,3 +1 @@
-nethack-gnome: non-standard-executable-perm usr/lib/games/nethack/nethack-gnome.sh 0755 != 2755
-nethack-gnome: non-standard-executable-perm usr/lib/games/nethack/nethack-gnome-tty.sh 0755 != 2755
nethack-gnome: menu-icon-missing /usr/share/pixmaps/nethack.xpm
diff --git a/debian/overrides/lintian/nethack-lisp b/debian/overrides/lintian/nethack-lisp
deleted file mode 100644
index d4a3829..0000000
--- a/debian/overrides/lintian/nethack-lisp
+++ /dev/null
@@ -1,2 +0,0 @@
-nethack-lisp: non-standard-executable-perm usr/lib/games/nethack/nethack-lisp.sh 0755 != 2755
-nethack-gnome: non-standard-executable-perm usr/lib/games/nethack/nethack-gnome.sh 0755 != 2755
diff --git a/debian/overrides/lintian/nethack-qt b/debian/overrides/lintian/nethack-qt
index b1ac4b9..6f98812 100644
--- a/debian/overrides/lintian/nethack-qt
+++ b/debian/overrides/lintian/nethack-qt
@@ -1,3 +1 @@
-nethack-qt: non-standard-executable-perm usr/lib/games/nethack/nethack-qt.sh 0755 != 2755
-nethack-qt: non-standard-executable-perm usr/lib/games/nethack/nethack-qt-tty.sh 0755 != 2755
nethack-qt: menu-icon-missing /usr/share/pixmaps/nethack.xpm
diff --git a/debian/overrides/lintian/nethack-x11 b/debian/overrides/lintian/nethack-x11
index ed31ccb..213510f 100644
--- a/debian/overrides/lintian/nethack-x11
+++ b/debian/overrides/lintian/nethack-x11
@@ -1,3 +1 @@
-nethack-x11: non-standard-executable-perm usr/lib/games/nethack/nethack-x11.sh 0755 != 2755
-nethack-x11: non-standard-executable-perm usr/lib/games/nethack/nethack-x11-tty.sh 0755 != 2755
nethack-x11: menu-icon-missing /usr/share/pixmaps/nethack.xpm
diff --git a/debian/patches/04_manpage_paths.dpatch b/debian/patches/04_manpage_paths.dpatch
index d4c9fe0..8874f00 100644
--- a/debian/patches/04_manpage_paths.dpatch
+++ b/debian/patches/04_manpage_paths.dpatch
@@ -42,6 +42,15 @@ exit 0
This option is usually only useful to the game administrator.
The playground must contain several auxiliary files such as help files,
the list of top scorers, and a subdirectory
+@@ -222,7 +223,7 @@
+ distinction, as he may eventually release a new version of his own.
+ .SH FILES
+ .PP
+-All files are in the playground, normally /usr/games/lib/nethackdir.
++All files are in the playground, normally /usr/lib/games/nethack.
+ If DLB was defined during the compile, the data files and special levels
+ will be inside a larger file, normally nhdat, instead of being separate
+ files.
@@ -283,7 +284,7 @@
.br
MAILREADER Replacement for default reader
diff --git a/debian/patches/12_lisp_windowing.dpatch b/debian/patches/12_lisp_windowing.dpatch
index 1504393..3f01ca2 100644
--- a/debian/patches/12_lisp_windowing.dpatch
+++ b/debian/patches/12_lisp_windowing.dpatch
@@ -37,8 +37,8 @@ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR B
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
---- /dev/null 2003-05-01 12:00:27.000000000 -0700
-+++ nethack/include/winlisp.h 2002-01-10 19:54:20.000000000 -0800
+--- /dev/null 2005-02-27 18:01:13.000000000 -0500
++++ nethack/include/winlisp.h 2002-01-10 22:54:20.000000000 -0500
@@ -0,0 +1,70 @@
+#ifndef WINLISP_H
+#define WINLISP_H
@@ -110,8 +110,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+E void FDECL(lisp_outrip, (winid,int));
+
+#endif /* WINLISP_H */
---- nethack-3.4.2/src/windows.c 2003-08-29 17:07:43.000000000 -0700
-+++ nethack/src/windows.c 2002-04-23 17:44:58.000000000 -0700
+--- nethack-3.4.3/src/windows.c 2003-12-07 18:39:13.000000000 -0500
++++ nethack/src/windows.c 2002-04-23 20:44:58.000000000 -0400
@@ -40,6 +40,10 @@
#ifdef MSWIN_GRAPHICS
extern struct window_procs mswin_procs;
@@ -133,9 +133,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
{ 0, 0 } /* must be last */
};
---- nethack-3.4.2/win/tty/termcap.c 2003-08-29 17:08:25.000000000 -0700
-+++ nethack/win/tty/termcap.c 2003-03-09 13:50:46.000000000 -0800
-@@ -1161,6 +1161,11 @@
+--- nethack-3.4.3/win/tty/termcap.c 2003-12-07 18:39:14.000000000 -0500
++++ nethack/win/tty/termcap.c 2005-02-27 21:00:20.000000000 -0500
+@@ -1164,6 +1164,11 @@
if (windowprocs.name != NULL &&
!strcmpi(windowprocs.name, "Gem")) return TRUE;
#endif
@@ -147,9 +147,31 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifdef QT_GRAPHICS
/* XXX has_color() should be added to windowprocs */
if (windowprocs.name != NULL &&
---- /dev/null 2003-05-01 12:00:27.000000000 -0700
-+++ nethack/win/lisp/ChangeLog 2003-06-03 02:04:26.000000000 -0700
-@@ -0,0 +1,304 @@
+--- /dev/null 2005-02-27 18:01:13.000000000 -0500
++++ nethack/win/lisp/ChangeLog 2005-02-27 21:04:31.000000000 -0500
+@@ -0,0 +1,326 @@
++2005-02-27 <katia_dilkina at verizon.net>
++
++ * winlisp.c (CMD_LISP): new define
++ (cmd_index): new "travel" command, new "options" command.
++ (lisp_coord): new macro
++ (lisp_boolean): likewise
++ (read_int): flush stdout.
++ (read_string): likewise
++ (get_options): new function
++ (lisp_nhgetch): hande CMD_LISP commands
++ (lisp_nhgetch): call impossible if the command is not a CMD_KEY or
++ CMD_EXT type.
++ (lisp_display_nhwindow): read a dummy string, not a menu string.
++
++2004-02-09 Shawn Betts <sabetts at vcn.bc.ca>
++
++ * winlisp.c (lisp_yn_function): catch the chat prompt too.
++
++2003-09-19 Shawn Betts <sabetts at vcn.bc.ca>
++
++ * winlisp.c: add extra element to lisp_procs (structure change in 3.4.2).
++
+2003-06-03 Shawn Betts <sabetts at sfu.ca>
+
+ * winlisp.c (lisp_print_glyph): Pass special to the print-glyph
@@ -454,9 +476,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ s/nethack-api-updated-inventory/nethack-api-update-inventory/
+ (WINLISP_VOID_RETVAL): added macro, called for every void
+ function.
---- /dev/null 2003-05-01 12:00:27.000000000 -0700
-+++ nethack/win/lisp/winlisp.c 2003-09-13 12:38:18.000000000 -0700
-@@ -0,0 +1,1871 @@
+--- /dev/null 2005-02-27 18:01:13.000000000 -0500
++++ nethack/win/lisp/winlisp.c 2005-02-27 21:04:38.000000000 -0500
+@@ -0,0 +1,1937 @@
+/* Copyright (c) Shawn Betts, Ryan Yeske, 2001 */
+/* NetHack may be freely redistributed. See license for details. */
+
@@ -483,6 +505,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#define CMD_KEY 0
+#define CMD_EXT 1
++#define CMD_LISP 2 /* These are commands specific to the lisp port */
+
+/* from tile.c */
+extern short glyph2tile[];
@@ -524,6 +547,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#define C(c) (0x1f & (c))
+#endif
+
++/* Taken from cmd.c */
+cmd_index_t cmd_index[] = { {"gowest", CMD_KEY, 'h'},
+ {"gowestontop", CMD_KEY, 'H'},
+ {"gowestnear", CMD_KEY, C('h')},
@@ -556,6 +580,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ {"gosoutheastontop", CMD_KEY, 'N'},
+ {"gosoutheastnear", CMD_KEY, C('n')},
+
++ {"travel", CMD_KEY, '_'},
++
+ {"idtrap", CMD_KEY, '^'},
+ {"apply", CMD_KEY, 'a'},
+ {"remarm", CMD_KEY, 'A'},
@@ -678,6 +704,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ {"version", CMD_EXT, 0},
+ {"wipe", CMD_EXT, 0},
+
++ /* Lisp port specific commands */
++ {"options", CMD_LISP, 0},
++
+ {0, CMD_KEY, '\0'} };
+
+/* This variable is set when the user has selected an extended command. */
@@ -782,6 +811,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ } \
+ while (0)
+#define lisp_int(i) printf("%d ",i)
++#define lisp_coord(c) printf("'(%d,%d) ",c.x,c.y)
++#define lisp_boolean(i) printf("%s ",i?"t":"nil")
+#define lisp_string(s) \
+ do \
+ { \
@@ -895,6 +926,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ char line[BUFSZ];
+ int rv;
+ printf ("%s> ", prompt);
++ fflush(stdout);
+ fgets (line, BUFSZ, stdin);
+ rv = sscanf (line, "%d", i);
+ if (rv != 1) *i = -1;
@@ -917,7 +949,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ (*str)[0] = '\0';
+
+ printf ("%s> ", prompt);
-+
++ fflush(stdout);
+ do
+ {
+ /* Read the string */
@@ -1347,6 +1379,36 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ lisp_cmd ("error", lisp_string("lisp_curs bad window"); lisp_int (window));
+}
+
++/* Send the options to the lisp process */
++static void
++get_options()
++{
++ lisp_cmd ("options",
++ lisp_boolean(iflags.cbreak); /* in cbreak mode, rogue format */
++ lisp_boolean(iflags.DECgraphics); /* use DEC VT-xxx extended character set */
++ lisp_boolean(iflags.echo); /* 1 to echo characters */
++ lisp_boolean(iflags.IBMgraphics); /* use IBM extended character set */
++ lisp_int(iflags.msg_history); /* hint: # of top lines to save */
++ lisp_boolean(iflags.num_pad); /* use numbers for movement commands */
++ lisp_boolean(iflags.news); /* print news */
++ lisp_boolean(iflags.window_inited); /* true if init_nhwindows() completed */
++ lisp_boolean(iflags.vision_inited); /* true if vision is ready */
++ lisp_boolean(iflags.menu_tab_sep); /* Use tabs to separate option menu fields */
++ lisp_boolean(iflags.menu_requested); /* Flag for overloaded use of 'm' prefix
++ * on some non-move commands */
++ lisp_int(iflags.num_pad_mode);
++ lisp_int(iflags.purge_monsters); /* # of dead monsters still on fmon list */
++/* lisp_int(*iflags.opt_booldup); /\* for duplication of boolean opts in config file *\/ */
++/* lisp_int(*iflags.opt_compdup); /\* for duplication of compound opts in config file *\/ */
++ lisp_int(iflags.bouldersym); /* symbol for boulder display */
++ lisp_coord(iflags.travelcc); /* coordinates for travel_cache */
++#ifdef WIZARD
++ lisp_boolean(iflags.sanity_check); /* run sanity checks */
++ lisp_boolean(iflags.mon_polycontrol); /* debug: control monster polymorphs */
++#endif
++ );
++}
++
+static void
+generate_status_line ()
+{
@@ -1364,6 +1426,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ lisp_string (plname););
+ if (Upolyd)
+ {
++ char mbot[BUFSZ];
++ int k = 0;
++
+ lisp_list (lisp_string ("rank");
+ lisp_nil);
+ lisp_list (lisp_string ("monster");
@@ -1618,6 +1683,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ char *list;
+ char *token;
+ int size = 0;
++ int toggle;
+
+ lisp_cmd ("select-menu",
+ lisp_int (window);
@@ -1771,15 +1837,31 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ else
+ {
+ char cmdstr[BUFSZ];
++ int nh_cmd = 0;
+
-+ read_command ("command", cmdstr, count_buf);
-+
-+ count_pos = count_buf;
-+ cmd = lisp_get_cmd (cmdstr);
-+ if (cmd == -1)
++ while (!nh_cmd)
+ {
-+ printf ("(nhapi-message 'atr-none \"undefined-command %s\")\n", cmdstr);
-+ cmd = lisp_get_cmd ("null");
++ read_command ("command", cmdstr, count_buf);
++
++ count_pos = count_buf;
++ cmd = lisp_get_cmd (cmdstr);
++ if (cmd == -1)
++ {
++ printf ("(nhapi-message 'atr-none \"undefined-command %s\")\n", cmdstr);
++ }
++ else if (cmd_index[cmd].type == CMD_LISP)
++ {
++ /* We have to handle Lisp commands in this inner loop, because
++ they don't interact with the nethack layer. */
++ /* FIXME: Maybe this should go in an array? */
++ if (!strcmp(cmd_index[cmd].name, "options"))
++ {
++ get_options();
++ }
++ } else {
++ /* We have a nh command. */
++ nh_cmd = 1;
++ }
+ }
+
+ if (atoi (count_pos) > 1)
@@ -1800,7 +1882,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ {
+ return cmd_index[cmd].cmd;
+ }
-+ else
++ else if (cmd_index[cmd].type == CMD_EXT)
+ {
+ if ((extended_cmd_id = lisp_get_ext_cmd_id (cmd_index[cmd].name)) == -1)
+ {
@@ -1809,6 +1891,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ }
+ return '#';
+ }
++ else
++ {
++ impossible ("Impossible command type: %d", cmd_index[cmd].type);
++ }
+}
+
+int
@@ -1980,7 +2066,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ if (window != WIN_MESSAGE && window != WIN_STATUS && window != WIN_MAP)
+ {
+ lisp_cmd ("display-menu", lisp_int (window));
-+ read_string ("menu", &dummy);
++ read_string ("dummy", &dummy);
+ free (dummy);
+ }
+ else if (blocking)
@@ -2170,7 +2256,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ int answer;
+
+ /* Some questions have special functions. */
-+ if (!strncmp (ques, "In what direction", 17))
++ if (!strncmp (ques, "In what direction", 17)
++ || !strncmp (ques, "Talk to whom? (in what direction)", 33))
+ {
+ char *dir;
+ lisp_cmd ("ask-direction",
@@ -2244,6 +2331,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ int glyph;
+{
+ int ch;
++ boolean reverse_on = FALSE;
+ int color;
+ unsigned special;
+
diff --git a/debian/patches/22_qt_savegame.dpatch b/debian/patches/22_qt_savegame.dpatch
new file mode 100644
index 0000000..0e868cc
--- /dev/null
+++ b/debian/patches/22_qt_savegame.dpatch
@@ -0,0 +1,8 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 22_qt_savegame.dpatch by Sven Jonsson <sven.jonsson at ebox.tninet.se>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Search in the correct location for nethack-qt savegames
+## DP: This is filed as upstream bug Q343-2.
+
+
diff --git a/debian/po/cs.po b/debian/po/cs.po
index c86ad6c..2a037e2 100644
--- a/debian/po/cs.po
+++ b/debian/po/cs.po
@@ -16,9 +16,9 @@ msgstr ""
"Project-Id-Version: nethack\n"
"Report-Msgid-Bugs-To: nethack at packages.debian.org\n"
"POT-Creation-Date: 2009-03-17 07:46+0100\n"
-"PO-Revision-Date: 2004-07-26 13:51+0200\n"
-"Last-Translator: Jan Outrata <outrataj at upcase.inf.upol.cz>\n"
-"Language-Team: Czech <provoz at debian.cz>\n"
+"PO-Revision-Date: 2009-09-13 12:11+0200\n"
+"Last-Translator: Jan Outrata <outrata at upcase.inf.upol.cz>\n"
+"Language-Team: Czech <debian-l10n-czech at lists.debian.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -27,7 +27,7 @@ msgstr ""
#. Description
#: ../nethack-common.templates:2001
msgid "Use setgid bit with NetHack's recover utility?"
-msgstr ""
+msgstr "Nastavit SGID bit u nástroje recover hry NetHack?"
#. Type: boolean
#. Description
@@ -38,6 +38,10 @@ msgid ""
"recover their own save files after a crash (with \"games\" group "
"privileges). This is a potential source of security problems."
msgstr ""
+"Program \"recover\" v balíčku nethack-common je tradičně instalován s "
+"nastaveným SGID bitem, aby jej mohli po pádu NetHacku použít pro obnovu "
+"svých uložených souborů všichni uživatelé (s právy skupiny \"games\"). Je "
+"to ale potenciální zdroj bezpečnostních problémů."
#. Type: boolean
#. Description
@@ -48,6 +52,10 @@ msgid ""
"users will need to run it themselves, so the default is to install recover "
"without the special permission bits required for that."
msgstr ""
+"Tento balíček obsahuje skript pro obnovu všech poškozených uložených "
+"souborů, který se spouští při startu systému. To snižuje pravděpodobnost "
+"toho, že jej uživatelé budou muset spouštět sami, takže výchozí je "
+"instalovat program recover bez pro to potřebných speciálních práv."
#. Type: boolean
#. Description
@@ -56,6 +64,8 @@ msgid ""
"If you choose this option, unprivileged users will be able to run \"recover"
"\"."
msgstr ""
+"Pokud tuto možnost zvolíte, neprivilegovaní uživatelé budou moci \"recover"
+"\" spouštět."
#~ msgid "abort, backup, purge, ignore"
#~ msgstr "zrušit, zálohovat, smazat, ignorovat"
@@ -70,31 +80,32 @@ msgstr ""
#~ "abort this installation and manually handle NetHack's save files. Your "
#~ "score files will be lost if you choose to purge."
#~ msgstr ""
-#~ "Aktualizujete z verze NetHack, jejíž ukládací soubory nejsou kompatibilní "
-#~ "s verzí, na kterou aktualizujete. Můžete je buď zálohovat do /tmp, "
-#~ "smazat, zcela tento problém ignorovat, nebo tuto instalaci zrušit a "
-#~ "nakládat s ukládacími soubory hry NetHack manuálně. Vaše soubory s "
-#~ "výsledky budou ztraceny, pokud zvolíte smazání."
+#~ "Aktualizujete z verze NetHack, jejíž ukládací soubory nejsou "
+#~ "kompatibilní s verzí, na kterou aktualizujete. Můžete je buď zálohovat "
+#~ "do /tmp, smazat, zcela tento problém ignorovat, nebo tuto instalaci "
+#~ "zrušit a nakládat s ukládacími soubory hry NetHack manuálně. Vaše "
+#~ "soubory s výsledky budou ztraceny, pokud zvolíte smazání."
#~ msgid ""
#~ "If you choose to back up, the files will be backed up into a gzip-"
#~ "compressed tar archive in /tmp with a random name starting with 'nethk' "
#~ "and ending in '.tar.gz'."
#~ msgstr ""
-#~ "Pokud zvolíte zálohovat, soubory budou zálohovány do archivu programu tar "
-#~ "komprimovaném programem gzip v /tmp s náhodným jménem začínajícím na "
+#~ "Pokud zvolíte zálohovat, soubory budou zálohovány do archivu programu "
+#~ "tar komprimovaném programem gzip v /tmp s náhodným jménem začínajícím na "
#~ "'nethk' a končícím s '.tar.gz'."
#~ msgid ""
#~ "Old NetHack save files can be found in /var/games/nethack (or /var/lib/"
#~ "games/nethack, for versions before 3.4.0)."
#~ msgstr ""
-#~ "Staré ukládací soubory hry NetHack lze nalézt v /var/games/nethack (nebo /"
-#~ "var/lib/games/nethack, pro verze před 3.4.0)."
+#~ "Staré ukládací soubory hry NetHack lze nalézt v /var/games/nethack "
+#~ "(nebo /var/lib/games/nethack, pro verze před 3.4.0)."
#~ msgid "Would you like NetHack's recover utility to be setgid games?"
#~ msgstr ""
-#~ "Chcete nastavit SGID bit pro skupinu games u nástroje recover hry NetHack?"
+#~ "Chcete nastavit SGID bit pro skupinu games u nástroje recover hry "
+#~ "NetHack?"
#~ msgid ""
#~ "The 'recover' program is installed as part of the nethack-common package "
@@ -105,17 +116,17 @@ msgstr ""
#~ msgid ""
#~ "Recover is traditionally installed setgid games, although it does not "
-#~ "need to be in the Debian NetHack installation, as it is automatically run "
-#~ "at boot time as root. Its only usefulness as a setgid binary is to let "
-#~ "players as normal users on the system recover their save files, should "
-#~ "NetHack crash or their connection drop mid-game."
+#~ "need to be in the Debian NetHack installation, as it is automatically "
+#~ "run at boot time as root. Its only usefulness as a setgid binary is to "
+#~ "let players as normal users on the system recover their save files, "
+#~ "should NetHack crash or their connection drop mid-game."
#~ msgstr ""
-#~ "Recover je tradičně instalován s nastaveným SGID bitem pro skupinu games, "
-#~ "i když u Debianní instalace hry NetHack nemusí být, protože je "
-#~ "automaticky spouštěn při startu systému pod uživatelem root. S nastaveným "
-#~ "SGID bitem je užitečný jenom pro umožnění hráčům jako obyčejným "
-#~ "uživatelům systému obnovit si jejich ukládací soubory, když NetHack "
-#~ "spadne nebo se přeruší spojení uprostřed hry."
+#~ "Recover je tradičně instalován s nastaveným SGID bitem pro skupinu "
+#~ "games, i když u Debianní instalace hry NetHack nemusí být, protože je "
+#~ "automaticky spouštěn při startu systému pod uživatelem root. S "
+#~ "nastaveným SGID bitem je užitečný jenom pro umožnění hráčům jako "
+#~ "obyčejným uživatelům systému obnovit si jejich ukládací soubory, když "
+#~ "NetHack spadne nebo se přeruší spojení uprostřed hry."
#~ msgid ""
#~ "If you answer no, you will have to run recover as root or as someone in "
diff --git a/debian/po/vi.po b/debian/po/vi.po
index ff2eb64..00bf85a 100644
--- a/debian/po/vi.po
+++ b/debian/po/vi.po
@@ -1,120 +1,51 @@
-# Vietnamese translation for nethack.
-# Copyright © 2005 Free Software Foundation, Inc.
-# Clytie Siddall <clytie at riverland.net.au>, 2005.
+# Vietnamese translation for Net-Hack.
+# Copyright © 2009 Free Software Foundation, Inc.
+# Clytie Siddall <clytie at riverland.net.au>, 2005-2009.
#
msgid ""
msgstr ""
-"Project-Id-Version: nethack 3.4.3-7\n"
+"Project-Id-Version: nethack 3.4.3-10.7\n"
"Report-Msgid-Bugs-To: nethack at packages.debian.org\n"
"POT-Creation-Date: 2009-03-17 07:46+0100\n"
-"PO-Revision-Date: 2005-06-27 13:28+0930\n"
+"PO-Revision-Date: 2009-09-23 17:47+0930\n"
"Last-Translator: Clytie Siddall <clytie at riverland.net.au>\n"
-"Language-Team: Vietnamese <gnomevi-list at lists.sourceforge.net>\n"
+"Language-Team: Vietnamese <vi-VN at googlegroups.com>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: LocFactoryEditor 1.8\n"
+#: ../nethack-common.templates:2001
#. Type: boolean
#. Description
-#: ../nethack-common.templates:2001
msgid "Use setgid bit with NetHack's recover utility?"
-msgstr ""
+msgstr "Dùng bit « setgid » với tiện ích phục hồi của NetHack ?"
+#: ../nethack-common.templates:2001
#. Type: boolean
#. Description
-#: ../nethack-common.templates:2001
msgid ""
"The \"recover\" program in the package nethack-common is traditionally "
"installed with the \"setgid\" bit set, so that all users can use it to "
"recover their own save files after a crash (with \"games\" group "
"privileges). This is a potential source of security problems."
-msgstr ""
+msgstr "Chương trình phục hồi « recover » trong gói « nethack-common » thường được cài đặt với bit « setgid » được đặt, để mọi người dùng có quyền truy cập của nhóm « games » có thể phục hồi các tập tin lưu sau khi phần mềm sụp đổ. Tuy nhiên, trường hợp này cũng có thể rủi ro bảo mật."
+#: ../nethack-common.templates:2001
#. Type: boolean
#. Description
-#: ../nethack-common.templates:2001
msgid ""
"This package includes a script that runs during system boot, invoking "
"recover on any broken save files it finds. This makes it less likely that "
"users will need to run it themselves, so the default is to install recover "
"without the special permission bits required for that."
-msgstr ""
+msgstr "Gói này bao gồm một văn lệnh mà chạy trong khi hệ thống khởi động, gọi chương trình phục hồi « recover » đối với bất cứ tập tin lưu bị hỏng nào được tìm. Văn lệnh này làm cho người dùng rất ít có thể cần tự chạy chương trình này, thì giá trị mặc định là cài đặt « recover » mà không có các bit quyền hạn đặc biệt được yêu cầu cho đó."
+#: ../nethack-common.templates:2001
#. Type: boolean
#. Description
-#: ../nethack-common.templates:2001
msgid ""
"If you choose this option, unprivileged users will be able to run \"recover"
"\"."
-msgstr ""
-
-#~ msgid "abort, backup, purge, ignore"
-#~ msgstr "hủy bỏ, lưu trữ, tẩy, bỏ qua"
-
-#~ msgid "Should NetHack back up your old, incompatible save files?"
-#~ msgstr ""
-#~ "Bạn có muốn trình NetHack lưu trữ các tập tin lưu không tương thích cũ "
-#~ "của bạn không?"
-
-#~ msgid ""
-#~ "You are upgrading from a version of NetHack whose save files are not "
-#~ "compatible with the version you are upgrading to. You may either have "
-#~ "them backed up into /tmp, purge them, ignore this problem completely, or "
-#~ "abort this installation and manually handle NetHack's save files. Your "
-#~ "score files will be lost if you choose to purge."
-#~ msgstr ""
-#~ "Lúc này bạn đang nâng cấp từ một phiên bản Nethack có tập tin lưu không "
-#~ "tương thích với phiên bản mới. Như thế thì bạn sẽ phải hoặc lưu trữ các "
-#~ "tập tin ấy vào «/tmp», hoặc tẩy hết, hoặc bỏ qua vấn đề này hoàn thành, "
-#~ "hoặc hủy bỏ việc cài đặt này và tự quản lý các tập tin lưu của trình "
-#~ "NetHack. Nếu bạn chọn tẩy hết thì sẽ mất mọi tập tin điểm."
-
-#~ msgid ""
-#~ "If you choose to back up, the files will be backed up into a gzip-"
-#~ "compressed tar archive in /tmp with a random name starting with 'nethk' "
-#~ "and ending in '.tar.gz'."
-#~ msgstr ""
-#~ "Nếu bạn chọn lưu trữ thì các tập tin ấy sẽ được lưu trữ vào một kho .tar "
-#~ "được nén gzip trong «/tmp» với một tên ngẫu nhiên bắt đầu với «nethk» và "
-#~ "cuối cùng với «.tar.gz»."
-
-#~ msgid ""
-#~ "Old NetHack save files can be found in /var/games/nethack (or /var/lib/"
-#~ "games/nethack, for versions before 3.4.0)."
-#~ msgstr ""
-#~ "Có thể tìm tập tin lưu NetHack cũ trong «/var/games/nethack» (hoặc trong «/"
-#~ "var/lib/games/nethack» cho phiên bản trước 3.4.0)."
-
-#~ msgid "Would you like NetHack's recover utility to be setgid games?"
-#~ msgstr ""
-#~ "Bạn có muốn lập tiện ích phục hồi của NetHack là «setgid games» không?"
-
-#~ msgid ""
-#~ "The 'recover' program is installed as part of the nethack-common package "
-#~ "and exists to help the administrator recover broken save files, etc."
-#~ msgstr ""
-#~ "Có cài đặt chương trình «phục hồi» là một phần của gói tin «nethack-"
-#~ "common». Nó giúp đỡ quản trị phục hồi tập tin lưu bị hỏng v.v."
-
-#~ msgid ""
-#~ "Recover is traditionally installed setgid games, although it does not "
-#~ "need to be in the Debian NetHack installation, as it is automatically run "
-#~ "at boot time as root. Its only usefulness as a setgid binary is to let "
-#~ "players as normal users on the system recover their save files, should "
-#~ "NetHack crash or their connection drop mid-game."
-#~ msgstr ""
-#~ "Trình phục hồi thường được cài đặt là «setgid games», dù nó không cần có "
-#~ "trong bản cài đặt NetHack Debian, vì nó tự động được chạy với tư cách "
-#~ "người chủ (root) khi khởi động máy. Khi lập nhị phân setgid, nó có ích "
-#~ "chỉ để cho phép người chơi là người dùng bình thường trong hệ thống, có "
-#~ "thể phục hồi tập tin lưu, nếu trình NetHack bị hỏng hoặc nếu kết nối bị "
-#~ "ngắt trong khi chơi."
-
-#~ msgid ""
-#~ "If you answer no, you will have to run recover as root or as someone in "
-#~ "group games to recover save files after a crash or a connection drop."
-#~ msgstr ""
-#~ "Nếu bạn trả lời «Không» thì sẽ phải chạy trình phục hồi (recover) với tư "
-#~ "cách người chủ (root), hoặc với tư cách người chơi trong trò chơi nhóm, "
-#~ "để phục hồi tập tin lưu sau khi bị hỏng hoặc sau khi kết nối bị ngắt."
+msgstr "Bật tùy chọn này thì các người dùng không có quyền đặc biệt cũng có thể chạy « recover »."
diff --git a/debian/rules b/debian/rules
index c925c5e..edb5f28 100755
--- a/debian/rules
+++ b/debian/rules
@@ -70,18 +70,20 @@ install: build
dh_testroot
dh_prep
dh_installdirs
- dh_installinit --no-start -pnethack-common
+ dh_installinit --no-start -pnethack-common -- 'start 18 2 3 4 5'
dh_link
chgrp games debian/nethack-common/usr/lib/games/nethack
chgrp -R games debian/nethack-common/var/games/nethack
- chmod -R 0775 debian/nethack-common/var/games/nethack
-
+ chmod -R 2775 debian/nethack-common/var/games/nethack
+
install -m 0755 -o root -g root debian/recover-helper \
debian/nethack-common/usr/lib/games/nethack/recover-helper
install -m 0644 -o root -g root dat/nhdat \
debian/nethack-common/usr/lib/games/nethack/nhdat
+ install -m 0644 -o root -g root dat/hh \
+ debian/nethack-common/usr/lib/games/nethack/hh
install -m 0644 -o root -g root debian/nethackrc.tty \
debian/nethack-common/etc/nethack/nethackrc.tty
@@ -91,8 +93,8 @@ install: build
install -m 644 debian/x11/NetHack.ad \
debian/nethack-x11/etc/X11/app-defaults/NetHack
-
- /usr/bin/X11/bdftopcf -o nh10.pcf win/X11/nh10.bdf
+
+ /usr/bin/X11/bdftopcf -o nh10.pcf win/X11/nh10.bdf
gzip -9f nh10.pcf
install -m 644 nh10.pcf.gz debian/nethack-x11/usr/share/fonts/X11/misc
# all graphics data needed by the graphical front ends
@@ -102,17 +104,21 @@ install: build
done
# install all utilities
- for prg in recover dgn_comp lev_comp dlb; do \
- install -m 0755 -o root -g games util/$$prg \
+ for prg in dgn_comp lev_comp dlb; do \
+ install -m 0755 -o root -g root util/$$prg \
debian/nethack-common/usr/lib/games/nethack/$$prg; \
done
+ # may become setgid games
+ install -m 0755 -o root -g games util/recover \
+ debian/nethack-common/usr/lib/games/nethack/recover; \
+
# all shell scripts, nethack binaries, overrides, and nethackrcs
for flavor in $(TARGETS); do \
- install -m 0755 -o root -g games debian/$$flavor/nethack.sh \
+ install -m 0755 -o root -g root debian/$$flavor/nethack.sh \
debian/nethack-$$flavor/usr/lib/games/nethack/nethack-$$flavor.sh; \
if [ -f "debian/$$flavor/nethack-tty.sh" ]; then \
- install -m 0755 -o root -g games debian/$$flavor/nethack-tty.sh \
+ install -m 0755 -o root -g root debian/$$flavor/nethack-tty.sh \
debian/nethack-$$flavor/usr/lib/games/nethack/nethack-$$flavor-tty.sh; \
fi; \
install -m 0644 -o root -g root debian/$$flavor/nethackrc \
@@ -138,17 +144,18 @@ binary-arch: build install
dh_testroot
dh_installdocs -a -A debian/README.Debian README.menucolor
dh_installdocs -pnethack-common debian/README.patches
+ dh_install
dh_installmenu -a
dh_installdebconf -pnethack-common
dh_installexamples -pnethack-x11 debian/x11/NetHack.ad
- dh_installman -a
+ dh_installman -a
dh_installchangelogs -a
dh_installxfonts -a
- dh_strip -a
+ dh_strip -a
dh_compress -a
dh_fixperms -a -Xnethack
dh_installdeb -a
- dh_shlibdeps -a
+ dh_shlibdeps -a
dh_gencontrol -a
dh_md5sums -a
dh_builddeb -a
--
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