[nethack] 03/05: Imported Debian patch 3.4.3-8
James Cowgill
jcowgill-guest at moszumanska.debian.org
Mon Mar 7 17:53:14 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-10
in repository nethack.
commit c24fb0bae1dcfe5976f1380bbb0877bbb467c83f
Author: Joshua Kwan <joshk at triplehelix.org>
Date: Thu Aug 11 15:11:19 2005 -0700
Imported Debian patch 3.4.3-8
---
debian/changelog | 18 ++++++
debian/control | 30 +++-------
debian/nethack-common.config | 2 +-
debian/nethack-common.postinst | 11 ++--
debian/patches/00list | 2 +
debian/patches/20_gcc4_fix.dpatch | 18 ++++++
debian/patches/95_enh_engulf_prayers.dpatch | 82 ++++++++++++++++++++++++++
debian/po/vi.po | 90 +++++++++++++++++++++++++++++
debian/rules | 11 +---
9 files changed, 228 insertions(+), 36 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 6fa4633..e5f90fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+nethack (3.4.3-8) unstable; urgency=low
+
+ * Add Vietnamese translation of Debconf templates, thanks Clytie Siddall.
+ closes: #315912
+ * Delete the nethack dummy package; make all the nethack-* packages provide
+ nethack, so that people can still apt-get install it without knowing that
+ the packages are split that way. closes: #308711
+ * Bump to Standards-Version 3.6.2, no changes required.
+ * "Hijack" the package; comaintainers have been AWOL for a very long time.
+ * Mention nethack-lisp and nethack-el in nethack-common's Description.
+ * Patch work:
+ - 95_enh_engulf_prayers: successful prayer while engulfed gets you out.
+ closes: #153736
+ - 20_gcc4_fix: GCC 4.x build fix by Andreas Jochens. closes: #297626
+ * Fix some bashisms reported by lintian.
+
+ -- Joshua Kwan <joshk at triplehelix.org> Thu, 11 Aug 2005 15:11:19 -0700
+
nethack (3.4.3-7) unstable; urgency=low
* Remove the nonfunctional watch file. Sigh.
diff --git a/debian/control b/debian/control
index be3a62a..1be4bcc 100644
--- a/debian/control
+++ b/debian/control
@@ -1,17 +1,15 @@
Source: nethack
Section: games
Priority: optional
-Maintainer: Debian Nethack Maintainers <nethack-maint at triplehelix.org>
-Uploaders: Ben Gertzfield <che at debian.org>, Joshua Kwan <joshk at triplehelix.org>
-Standards-Version: 3.6.1.0
+Maintainer: Joshua Kwan <joshk at triplehelix.org>
+Standards-Version: 3.6.2
Build-Depends: flex, bison, groff-base, debhelper (>= 4.1.16), libx11-dev, libxt-dev, libxext-dev, libxmu-dev, xutils, bsdmainutils, libxaw7-dev | libxaw-dev, libncurses5-dev | libncurses-dev, libqt3-mt-dev, libgnome-dev, dpatch, po-debconf
Package: nethack-common
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, debianutils (>= 1.12)
Recommends: nethack-console | nethack-x11 | nethack-qt | nethack-gnome
-Provides: nethack
-Conflicts: suidmanager (<< 0.50), nethack (<< 3.4.0), gnomehack, nethack-console (<< ${Source-Version}), nethack-x11 (<< ${Source-Version}), nethack-gnome (<< ${Source-Version}), nethack-qt (<< ${Source-Version}), nethack-lisp (<< ${Source-Version})
+Conflicts: suidmanager (<< 0.50), gnomehack, nethack-console (<< ${Source-Version}), nethack-x11 (<< ${Source-Version}), nethack-gnome (<< ${Source-Version}), nethack-qt (<< ${Source-Version}), nethack-lisp (<< ${Source-Version})
Replaces: nethack (<< 3.4.0), gnomehack
Description: Common files for Nethack dungeon crawl game
The various graphical front-ends for Nethack all share a large
@@ -27,6 +25,7 @@ Description: Common files for Nethack dungeon crawl game
* nethack-x11 (original X11/Athena-based graphical version)
* nethack-qt (newer Qt-based graphical version)
* nethack-gnome (experimental Gnome-based graphical version)
+ * nethack-lisp (for playing Nethack in Emacs; requires nethack-el)
.
There is a nethack-spoilers package available, if you're really
desperate for help.
@@ -40,6 +39,7 @@ Description: Common files for Nethack dungeon crawl game
Package: nethack-console
Depends: ${shlibs:Depends}, nethack-common (= ${Source-Version})
Architecture: any
+Provides: nethack
Description: Text-based 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,
@@ -56,6 +56,7 @@ Package: nethack-lisp
Depends: ${shlibs:Depends}, nethack-common (= ${Source-Version})
Suggests: nethack-el
Architecture: any
+Provides: nethack
Description: Text-based 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,
@@ -71,6 +72,7 @@ Description: Text-based overhead view D&D-style adventure game
Package: nethack-x11
Depends: ${shlibs:Depends}, ${misc:Depends}, nethack-common (= ${Source-Version}), xbase-clients (>= 3.3.3.1-5)
Architecture: any
+Provides: nethack
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,
@@ -86,6 +88,7 @@ Description: Text-based/X11 overhead view D&D-style adventure game
Package: nethack-qt
Depends: ${shlibs:Depends}, nethack-common (= ${Source-Version})
Architecture: any
+Provides: nethack
Description: Text-based/Qt 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,
@@ -102,6 +105,7 @@ Package: nethack-gnome
Depends: ${shlibs:Depends}, nethack-common (= ${Source-Version})
Architecture: any
Section: gnome
+Provides: nethack
Description: Text-based/Gnome 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,
@@ -113,19 +117,3 @@ Description: Text-based/Gnome overhead view D&D-style adventure game
.
This package contains the text and Gnome-based graphical versions
of Nethack.
-
-Package: nethack
-Architecture: all
-Depends: nethack-common, nethack-x11 | nethack-console | nethack-gnome | nethack-lisp | nethack-qt
-Description: Overhead dungeon-crawler game (dummy package)
- 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.
- .
- This package is merely a dummy package that depends on nethack-common
- and nethack-x11 to facilitate upgrades. You may safely remove it
- from your system.
diff --git a/debian/nethack-common.config b/debian/nethack-common.config
index 66c2f08..69d4b90 100644
--- a/debian/nethack-common.config
+++ b/debian/nethack-common.config
@@ -11,7 +11,7 @@ OLDLOGDIR=/var/lib/games/nethack
# lt-nl means empty is always greater than any other version,
# so the first part of this test will not return true on a new install.
if dpkg --compare-versions "$2" lt-nl 3.4.0 || \
- [ -d $OLDLOGDIR -a -n "`ls $OLDLOGDIR/save 2>/dev/null || true`" ]; then
+ [ -d $OLDLOGDIR ] && [ -n "`ls $OLDLOGDIR/save 2>/dev/null || true`" ]; then
# Save games are not to be treated lightly!
db_input high nethack-common/backup-incompatible || true
diff --git a/debian/nethack-common.postinst b/debian/nethack-common.postinst
index b4b4b6c..c9170ca 100644
--- a/debian/nethack-common.postinst
+++ b/debian/nethack-common.postinst
@@ -34,13 +34,13 @@ if [ "$1" = "configure" ]; then
# lt-nl means empty is always greater than any other version,
# so the first part of this test will not return true on a new install.
if dpkg --compare-versions "$2" lt-nl 3.4.0 || \
- [ -d $OLDLOGDIR -a -n "`ls $OLDLOGDIR/save 2>/dev/null || true`" ]; then
+ [ -d $OLDLOGDIR ] && [ -n "`ls $OLDLOGDIR/save 2>/dev/null || true`" ]; then
# But, it's a non-issue if there were no save files to begin with.
- if [ -d $LOGDIR -a -n "`ls $LOGDIR/save 2>/dev/null || true`" ]; then
+ if [ -d $LOGDIR ] && [ -n "`ls $LOGDIR/save 2>/dev/null || true`" ]; then
PROCESSDIRS="$LOGDIR"
fi
- if [ -d $OLDLOGDIR -a -n "`ls $OLDLOGDIR/save 2>/dev/null || true`" ]; then
+ if [ -d $OLDLOGDIR ] && [ -n "`ls $OLDLOGDIR/save 2>/dev/null || true`" ]; then
PROCESSDIRS="$PROCESSDIRS $OLDLOGDIR"
fi
@@ -106,8 +106,9 @@ if [ "$1" = "configure" ]; then
db_stop
for file in perm record logfile; do
- test -e /var/games/nethack/$file || install -m 0664 -o root -g games \
- /dev/null /var/games/nethack/$file
+ if [ ! -e /var/games/nethack/$file ]; then
+ install -m 0664 -o root -g games /dev/null /var/games/nethack/$file
+ fi
done
# stale rc.d file
diff --git a/debian/patches/00list b/debian/patches/00list
index 02816f3..68fa5f2 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -14,8 +14,10 @@
17_gnome_remove_drop_many
18_overridewin
19_gnome_ext_events
+20_gcc4_fix
90_enh_hpmon
91_enh_menucolors
92_enh_paranoid_hit
93_enh_dump
94_enh_sortloot
+95_enh_engulf_prayers
diff --git a/debian/patches/20_gcc4_fix.dpatch b/debian/patches/20_gcc4_fix.dpatch
new file mode 100644
index 0000000..9ae8586
--- /dev/null
+++ b/debian/patches/20_gcc4_fix.dpatch
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 20_gcc4_fix.dpatch by Andreas Jochens <aj at andaco.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: gcc 4 fix
+
+--- nethack-3.4.3/win/Qt/qt_win.cpp~ 2005-07-15 13:19:44.000000000 +0300
++++ nethack-3.4.3/win/Qt/qt_win.cpp 2005-07-15 13:19:45.000000000 +0300
+@@ -4437,7 +4437,7 @@
+ // XXX define "-" to do "E-yyyyyyyy\r", but would still need "-" for
+ // XXX other purposes. Maybe just too bad.
+ //
+-struct {
++static struct {
+ int key;
+ int state;
+ const char* macro;
+
diff --git a/debian/patches/95_enh_engulf_prayers.dpatch b/debian/patches/95_enh_engulf_prayers.dpatch
new file mode 100644
index 0000000..923b726
--- /dev/null
+++ b/debian/patches/95_enh_engulf_prayers.dpatch
@@ -0,0 +1,82 @@
+#! /bin/sh -e
+## 95_enh_engulf_prayers.dpatch by Joshua Kwan
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Prayer can expel you from being swallowed.
+
+if [ $# -lt 1 ]; then
+ echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+ exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
+
+case "$1" in
+ -patch) patch -p1 ${patch_opts} < $0;;
+ -unpatch) patch -R -p1 ${patch_opts} < $0;;
+ *)
+ echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+ exit 1;;
+esac
+
+exit 0
+
+--- nethack-3.4.3/src/pray.c~ 2003-12-08 01:39:13.000000000 +0200
++++ nethack-3.4.3/src/pray.c 2005-07-14 11:49:16.000000000 +0300
+@@ -70,12 +70,13 @@
+ * order to have the values be meaningful.
+ */
+
+-#define TROUBLE_STONED 13
+-#define TROUBLE_SLIMED 12
+-#define TROUBLE_STRANGLED 11
+-#define TROUBLE_LAVA 10
+-#define TROUBLE_SICK 9
+-#define TROUBLE_STARVING 8
++#define TROUBLE_STONED 14
++#define TROUBLE_SLIMED 13
++#define TROUBLE_STRANGLED 12
++#define TROUBLE_LAVA 11
++#define TROUBLE_SICK 10
++#define TROUBLE_STARVING 9
++#define TROUBLE_ENGULFED 8
+ #define TROUBLE_HIT 7
+ #define TROUBLE_LYCANTHROPE 6
+ #define TROUBLE_COLLAPSING 5
+@@ -141,6 +142,7 @@
+ if(u.utrap && u.utraptype == TT_LAVA) return(TROUBLE_LAVA);
+ if(Sick) return(TROUBLE_SICK);
+ if(u.uhs >= WEAK) return(TROUBLE_STARVING);
++ if(u.ustuck && u.uswallow) return(TROUBLE_ENGULFED);
+ if (Upolyd ? (u.mh <= 5 || u.mh*7 <= u.mhmax) :
+ (u.uhp <= 5 || u.uhp*7 <= u.uhpmax)) return TROUBLE_HIT;
+ if(u.ulycn >= LOW_PM) return(TROUBLE_LYCANTHROPE);
+@@ -267,6 +269,7 @@
+ int i;
+ struct obj *otmp = 0;
+ const char *what = (const char *)0;
++ struct monst *mtmp;
+ static NEARDATA const char leftglow[] = "left ring softly glows",
+ rightglow[] = "right ring softly glows";
+
+@@ -312,6 +315,19 @@
+ You_feel("better.");
+ make_sick(0L, (char *) 0, FALSE, SICK_ALL);
+ break;
++ case TROUBLE_ENGULFED:
++ mtmp = u.ustuck;
++ if (is_animal(mtmp->data)) {
++ You_hear("a %s of divine fear!", growl_sound(mtmp));
++ } else {
++ You_feel("a strange distortion in your surroundings!");
++ }
++ expels(mtmp, mtmp->data, TRUE);
++ /* Make the monster who's just barfed you out run! */
++ monflee(mtmp, rnd(10), TRUE, FALSE);
++ pline("%s looks rather %s.", Monnam(mtmp),
++ is_animal(mtmp->data) ? "nauseated" : "shook up");
++ break;
+ case TROUBLE_HIT:
+ /* "fix all troubles" will keep trying if hero has
+ 5 or less hit points, so make sure they're always
diff --git a/debian/po/vi.po b/debian/po/vi.po
new file mode 100644
index 0000000..9df5710
--- /dev/null
+++ b/debian/po/vi.po
@@ -0,0 +1,90 @@
+# Vietnamese translation for nethack.
+# Copyright © 2005 Free Software Foundation, Inc.
+# Clytie Siddall <clytie at riverland.net.au>, 2005.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: nethack 3.4.3-7\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-05-22 23:04-0700\n"
+"PO-Revision-Date: 2005-06-27 13:28+0930\n"
+"Last-Translator: Clytie Siddall <clytie at riverland.net.au>\n"
+"Language-Team: Vietnamese <gnomevi-list at lists.sourceforge.net>\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"
+
+#.Type: select
+#.Choices
+#:../nethack-common.templates:3
+msgid "abort, backup, purge, ignore"
+msgstr "hủy bỏ, lưu trữ, tẩy, bỏ qua"
+
+#.Type: select
+#.Description
+#:../nethack-common.templates:5
+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?"
+
+#.Type: select
+#.Description
+#:../nethack-common.templates:5
+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."
+
+#.Type: select
+#.Description
+#:../nethack-common.templates:5
+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»."
+
+#.Type: select
+#.Description
+#:../nethack-common.templates:5
+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)."
+
+#.Type: boolean
+#.Description
+#:../nethack-common.templates:22
+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?"
+
+#.Type: boolean
+#.Description
+#:../nethack-common.templates:22
+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."
+
+#.Type: boolean
+#.Description
+#:../nethack-common.templates:22
+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."
+
+#.Type: boolean
+#.Description
+#:../nethack-common.templates:22
+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."
diff --git a/debian/rules b/debian/rules
index 31b3a48..82c5350 100755
--- a/debian/rules
+++ b/debian/rules
@@ -130,15 +130,8 @@ install: build
# spoilers have been split out into nethack-spoilers
-binary-indep: build
- dh_testdir
- dh_testroot
- dh_installdocs -i -A debian/README.Debian
- dh_installchangelogs -i
- dh_compress -i
- dh_gencontrol -i
- dh_fixperms -i
- dh_builddeb -i
+binary-indep:
+# Ye olde no-op.
binary-arch: build install
dh_testdir
--
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