diff -u dash-0.5.4/debian/changelog dash-0.5.4/debian/changelog --- dash-0.5.4/debian/changelog +++ dash-0.5.4/debian/changelog @@ -1,3 +1,14 @@ +dash (0.5.4-2ubuntu1) hardy; urgency=low + + * Merge from debian unstable, remaining changes: + - Build against glibc instead of dietlibc + - Change default answer for "Install dash as /bin/sh?" question to true. + - Add lpia to the list of DIET_ARCHS in debian/rules, to match i386. + - Trigger rebuild for hppa. + * Removed debian/changelog~ (backup file) + + -- Sasa Bodiroza Fri, 02 Nov 2007 20:22:18 +0100 + dash (0.5.4-2) unstable; urgency=low * debian/diff/0001-SHELL-Restore-foreground-process-group-on-exit.diff: @@ -15,6 +26,26 @@ -- Gerrit Pape Tue, 25 Sep 2007 07:39:37 +0000 +dash (0.5.4-1ubuntu3) gutsy; urgency=low + + * Trigger rebuild for hppa. + + -- LaMont Jones Fri, 28 Sep 2007 10:50:20 -0600 + +dash (0.5.4-1ubuntu2) gutsy; urgency=low + + * Add lpia to the list of DIET_ARCHS in debian/rules, to match i386. + + -- Adam Conrad Mon, 30 Jul 2007 12:08:53 +1000 + +dash (0.5.4-1ubuntu1) gutsy; urgency=low + + * Merge with Debian; remaining changes: + - Build against glibc instead of dietlibc + - Change default answer for "Install dash as /bin/sh?" question to true. + + -- Matthias Klose Wed, 18 Jul 2007 15:38:47 +0200 + dash (0.5.4-1) unstable; urgency=low * new upstream version. @@ -34,6 +65,14 @@ -- Gerrit Pape Tue, 26 Jun 2007 13:38:39 +0000 +dash (0.5.3-8ubuntu1) gutsy; urgency=low + + * Merge with Debian; remaining changes: + - Build against glibc instead of dietlibc + - Change default answer for "Install dash as /bin/sh?" question to true. + + -- Matthias Klose Mon, 11 Jun 2007 18:42:38 +0200 + dash (0.5.3-8) unstable; urgency=low * debian/diff/0009..0017-*.diff: new; from upstream master branch. @@ -46,6 +85,14 @@ -- Gerrit Pape Mon, 04 Jun 2007 18:46:04 +0000 +dash (0.5.3-7ubuntu1) gutsy; urgency=low + + * Merge from Debian; remaining changes: + - build against glibc instead of dietlibc + - our default /bin/sh + + -- Matthias Klose Wed, 16 May 2007 18:59:51 +0200 + dash (0.5.3-7) unstable; urgency=medium * Debconf translation updates (thx Christian Perrier for the patch): @@ -70,6 +117,21 @@ -- Gerrit Pape Sun, 31 Dec 2006 12:24:03 +0000 +dash (0.5.3-5ubuntu2) feisty; urgency=low + + * Rebuild for changes in the amd64 toolchain. + * Set Ubuntu maintainer address. + + -- Matthias Klose Mon, 5 Mar 2007 01:14:12 +0000 + +dash (0.5.3-5ubuntu1) feisty; urgency=low + + * Merge from debian unstable, remaining changes: + - build against glibc instead of dietlibc + - our default /bin/sh + + -- Scott James Remnant Mon, 27 Nov 2006 12:26:18 +0000 + dash (0.5.3-5) unstable; urgency=low * debian/po/da.po: [INTL:da] Updated Danish debconf translation (thx Claus @@ -100,6 +162,39 @@ -- Gerrit Pape Mon, 23 Oct 2006 20:38:54 +0000 +dash (0.5.3-3ubuntu4) edgy; urgency=low + + * Add dependency on debianutils so /etc/shells exists before we are + configured. Ubuntu: #52653. + + -- Scott James Remnant Tue, 11 Jul 2006 18:34:54 +0100 + +dash (0.5.3-3ubuntu3) edgy; urgency=low + + * If the dash/sh question has not been seen by the user, reset it to + the default which is now true. This will mean any user who had dash + already installed without knowing about it will have /bin/sh changed, + but any user who has actually given a response to the question + themselves will not. + + -- Scott James Remnant Wed, 5 Jul 2006 01:08:29 +0100 + +dash (0.5.3-3ubuntu2) edgy; urgency=low + + * Sync priorities with archive. + + -- Scott James Remnant Wed, 28 Jun 2006 20:23:05 +0100 + +dash (0.5.3-3ubuntu1) edgy; urgency=low + + [ Ongoing Merge Process ] + * Merge from debian unstable. + + [ Scott James Remnant ] + * Change default answer for "Install dash as /bin/sh?" question to true. + + -- Scott James Remnant Wed, 28 Jun 2006 20:06:07 +0100 + dash (0.5.3-3) unstable; urgency=low * debian/rules: target configure, configure-udeb: add --host option to @@ -122,6 +217,17 @@ -- Gerrit Pape Tue, 17 Jan 2006 05:37:48 +0000 +dash (0.5.3-1ubuntu1) dapper; urgency=low + + * debian/rules: + - Set CCUDEB to $CC. + - Remove -nostdinc from CFLAGSUDEB. + - This will build dash-udeb against normal glibc instead of dietlibc, to + make dash build again and keep dietlibc out of main. + * debian/control: Remove dietlibc-dev build dependency. + + -- Martin Pitt Tue, 13 Dec 2005 16:42:02 +0100 + dash (0.5.3-1) unstable; urgency=low * new upstream version. @@ -866,7 +972,7 @@ * Build different ashes in different subdirectories. -- Herbert Xu Thu, 8 Mar 2001 21:32:28 +1100 - + ash (0.3.7-14) unstable; urgency=low * Removed predependency from udeb (closes: #81995). diff -u dash-0.5.4/debian/control dash-0.5.4/debian/control --- dash-0.5.4/debian/control +++ dash-0.5.4/debian/control @@ -1,13 +1,16 @@ Source: dash Section: shells -Priority: optional -Maintainer: Gerrit Pape -Build-Depends: po-debconf, dietlibc-dev [alpha amd64 arm hppa i386 ia64 mips mipsel powerpc ppc64 s390 sparc] +Essential: yes +Priority: required +Maintainer: Ubuntu Core Developers +XSBC-Original-Maintainer: Gerrit Pape +Build-Depends: po-debconf Standards-Version: 3.7.2.2 Package: dash Architecture: any Pre-Depends: ${shlibs:Depends} +Depends: debianutils (>= 2.15) Description: The Debian Almquist Shell "dash" is a POSIX compliant shell that is much smaller than "bash". We take advantage of that by making it the shell on the installation diff -u dash-0.5.4/debian/dash.postinst dash-0.5.4/debian/dash.postinst --- dash-0.5.4/debian/dash.postinst +++ dash-0.5.4/debian/dash.postinst @@ -62,6 +62,13 @@ add-shell /bin/dash } +reset_default() { + db_fget dash/sh seen + if [ "$RET" = false ]; then + db_reset dash/sh + fi +} + debconf= if [ -f /usr/share/debconf/confmodule ]; then . /usr/share/debconf/confmodule @@ -78,6 +85,8 @@ fi if [ $debconf ]; then + reset_default + db_get dash/sh check_divert "$RET" /bin/sh dash check_divert "$RET" /usr/share/man/man1/sh.1.gz dash.1.gz \ diff -u dash-0.5.4/debian/dash.templates.in dash-0.5.4/debian/dash.templates.in --- dash-0.5.4/debian/dash.templates.in +++ dash-0.5.4/debian/dash.templates.in @@ -1,6 +1,6 @@ Template: dash/sh Type: boolean -Default: false +Default: true _Description: Install dash as /bin/sh? Bash is the default /bin/sh on a Debian system. However, since the Debian policy requires all shell scripts using /bin/sh to be POSIX compliant, any diff -u dash-0.5.4/debian/rules dash-0.5.4/debian/rules --- dash-0.5.4/debian/rules +++ dash-0.5.4/debian/rules @@ -2,11 +2,12 @@ CC =cc CFLAGS =-g -O2 -Wall -CCUDEB =diet -v -Os gcc -CFLAGSUDEB =-nostdinc -g -DREALLY_SMALL -Wall +#CCUDEB =diet -v -Os gcc +CCUDEB = $(CC) +CFLAGSUDEB =-g -DREALLY_SMALL -Wall STRIP =strip -DIET_ARCHS =alpha amd64 arm hppa i386 ia64 mips mipsel powerpc ppc64 s390 sparc +DIET_ARCHS =alpha amd64 arm hppa i386 ia64 lpia mips mipsel powerpc ppc64 s390 sparc ARCH ?=$(shell dpkg-architecture -qDEB_HOST_ARCH) ifeq (,$(findstring $(ARCH),$(DIET_ARCHS))) CCUDEB =$(CC) only in patch2: unchanged: