[Bug 692457] Re: Please merge bash 4.1-3 (main) from Debian unstable (main)

[Colin Watson]

Thanks for your work.  However, you seem to have dropped several of the
changes previously in Ubuntu.  I can see the following unexplained
differences:

 * with_gfdl = yes in debian/rules (you just deleted the second entry and left with_gfdl = yes, but we need with_gfdl = yes in Ubuntu because we ship the full tarball not the DFSG-stripped one, and have slightly different rules about accepting the GFDL - note that the different tarball in the source means that you'll need to supply a debdiff from previous-Ubuntu to your new version, rather than a debdiff from Debian as is usual for merges)
 * HISTCONTROL changes from bug 465500
 * HISTSIZE=1000 and HISTFILESIZE=2000
 * enable lesspipe
 * enable coloured grep
 * add ll, la, and l aliases
 * add alert alias

I normally recommend starting from the last merge entry in
debian/changelog (4.1-2ubuntu1 in this case), copying that, and then
amending to take account of changes that are no longer needed or changes
that have been dropped, rather than starting from scratch.  This forces
you to think about each one.

I think what may have happened is that in each case where there was a
merge conflict you just took the Debian side of the merge, rather than
resolving in more detail?  This is just what it looks like, though.

** Changed in: bash (Ubuntu)
       Status: Triaged => Incomplete

-- 
You received this bug notification because you are a member of Ubuntu
Sponsors Team, which is a direct subscriber.
https://bugs.launchpad.net/bugs/692457

Title:
  Please merge bash 4.1-3 (main) from Debian unstable (main)

Status in “bash” package in Ubuntu:
  Incomplete

Bug description:
  Binary package hint: bash

Changes since 4.1-2ubuntu5

bash (4.1-3) unstable; urgency=low

  * Apply upstream patches 003, 004, 005.
  * Fix crash in declare builtin.
  * /etc/skel/.bashrc:
    - Enable sourcing of ~/.bash_aliases by default. Closes: #569798.
    - Find command-not-found script. Closes: #529313.
  * README.Debian:
    - Remove references to --disable-net-redirections, bash-minimal.
    - Mention that the upstream changelog can be found in the bash-doc
      package. Closes: #551019.

 -- Matthias Klose <doko at debian.org>  Sat, 10 Apr 2010 10:35:29 +0200