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 0e444492847db14c029ca949b74679e93dda3dc0 Author: Joshua Kwan <[email protected]> Date: Thu Feb 17 15:35:14 2005 -0800 Imported Debian patch 3.4.3-7 --- debian/changelog | 13 ++++ debian/nethack-common.init | 22 +++--- debian/patches/08_linux_specifics.dpatch | 24 ++++--- debian/po/cs.po | 119 +++++++++++++++++++++++++++++++ debian/watch | 3 - 5 files changed, 157 insertions(+), 24 deletions(-) diff --git a/debian/changelog b/debian/changelog index 579670f..6fa4633 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +nethack (3.4.3-7) unstable; urgency=low + + * Remove the nonfunctional watch file. Sigh. + * Add Czech translation of Debconf templates, thanks to Jan Outrata. + closes: #261795 + * Make sure recover-helper runs in /bin/sh, or things might go wrong. + closes: #293291 + * Patch work: + - 08_linux_specifics: Update from Robert Millan to fix FTBFS on + kfreebsd-gnu. closes: #290342 + + -- Joshua Kwan <[email protected]> Thu, 17 Feb 2005 15:35:14 -0800 + nethack (3.4.3-6) unstable; urgency=low * Patch work: diff --git a/debian/nethack-common.init b/debian/nethack-common.init index a8142c5..03b78bf 100644 --- a/debian/nethack-common.init +++ b/debian/nethack-common.init @@ -36,21 +36,21 @@ case "$1" in # Refuse to recover root's nethack files. if [ "xroot" = "x$owner" ]; then - echo "Ignoring root's Nethack unrecovered save file." + echo "Ignoring root's Nethack unrecovered save file." else - echo "Recovering Nethack save files owned by $owner: " + echo "Recovering Nethack save files owned by $owner: " - # "$owner" is explicitly quoted to avoid attack. - # In particular, if the "find" command above fails, - # so will the 'su' command below. + # "$owner" is explicitly quoted to avoid attack. + # In particular, if the "find" command above fails, + # so will the 'su' command below. - # There really isn't a good safe way to pass a filename to - # a child shell through 'su -c', so instead we use a helper - # script running as the user which recovers everything - # owned by that user. This avoids the issue of quoting - # filenames passed through the shell entirely. + # There really isn't a good safe way to pass a filename to + # a child shell through 'su -c', so instead we use a helper + # script running as the user which recovers everything + # owned by that user. This avoids the issue of quoting + # filenames passed through the shell entirely. - su -c /usr/lib/games/nethack/recover-helper "$owner" + su --shell=/bin/sh -c /usr/lib/games/nethack/recover-helper "$owner" fi fi diff --git a/debian/patches/08_linux_specifics.dpatch b/debian/patches/08_linux_specifics.dpatch index 87945e0..8f27c63 100644 --- a/debian/patches/08_linux_specifics.dpatch +++ b/debian/patches/08_linux_specifics.dpatch @@ -18,9 +18,10 @@ esac exit 0 ---- nethack-3.4.1.orig/include/unixconf.h -+++ nethack-3.4.1/include/unixconf.h -@@ -32,12 +32,12 @@ +diff -ur nethack-3.4.3.old/include/unixconf.h nethack-3.4.3/include/unixconf.h +--- nethack-3.4.3.old/include/unixconf.h 2003-12-08 00:39:13.000000000 +0100 ++++ nethack-3.4.3/include/unixconf.h 2005-01-13 17:15:28.000000000 +0100 +@@ -32,12 +32,14 @@ /* define any of the following that are appropriate */ @@ -31,11 +32,13 @@ exit 0 /* e.g. Suns sharing a playground through NFS */ /* #define SUNOS4 */ /* SunOS 4.x */ -/* #define LINUX */ /* Another Unix clone */ ++#ifdef __linux__ +#define LINUX /* Another Unix clone */ ++#endif /* #define CYGWIN32 */ /* Unix on Win32 -- use with case sensitive defines */ /* #define GENIX */ /* Yet Another Unix Clone */ /* #define HISX */ /* Bull Unix for XPS Machines */ -@@ -102,7 +102,7 @@ +@@ -102,7 +104,7 @@ * If you want the static parts of your playground on a read-only file * system, define VAR_PLAYGROUND to be where the variable parts are kept. */ @@ -44,7 +47,7 @@ exit 0 /* -@@ -132,7 +132,7 @@ +@@ -132,7 +134,7 @@ * "extra output" method is used, but not all systems provide access to * a fine-grained timer. */ @@ -53,7 +56,7 @@ exit 0 #endif /* -@@ -166,7 +166,7 @@ +@@ -166,7 +168,7 @@ /* #define NO_MAILREADER */ /* have mail daemon just tell player of mail */ @@ -62,7 +65,7 @@ exit 0 # if defined(BSD) || defined(ULTRIX) # ifdef AMS #define AMS_MAILBOX "/Mailbox" -@@ -185,7 +185,8 @@ +@@ -189,7 +191,8 @@ # endif # endif # else @@ -72,8 +75,9 @@ exit 0 # endif #endif ---- a/src/mail.c~ 2003-10-06 18:50:29.000000000 -0700 -+++ b/src/mail.c 2003-10-06 18:51:07.000000000 -0700 +diff -ur nethack-3.4.3.old/src/mail.c nethack-3.4.3/src/mail.c +--- nethack-3.4.3.old/src/mail.c 2003-12-08 00:39:13.000000000 +0100 ++++ nethack-3.4.3/src/mail.c 2005-01-13 17:14:01.000000000 +0100 @@ -68,10 +68,11 @@ # if !defined(MAILPATH) && defined(AMS) /* Just a placeholder for AMS */ # define MAILPATH "/dev/null" @@ -84,7 +88,7 @@ exit 0 # endif -# if !defined(MAILPATH) && defined(__FreeBSD__) +/* Debian uses /var/mail, too. */ -+# if !defined(MAILPATH) && (defined(__FreeBSD__) || defined(LINUX)) ++# if !defined(MAILPATH) && (defined(__FreeBSD__) || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__)) # define MAILPATH "/var/mail/" # endif # if !defined(MAILPATH) && (defined(BSD) || defined(ULTRIX)) diff --git a/debian/po/cs.po b/debian/po/cs.po new file mode 100644 index 0000000..e830057 --- /dev/null +++ b/debian/po/cs.po @@ -0,0 +1,119 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +msgid "" +msgstr "" +"Project-Id-Version: nethack\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-05-22 23:04-0700\n" +"PO-Revision-Date: 2004-07-26 13:51+0200\n" +"Last-Translator: Jan Outrata <[email protected]>\n" +"Language-Team: Czech <[email protected]>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ISO-8859-2\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: select +#. Choices +#: ../nethack-common.templates:3 +msgid "abort, backup, purge, ignore" +msgstr "zru�it, z�lohovat, smazat, ignorovat" + +#. Type: select +#. Description +#: ../nethack-common.templates:5 +msgid "Should NetHack back up your old, incompatible save files?" +msgstr "M� NetHack z�lohovat va�e star�, nekompatibiln� ukl�dac� soubory?" + +#. 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 "" +"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�." + +#. 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 "" +"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'." + +#. 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 "" +"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)." + +#. Type: boolean +#. Description +#: ../nethack-common.templates:22 +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?" + +#. 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 "" +"Program 'recover' je instalov�n jako sou��st bal��ku nethack-common a pom�h� " +"spr�vci obnovit po�kozen� ukl�dac� soubory, atd." + +#. 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 "" +"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." + +#. 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 "" +"Pokud odpov�te ne, budete muset pro obnovu ukl�dac�ch soubor� po p�du nebo " +"p�eru�en� spojen� spustit recover pod u�ivatelem root nebo n�k�m ve skupin� " +"games." diff --git a/debian/watch b/debian/watch deleted file mode 100644 index 1d6b1fe..0000000 --- a/debian/watch +++ /dev/null @@ -1,3 +0,0 @@ -version=2 - -http://www.nethack.de/download/nethack-(\d\d\d)-src\.tgz -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/nethack.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
