← Back to branch summary

~ubuntu-branches/ubuntu/trusty/screen/trusty-backports

« back to all changes in this revision

Viewing changes to debian/patches/21manpage_nethack_activation.dpatch

  • Committer: Bazaar Package Importer
  • Author(s): Martin Pitt
  • Date: 2007-10-23 17:36:30 UTC
  • mto: This revision was merged to the branch mainline in revision 4.
  • Revision ID: james.westby@ubuntu.com-20071023173630-6q4agogsxuzujhwd
Tags: 4.0.3-7ubuntu1
* Merge with Debian; remaining Ubuntu changes:
  - 07_norootpassword.dpatch: When locking a root-owned screen, check that
    root has a password set. If not, ask for an unlocking key. (LP#6760)
  - debian/preinst: Remove obsolete init script 'screen' on
    upgrades. The script is called 'screen-cleanup' in Debian and thus
    should be called the same in Ubuntu to avoid a permanent and pointless
    delta. This needs to be kept until after the next LTS.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/21manpage_nethack_activation.dpatch
 
1
#! /bin/sh /usr/share/dpatch/dpatch-run
 
2
## 21manpage_nethack_activation.dpatch by  <hesso@pool.math.tu-berlin.de>
 
3
##
 
4
## DP: Document that there are two possible causes for 'nethack on'
 
5
## DP: being activated by default...
 
6
 
 
7
@DPATCH@
 
8
--- screen-4.0.3.orig/doc/screen.1      2007-08-06 23:39:11.000000000 +0200
 
9
+++ screen-4.0.3/doc/screen.1   2007-08-06 23:40:24.000000000 +0200
 
10
@@ -2260,7 +2260,8 @@
 
11
 .I screen
 
12
 was compiled with the NETHACK flag defined. The
 
13
 default setting is then determined by the presence of the environment 
 
14
-variable $NETHACKOPTIONS.
 
15
+variable $NETHACKOPTIONS and the file ~/.nethackrc - if either one is present,
 
16
+the default is \fBon\fP.
 
17
 .sp
 
18
 .ne 3
 
19
 .B next
 
20
--- screen-4.0.3.orig/doc/screen.texinfo        2007-08-06 23:39:12.000000000 +0200
 
21
+++ screen-4.0.3/doc/screen.texinfo     2007-08-06 23:43:15.000000000 +0200
 
22
@@ -4444,7 +4444,8 @@
 
23
 This option is only available if @code{screen} was compiled with the
 
24
 NETHACK flag defined (@pxref{Installation}). The default setting is then
 
25
 determined by the presence of the environment variable
 
26
-@code{$NETHACKOPTIONS}.
 
27
+@code{$NETHACKOPTIONS} and the file @code{~/.nethackrc} - if either one is
 
28
+present, the default is @code{on}.
 
29
 @end deffn
 
30
 
 
31
 @node Nonblock, Number, Nethack, Miscellaneous