~ubuntu-branches/debian/squeeze/mksh/squeeze

« back to all changes in this revision

Viewing changes to debian/diffs/add-builtin_common.diff

  • Committer: Bazaar Package Importer
  • Author(s): Thorsten Glaser
  • Date: 2009-10-08 08:23:59 UTC
  • mfrom: (1.1.14 upstream) (2.1.6 squeeze)
  • Revision ID: james.westby@ubuntu.com-20091008082359-pi5l2aqjprfl1t8n
Tags: 39.1-3ubuntu1
* Merge from Debian unstable. Remaining Ubuntu changes:
  - debian/mksh.postinst: hardcode debconf question if mksh should
    be installed as /bin/sh to false (see LP: #348872) but retain
    debconf infrastructure so that, if this was set to true in old
    installations, it will correctly be removed on upgrade
  - debian/rules: remove “-combine” option from Build.sh invocation
    to work around a gcc bug (see LP: #375604)

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
$MirOS: contrib/hosted/tg/deb/mksh/debian/diffs/add-builtin_common.diff,v 1.1 2009/08/01 14:44:48 tg Exp $
 
2
 
 
3
        Common part of add-builtins-to-mksh.
 
4
 
 
5
--- mksh.1.orig Sat Aug  1 14:39:58 2009
 
6
+++ mksh.1      Sat Aug  1 14:40:19 2009
 
7
@@ -2554,6 +2554,12 @@ regular commands
 
8
 .Ic mknod , print , pwd , realpath ,
 
9
 .Ic rename , test , ulimit , whence
 
10
 .Pp
 
11
+Debian
 
12
+.Nm
 
13
+regular commands
 
14
+.Pp
 
15
+.Ic chdir , printf
 
16
+.Pp
 
17
 In the future, the additional
 
18
 .Nm
 
19
 special and regular commands may be treated