diff -u mksh-39.3/debian/README.Debian mksh-39.3/debian/README.Debian --- mksh-39.3/debian/README.Debian +++ mksh-39.3/debian/README.Debian @@ -6,6 +6,9 @@ either if done manually (change the symlink as root), for squeeze or sid, or if using an older dash version (such as lenny's). +* Installing as /bin/sh is disabled in Ubuntu until we are sure it + works as advertised. I have had bad experience with it on hardy. + * /bin/mksh is built with the following options: - eglibc (dynamically linked) - libbsd (dynamically linked) diff -u mksh-39.3/debian/changelog mksh-39.3/debian/changelog --- mksh-39.3/debian/changelog +++ mksh-39.3/debian/changelog @@ -1,3 +1,18 @@ +mksh (39.3-1ubuntu1) lucid; urgency=low + + * Merge from Debian unstable. (Closes LP: #529559) + New upstream version. (Closes LP: #355883) + This integrates a workaround for a gcc bug. (cf. LP: #375604) + Remaining Ubuntu changes: + - debian/control, debian/rules: Exclude dietlibc on powerpc/ppc64 + and sparc (cf. LP: #381332) + - debian/README.Debian, debian/mksh.postinst: Hardcode installing + mksh as /bin/sh to false (cf. LP: #348872) but retain debconf + infrastructure so that, if set to true in old installations, it + will correctly be removed on upgrade + + -- Thorsten Glaser Sun, 28 Feb 2010 17:32:01 +0000 + mksh (39.3-1) unstable; urgency=low * New upstream version R39c; shortened ChangeLog since R39: @@ -182,6 +197,24 @@ -- Thorsten Glaser Sat, 10 Oct 2009 22:00:37 +0000 +mksh (39.1-3ubuntu2) karmic; urgency=low + + * Exclude dietlibc on powerpc/ppc64 and sparc (LP: #381332) + + -- Thorsten Glaser Sat, 10 Oct 2009 14:12:52 +0000 + +mksh (39.1-3ubuntu1) karmic; urgency=low + + * 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) + + -- Thorsten Glaser Thu, 08 Oct 2009 08:23:59 +0000 + mksh (39.1-3) unstable; urgency=low * Add support for using pax instead of cpio for extraction @@ -280,6 +313,15 @@ -- Thorsten Glaser Wed, 16 Sep 2009 11:08:08 +0000 +mksh (38.3-1ubuntu1) karmic; urgency=low + + * Merge from Debian unstable (LP: #385887). Remaining Ubuntu changes: + - disable debconf mksh/sh + - do not use -combine for build + - skip dietlibc on powerpc and sparc (LP: #381332) + + -- Thorsten Glaser Thu, 11 Jun 2009 13:27:54 +0200 + mksh (38.3-1) unstable; urgency=low * New upstream version R38c; complete ChangeLog: @@ -304,6 +346,19 @@ -- Thorsten Glaser Wed, 10 Jun 2009 19:45:10 +0000 +mksh (38.2-1ubuntu1) karmic; urgency=low + + * Merge from Debian unstable. Remaining Ubuntu changes: + - disable debconf mksh/sh + - do not use -combine for build + * Apply patch from upstream CVS: + debian/rules: use DEB_BUILD_ARCH, not DEB_HOST_ARCH, to determine + if dietlibc should be excluded on certain architectures where it + is known to fail + * Exclude dietlibc on powerpc and sparc (LP: #381332) + + -- Thorsten Glaser Mon, 01 Jun 2009 10:06:19 +0000 + mksh (38.2-1) unstable; urgency=low * debian/rules: fix typo in buildd admin instructions for openpty() @@ -316,6 +371,17 @@ -- Thorsten Glaser Sun, 31 May 2009 17:45:42 +0000 +mksh (38.1-1ubuntu1) karmic; urgency=low + + * debian/mksh.postinst: hardcode debconf question if mksh should + be installed as /bin/sh to false (LP: #348872) but retain debconf + stuff so that if this was set to true in previous packages, it + will correctly be removed on upgrade + * debian/rules: remove “-combine” option from Build.sh invocation + (LP: #375604) + + -- Thorsten Glaser Thu, 28 May 2009 00:15:10 +0200 + mksh (38.1-1) unstable; urgency=low * debian/control: depend on locales-all on m68k because its diff -u mksh-39.3/debian/control mksh-39.3/debian/control --- mksh-39.3/debian/control +++ mksh-39.3/debian/control @@ -9,10 +9,11 @@ # On other architectures, mksh-static links against glibc (yuck…) # XXX removed s390 from dietlibc arches due to Debian #523110 # XXX check if locales-all on m68k is still necessary on buildds +# XXX removed powerpc/ppc64, sparc from dietlibc arches due to LP #381332 Build-Depends: cpio | pax, debhelper (>= 5), ed, libbsd-dev, # libklibc-dev (>= 1.5.15-2~tg+1), locales | belocs-locales-bin, po-debconf, - dietlibc-dev [alpha amd64 arm hppa i386 ia64 mips mipsel powerpc ppc64 sparc] + dietlibc-dev [alpha amd64 arm hppa i386 ia64 mips mipsel] Standards-Version: 3.8.4 # First word is the $CVSROOT (-d arg) string, second word the module. # Upstream is on the same server, in the "mksh" module. diff -u mksh-39.3/debian/mksh.postinst mksh-39.3/debian/mksh.postinst --- mksh-39.3/debian/mksh.postinst +++ mksh-39.3/debian/mksh.postinst @@ -28,7 +28,8 @@ } . /usr/share/debconf/confmodule -db_get mksh/sh +#db_get mksh/sh +RET=false # hardcoded for Ubuntu check_divert "$RET" /bin/sh mksh check_divert "$RET" /usr/share/man/man1/sh.1.gz mksh.1.gz \ /usr/share/man/man1/sh.distrib.1.gz diff -u mksh-39.3/debian/rules mksh-39.3/debian/rules --- mksh-39.3/debian/rules +++ mksh-39.3/debian/rules @@ -97,6 +97,17 @@ MKSH_KLCC_STATIC:= 1 endif +# LP #381332 +ifeq (${DEB_BUILD_ARCH},powerpc) +USE_DIETLIBC= 0 +endif +ifeq (${DEB_BUILD_ARCH},ppc64) +USE_DIETLIBC= 0 +endif +ifeq (${DEB_BUILD_ARCH},sparc) +USE_DIETLIBC= 0 +endif + ifeq (${USE_DIETLIBC},1) # mksh-static ← dietlibc – diet(1) optimises OK