diff -pruN 5.2.15-2/debian/changelog 5.2.15-2ubuntu1/debian/changelog
--- 5.2.15-2/debian/changelog	2023-01-02 12:06:21.000000000 +0000
+++ 5.2.15-2ubuntu1/debian/changelog	2023-01-07 07:34:42.000000000 +0000
@@ -1,3 +1,20 @@
+bash (5.2.15-2ubuntu1) lunar; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - skel.bashrc:
+      - Run lesspipe.
+      - Enable ls aliases.
+      - Set options in ll alias to -alF.
+      - Define an alert alias.
+      - Enabled colored grep aliases.
+    - etc.bash.bashrc:
+      - Add sudo hint.
+    - Resurrect "Set the default path to comply with Debian policy" in
+      deb-bash-config.diff.
+    - Add autopkgtest for the built-in path.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sat, 07 Jan 2023 08:34:42 +0100
+
 bash (5.2.15-2) unstable; urgency=medium
 
   * Remove one more pdf file without source. Closes: #1024598.
@@ -32,12 +49,54 @@ bash (5.2-2) unstable; urgency=medium
 
  -- Matthias Klose <doko@debian.org>  Mon, 24 Oct 2022 10:34:28 +0200
 
+bash (5.2-1ubuntu2) kinetic; urgency=medium
+
+  * debian/patches: Import two upstream patches to fix crashes:
+      - Bash-5.2-patch-1-fix-crash-with-unset-arrays-in-arit.diff
+      - Bash-5.2-patch-2-fix-crash-in-readline-when-started-.diff (LP:#1992206)
+
+ -- Nick Rosbrook <nick.rosbrook@canonical.com>  Fri, 07 Oct 2022 17:03:05 -0400
+
+bash (5.2-1ubuntu1) kinetic; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - skel.bashrc:
+      - Run lesspipe.
+      - Enable ls aliases.
+      - Set options in ll alias to -alF.
+      - Define an alert alias.
+      - Enabled colored grep aliases.
+    - etc.bash.bashrc:
+      - Add sudo hint.
+    - Resurrect "Set the default path to comply with Debian policy" in
+      deb-bash-config.diff.
+    - Add autopkgtest for the built-in path.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 29 Sep 2022 09:52:11 +0200
+
 bash (5.2-1) unstable; urgency=medium
 
   * New upstream release.
 
  -- Matthias Klose <doko@debian.org>  Wed, 28 Sep 2022 16:50:07 +0200
 
+bash (5.2~rc2-2ubuntu1) kinetic; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - skel.bashrc:
+      - Run lesspipe.
+      - Enable ls aliases.
+      - Set options in ll alias to -alF.
+      - Define an alert alias.
+      - Enabled colored grep aliases.
+    - etc.bash.bashrc:
+      - Add sudo hint.
+    - Resurrect "Set the default path to comply with Debian policy" in
+      deb-bash-config.diff.
+    - Add autopkgtest for the built-in path.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 25 Aug 2022 16:19:11 +0200
+
 bash (5.2~rc2-2) unstable; urgency=medium
 
   * New upstream snapshot 5.2 rc2.
@@ -66,12 +125,46 @@ bash (5.1-6.1) unstable; urgency=medium
 
  -- Johannes Schauer Marin Rodrigues <josch@debian.org>  Thu, 12 May 2022 17:05:40 +0200
 
+bash (5.1-6ubuntu1) jammy; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - skel.bashrc:
+      - Run lesspipe.
+      - Enable ls aliases.
+      - Set options in ll alias to -alF.
+      - Define an alert alias.
+      - Enabled colored grep aliases.
+    - etc.bash.bashrc:
+      - Add sudo hint.
+    - Resurrect "Set the default path to comply with Debian policy" in
+      deb-bash-config.diff.
+    - Add autopkgtest for the built-in path.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 06 Jan 2022 17:23:33 +0100
+
 bash (5.1-6) unstable; urgency=medium
 
   * Apply upstream patches 013 - 016.
 
  -- Matthias Klose <doko@debian.org>  Thu, 06 Jan 2022 17:16:52 +0100
 
+bash (5.1-5ubuntu1) jammy; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - skel.bashrc:
+      - Run lesspipe.
+      - Enable ls aliases.
+      - Set options in ll alias to -alF.
+      - Define an alert alias.
+      - Enabled colored grep aliases.
+    - etc.bash.bashrc:
+      - Add sudo hint.
+    - Resurrect "Set the default path to comply with Debian policy" in
+      deb-bash-config.diff.
+    - Add autopkgtest for the built-in path.
+
+ -- Matthias Klose <doko@ubuntu.com>  Tue, 30 Nov 2021 16:05:08 +0100
+
 bash (5.1-5) unstable; urgency=medium
 
   * Apply upstream patches 009 - 012.
@@ -88,18 +181,69 @@ bash (5.1-3.1) unstable; urgency=medium
 
  -- Johannes Schauer Marin Rodrigues <josch@debian.org>  Sat, 23 Oct 2021 11:36:52 +0200
 
+bash (5.1-3ubuntu1) impish; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - skel.bashrc:
+      - Run lesspipe.
+      - Enable ls aliases.
+      - Set options in ll alias to -alF.
+      - Define an alert alias.
+      - Enabled colored grep aliases.
+    - etc.bash.bashrc:
+      - Add sudo hint.
+    - Resurrect "Set the default path to comply with Debian policy" in
+      deb-bash-config.diff.
+    - Add autopkgtest for the built-in path.
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon, 10 May 2021 09:14:11 +0200
+
 bash (5.1-3) unstable; urgency=medium
 
   * Apply upstream patches 005 - 008.
 
  -- Matthias Klose <doko@debian.org>  Mon, 10 May 2021 08:52:10 +0200
 
+bash (5.1-2ubuntu1) hirsute; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - skel.bashrc:
+      - Run lesspipe.
+      - Enable ls aliases.
+      - Set options in ll alias to -alF.
+      - Define an alert alias.
+      - Enabled colored grep aliases.
+    - etc.bash.bashrc:
+      - Add sudo hint.
+    - Resurrect "Set the default path to comply with Debian policy" in
+      deb-bash-config.diff.
+    - Add autopkgtest for the built-in path.
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 19 Mar 2021 17:02:58 +0100
+
 bash (5.1-2) unstable; urgency=medium
 
   * Apply upstream patches 001 - 004.
 
  -- Matthias Klose <doko@debian.org>  Sun, 03 Jan 2021 10:44:50 +0100
 
+bash (5.1-1ubuntu1) hirsute; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - skel.bashrc:
+      - Run lesspipe.
+      - Enable ls aliases.
+      - Set options in ll alias to -alF.
+      - Define an alert alias.
+      - Enabled colored grep aliases.
+    - etc.bash.bashrc:
+      - Add sudo hint.
+    - Resurrect "Set the default path to comply with Debian policy" in
+      deb-bash-config.diff.
+    - Add autopkgtest for the built-in path.
+
+ -- Matthias Klose <doko@ubuntu.com>  Tue, 08 Dec 2020 08:13:35 +0100
+
 bash (5.1-1) unstable; urgency=medium
 
   * New upstream release.
@@ -107,12 +251,46 @@ bash (5.1-1) unstable; urgency=medium
 
  -- Matthias Klose <doko@debian.org>  Tue, 08 Dec 2020 08:03:28 +0100
 
+bash (5.1~rc3-1ubuntu1) hirsute; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - skel.bashrc:
+      - Run lesspipe.
+      - Enable ls aliases.
+      - Set options in ll alias to -alF.
+      - Define an alert alias.
+      - Enabled colored grep aliases.
+    - etc.bash.bashrc:
+      - Add sudo hint.
+    - Resurrect "Set the default path to comply with Debian policy" in
+      deb-bash-config.diff.
+    - Add autopkgtest for the built-in path.
+
+ -- Matthias Klose <doko@ubuntu.com>  Tue, 24 Nov 2020 19:19:04 +0100
+
 bash (5.1~rc3-1) unstable; urgency=medium
 
   * New upstream release candidate 3.
 
  -- Matthias Klose <doko@debian.org>  Sun, 22 Nov 2020 16:24:54 +0100
 
+bash (5.1~rc2-1ubuntu1) hirsute; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - skel.bashrc:
+      - Run lesspipe.
+      - Enable ls aliases.
+      - Set options in ll alias to -alF.
+      - Define an alert alias.
+      - Enabled colored grep aliases.
+    - etc.bash.bashrc:
+      - Add sudo hint.
+    - Resurrect "Set the default path to comply with Debian policy" in
+      deb-bash-config.diff.
+    - Add autopkgtest for the built-in path.
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon, 09 Nov 2020 11:52:48 +0100
+
 bash (5.1~rc2-1) unstable; urgency=medium
 
   * New upstream release candidate 2.
@@ -151,6 +329,29 @@ bash (5.0-7) unstable; urgency=medium
 
  -- Matthias Klose <doko@debian.org>  Tue, 04 Aug 2020 11:49:30 +0200
 
+bash (5.0-6ubuntu2) groovy; urgency=medium
+
+  * Apply upstream patches 017 (LP: #1878517)
+
+ -- Matthieu Clemenceau <matthieu.clemenceau@canonical.com>  Thu, 18 Jun 2020 10:44:55 -0500
+
+bash (5.0-6ubuntu1) focal; urgency=medium
+
+  * Merge from Debian unstable.  Remaining changes:
+    - skel.bashrc:
+      - Run lesspipe.
+      - Enable ls aliases.
+      - Set options in ll alias to -alF.
+      - Define an alert alias.
+      - Enabled colored grep aliases.
+    - etc.bash.bashrc:
+      - Add sudo hint.
+    - Resurrect "Set the default path to comply with Debian policy" in
+      deb-bash-config.diff.
+    - Add autopkgtest for the built-in path.
+
+ -- Matthias Klose <doko@ubuntu.com>  Tue, 25 Feb 2020 13:03:22 +0100
+
 bash (5.0-6) unstable; urgency=medium
 
   * Apply upstream patches 012 - 016.
@@ -158,6 +359,23 @@ bash (5.0-6) unstable; urgency=medium
 
  -- Matthias Klose <doko@debian.org>  Tue, 25 Feb 2020 12:44:22 +0100
 
+bash (5.0-5ubuntu1) focal; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - skel.bashrc:
+      - Run lesspipe.
+      - Enable ls aliases.
+      - Set options in ll alias to -alF.
+      - Define an alert alias.
+      - Enabled colored grep aliases.
+    - etc.bash.bashrc:
+      - Add sudo hint.
+    - Resurrect "Set the default path to comply with Debian policy" in
+      deb-bash-config.diff.
+    - Add autopkgtest for the built-in path.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Tue, 12 Nov 2019 16:54:47 -0800
+
 bash (5.0-5) unstable; urgency=medium
 
   * Apply upstream patches 004 - 011.
@@ -165,12 +383,52 @@ bash (5.0-5) unstable; urgency=medium
 
  -- Matthias Klose <doko@debian.org>  Sun, 10 Nov 2019 11:45:12 +0100
 
+bash (5.0-4ubuntu1) eoan; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - skel.bashrc:
+      - Run lesspipe.
+      - Enable ls aliases.
+      - Set options in ll alias to -alF.
+      - Define an alert alias.
+      - Enabled colored grep aliases.
+    - etc.bash.bashrc:
+      - Add sudo hint.
+    - Resurrect "Set the default path to comply with Debian policy" in
+      deb-bash-config.diff.
+    - Add autopkgtest for the built-in path.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Sat, 04 May 2019 21:06:48 -0700
+
 bash (5.0-4) unstable; urgency=medium
 
   * wait builtin: avoid hanging on inherited children. Closes: #920455.
 
  -- Matthias Klose <doko@debian.org>  Thu, 18 Apr 2019 06:12:36 +0200
 
+bash (5.0-3ubuntu2) eoan; urgency=medium
+
+  * Resurrect "Set the default path to comply with Debian policy" in
+    deb-bash-config.diff which went missing since 4.2+dfsg-1 or so.
+    LP: #1792004 LP: #1614080 Closes: #781367
+  * Add autopkgtest for the built-in path.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Fri, 03 May 2019 14:31:24 +0100
+
+bash (5.0-3ubuntu1) disco; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - skel.bashrc:
+      - Run lesspipe.
+      - Enable ls aliases.
+      - Set options in ll alias to -alF.
+      - Define an alert alias.
+      - Enabled colored grep aliases.
+    - etc.bash.bashrc:
+      - Add sudo hint.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 04 Apr 2019 05:11:47 +0200
+
 bash (5.0-3) unstable; urgency=medium
 
   * Apply upstream patch 003.
@@ -179,6 +437,20 @@ bash (5.0-3) unstable; urgency=medium
 
  -- Matthias Klose <doko@debian.org>  Thu, 04 Apr 2019 04:30:33 +0200
 
+bash (5.0-2ubuntu1) disco; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - skel.bashrc:
+      - Run lesspipe.
+      - Enable ls aliases.
+      - Set options in ll alias to -alF.
+      - Define an alert alias.
+      - Enabled colored grep aliases.
+    - etc.bash.bashrc:
+      - Add sudo hint.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 24 Jan 2019 11:22:45 +0100
+
 bash (5.0-2) unstable; urgency=medium
 
   * Apply upstream patches 001 and 002. Closes: #919439.
@@ -186,6 +458,20 @@ bash (5.0-2) unstable; urgency=medium
 
  -- Matthias Klose <doko@debian.org>  Thu, 24 Jan 2019 11:01:16 +0100
 
+bash (5.0-1ubuntu1) disco; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - skel.bashrc:
+      - Run lesspipe.
+      - Enable ls aliases.
+      - Set options in ll alias to -alF.
+      - Define an alert alias.
+      - Enabled colored grep aliases.
+    - etc.bash.bashrc:
+      - Add sudo hint.
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon, 14 Jan 2019 19:06:48 +0100
+
 bash (5.0-1) unstable; urgency=medium
 
   * New upstream release.
@@ -235,6 +521,45 @@ bash (4.4.18-3) unstable; urgency=medium
 
  -- Matthias Klose <doko@debian.org>  Fri, 01 Jun 2018 21:05:11 +0200
 
+bash (4.4.18-2ubuntu1) bionic; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - skel.bashrc:
+      - Run lesspipe.
+      - Enable ls aliases.
+      - Set options in ll alias to -alF.
+      - Define an alert alias.
+      - Enabled colored grep aliases.
+    - etc.bash.bashrc:
+      - Add sudo hint.
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed, 04 Apr 2018 20:30:26 +0200
+
+bash (4.4.18-3.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Move man2html dependency to B-D-I and use the thinner -base variant.
+    Closes: #889757.
+
+ -- Helmut Grohne <helmut@subdivi.de>  Sun, 17 Jun 2018 21:15:06 +0200
+
+bash (4.4.18-3) unstable; urgency=medium
+
+  * Apply upstream patches 020 - 023. Fixing:
+    - In circumstances involving long-running scripts that create and reap many
+      processes, it is possible for the hash table bash uses to store exit
+      statuses from asynchronous processes to develop loops. This patch fixes
+      the loop causes and adds code to detect any future loops.
+    - A SIGINT received inside a SIGINT trap handler can possibly cause the
+      shell to loop.
+    - There are cases where a failing readline command (e.g., delete-char at
+      the end of a line) can cause a multi-character key sequence to `back up'
+      and attempt to re-read some of the characters in the sequence.
+    - When sourcing a file from an interactive shell, setting the SIGINT handle
+      to the default and typing ^C will cause the shell to exit.
+
+ -- Matthias Klose <doko@debian.org>  Fri, 01 Jun 2018 21:05:11 +0200
+
 bash (4.4.18-2) unstable; urgency=medium
 
   * Revert the changes from the last upload.
@@ -254,6 +579,20 @@ bash (4.4.18-1.1) unstable; urgency=high
 
  -- Raphaël Hertzog <hertzog@debian.org>  Tue, 13 Feb 2018 11:17:39 +0100
 
+bash (4.4.18-1ubuntu1) bionic; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - skel.bashrc:
+      - Run lesspipe.
+      - Enable ls aliases.
+      - Set options in ll alias to -alF.
+      - Define an alert alias.
+      - Enabled colored grep aliases.
+    - etc.bash.bashrc:
+      - Add sudo hint.
+
+ -- Matthias Klose <doko@ubuntu.com>  Tue, 06 Feb 2018 13:12:30 +0100
+
 bash (4.4.18-1) unstable; urgency=medium
 
   * bash 4.4.18 release (bash 4.4 patchlevel 18).
@@ -269,6 +608,20 @@ bash (4.4.18-1) unstable; urgency=medium
 
  -- Matthias Klose <doko@debian.org>  Tue, 06 Feb 2018 12:20:45 +0100
 
+bash (4.4-5ubuntu1) artful; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - skel.bashrc:
+      - Run lesspipe.
+      - Enable ls aliases.
+      - Set options in ll alias to -alF.
+      - Define an alert alias.
+      - Enabled colored grep aliases.
+    - etc.bash.bashrc:
+      - Add sudo hint.
+
+ -- Marc Deslauriers <marc.deslauriers@ubuntu.com>  Wed, 17 May 2017 13:32:04 -0400
+
 bash (4.4-5) unstable; urgency=medium
 
   * Apply upstream patch 012.
@@ -291,6 +644,20 @@ bash (4.4-3) unstable; urgency=medium
 
  -- Matthias Klose <doko@debian.org>  Fri, 20 Jan 2017 11:52:59 +0100
 
+bash (4.4-2ubuntu1) zesty; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - skel.bashrc:
+      - Run lesspipe.
+      - Enable ls aliases.
+      - Set options in ll alias to -alF.
+      - Define an alert alias.
+      - Enabled colored grep aliases.
+    - etc.bash.bashrc:
+      - Add sudo hint.
+
+ -- Matthias Klose <doko@ubuntu.com>  Tue, 15 Nov 2016 20:06:17 +0100
+
 bash (4.4-2) unstable; urgency=medium
 
   * Apply upstream patches 001 - 005.
@@ -299,6 +666,20 @@ bash (4.4-2) unstable; urgency=medium
 
  -- Matthias Klose <doko@debian.org>  Tue, 15 Nov 2016 19:49:00 +0100
 
+bash (4.4-1ubuntu1) zesty; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - skel.bashrc:
+      - Run lesspipe.
+      - Enable ls aliases.
+      - Set options in ll alias to -alF.
+      - Define an alert alias.
+      - Enabled colored grep aliases.
+    - etc.bash.bashrc:
+      - Add sudo hint.
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed, 02 Nov 2016 17:04:27 +0100
+
 bash (4.4-1) unstable; urgency=medium
 
   * Bash 4.4 release.
@@ -329,12 +710,60 @@ bash (4.4~beta-1) experimental; urgency=
 
  -- Matthias Klose <doko@debian.org>  Fri, 08 Jan 2016 07:53:07 +0100
 
+bash (4.3-15ubuntu1) yakkety; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - skel.bashrc:
+      - Run lesspipe.
+      - Enable ls aliases.
+      - Set options in ll alias to -alF.
+      - Define an alert alias.
+      - Enabled colored grep aliases.
+    - etc.bash.bashrc:
+      - Add sudo hint.
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 24 Jun 2016 09:16:03 +0200
+
+bash (4.3-14ubuntu2) yakkety; urgency=medium
+
+  * Disable building with pie (LP: #1518483)
+
+ -- Steve Beattie <sbeattie@ubuntu.com>  Mon, 25 Apr 2016 15:00:52 -0700
+
+bash (4.3-14ubuntu1) wily; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - skel.bashrc:
+      - Run lesspipe.
+      - Enable ls aliases.
+      - Set options in ll alias to -alF.
+      - Define an alert alias.
+      - Enabled colored grep aliases.
+    - etc.bash.bashrc:
+      - Add sudo hint.
+
+ -- Matthias Klose <doko@ubuntu.com>  Tue, 01 Sep 2015 01:15:55 +0200
+
 bash (4.3-14) unstable; urgency=medium
 
   * Apply upstream patches 040 - 042.
 
  -- Matthias Klose <doko@debian.org>  Tue, 01 Sep 2015 01:04:38 +0200
 
+bash (4.3-13ubuntu1) wily; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - skel.bashrc:
+      - Run lesspipe.
+      - Enable ls aliases.
+      - Set options in ll alias to -alF.
+      - Define an alert alias.
+      - Enabled colored grep aliases.
+    - etc.bash.bashrc:
+      - Add sudo hint.
+
+ -- Tiago Stürmer Daitx <tiago.daitx@canonical.com>  Wed, 29 Jul 2015 18:37:59 -0300
+
 bash (4.3-13) unstable; urgency=medium
 
   * Apply upstream patches 034 - 039.
@@ -353,6 +782,34 @@ bash (4.3-12) unstable; urgency=medium
 
  -- Matthias Klose <doko@debian.org>  Wed, 28 Jan 2015 17:05:00 +0100
 
+bash (4.3-11ubuntu3) wily; urgency=medium
+
+  * debian/patches/privmode.diff: disabled patch to re-enable proper
+    privilege dropping security feature. (LP: #1459201)
+
+ -- Marc Deslauriers <marc.deslauriers@ubuntu.com>  Wed, 27 May 2015 10:57:56 -0400
+
+bash (4.3-11ubuntu2) vivid; urgency=medium
+
+  * debian/etc.bash.bashrc: print a hint how to get root access if user
+    is in sudo group (lp: #1358827)
+
+ -- Andrey Bondarenko <abondarenko@users.sourceforge.net>  Wed, 29 Oct 2014 08:08:56 -0400
+
+bash (4.3-11ubuntu1) utopic; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - skel.bashrc:
+      - Run lesspipe.
+      - Enable ls aliases.
+      - Set options in ll alias to -alF.
+      - Define an alert alias.
+      - Enabled colored grep aliases.
+    - etc.bash.bashrc:
+      - Add sudo hint.
+
+ -- Matthias Klose <doko@ubuntu.com>  Tue, 07 Oct 2014 16:23:35 +0200
+
 bash (4.3-11) unstable; urgency=medium
 
   * Apply upstream patches 028 - 030.
@@ -360,6 +817,20 @@ bash (4.3-11) unstable; urgency=medium
 
  -- Matthias Klose <doko@debian.org>  Tue, 07 Oct 2014 16:20:35 +0200
 
+bash (4.3-10ubuntu1) utopic; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - skel.bashrc:
+      - Run lesspipe.
+      - Enable ls aliases.
+      - Set options in ll alias to -alF.
+      - Define an alert alias.
+      - Enabled colored grep aliases.
+    - etc.bash.bashrc:
+      - Add sudo hint.
+
+ -- Matthias Klose <doko@ubuntu.com>  Tue, 30 Sep 2014 20:47:35 +0200
+
 bash (4.3-10) unstable; urgency=medium
 
   * Apply upstream patches 026 and 027.
@@ -385,6 +856,50 @@ bash (4.3-9.1) unstable; urgency=high
 
  -- Florian Weimer <fw@deneb.enyo.de>  Wed, 24 Sep 2014 20:29:30 +0200
 
+bash (4.3-9ubuntu4) utopic; urgency=medium
+
+  * SECURITY UPDATE: out-of-bounds memory access
+    - debian/patches/CVE-2014-718x.diff: guard against overflow and fix
+      off-by-one in parse.y and y.tab.c.
+    - CVE-2014-7186
+    - CVE-2014-7187
+  * SECURITY IMPROVEMENT: use prefixes and suffixes for function exports
+    - debian/patches/variables-affix.diff: add prefixes and suffixes in
+      variables.c.
+
+ -- Marc Deslauriers <marc.deslauriers@ubuntu.com>  Sat, 27 Sep 2014 05:20:35 -0400
+
+bash (4.3-9ubuntu3) utopic; urgency=medium
+
+  * SECURITY UPDATE: incomplete fix for CVE-2014-6271 (LP: #1373781)
+    - debian/patches/CVE-2014-7169.diff: fix logic in parse.y and y.tab.c.
+    - CVE-2014-7169
+
+ -- Marc Deslauriers <marc.deslauriers@ubuntu.com>  Thu, 25 Sep 2014 21:43:10 -0400
+
+bash (4.3-9ubuntu2) utopic; urgency=medium
+
+  * SECURITY UPDATE: incorrect function parsing
+    - debian/patches/CVE-2014-6271.diff: fix function parsing in
+      builtins/common.h, builtins/evalstring.c, subst.c, variables.c.
+    - CVE-2014-6271
+
+ -- Marc Deslauriers <marc.deslauriers@ubuntu.com>  Mon, 22 Sep 2014 15:21:42 -0400
+
+bash (4.3-9ubuntu1) utopic; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - skel.bashrc:
+      - Run lesspipe.
+      - Enable ls aliases.
+      - Set options in ll alias to -alF.
+      - Define an alert alias.
+      - Enabled colored grep aliases.
+    - etc.bash.bashrc:
+      - Add sudo hint.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 21 Aug 2014 23:17:23 +0200
+
 bash (4.3-9) unstable; urgency=medium
 
   * Apply upstream patches 023 - 024, fixing the issues:
@@ -397,6 +912,20 @@ bash (4.3-9) unstable; urgency=medium
 
  -- Matthias Klose <doko@debian.org>  Thu, 21 Aug 2014 22:58:16 +0200
 
+bash (4.3-8ubuntu1) utopic; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - skel.bashrc:
+      - Run lesspipe.
+      - Enable ls aliases.
+      - Set options in ll alias to -alF.
+      - Define an alert alias.
+      - Enabled colored grep aliases.
+    - etc.bash.bashrc:
+      - Add sudo hint.
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon, 04 Aug 2014 09:35:20 +0200
+
 bash (4.3-8) unstable; urgency=medium
 
   * Apply upstream patches 012 - 022, fixing the issues:
@@ -432,6 +961,29 @@ bash (4.3-8) unstable; urgency=medium
 
  -- Matthias Klose <doko@debian.org>  Sun, 03 Aug 2014 18:14:31 +0200
 
+bash (4.3-7ubuntu3) utopic; urgency=medium
+
+  * Revert the last change. Upload didn't mention any Ubuntu issues, and
+    closing issues like lp: #890916 which complain that there are too many
+    places to set aliases aren't solved by just adding another place to
+    add these. Requires further discussion as also told before the upload.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 08 May 2014 11:58:40 +0200
+
+bash (4.3-7ubuntu2) utopic; urgency=medium
+
+  * Source profile.d from /etc/bash.bashrc to allow packages ship
+    integration hooks into interactive shells, same ones they already ship
+    for login shells. (Closes: #675008)
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Wed, 07 May 2014 12:12:04 +0100
+
+bash (4.3-7ubuntu1) trusty-proposed; urgency=medium
+
+  * Merge with Debian, replacing local with upstream patches. LP: #1294669.
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed, 16 Apr 2014 23:22:21 +0200
+
 bash (4.3-7) unstable; urgency=medium
 
   * Apply upstream patches 009 - 011 (replacing local patches):
@@ -448,6 +1000,20 @@ bash (4.3-7) unstable; urgency=medium
 
  -- Matthias Klose <doko@debian.org>  Wed, 16 Apr 2014 23:10:28 +0200
 
+bash (4.3-6ubuntu1) trusty; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - skel.bashrc:
+      - Run lesspipe.
+      - Enable ls aliases.
+      - Set options in ll alias to -alF.
+      - Define an alert alias.
+      - Enabled colored grep aliases.
+    - etc.bash.bashrc:
+      - Add sudo hint.
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon, 07 Apr 2014 22:47:44 +0200
+
 bash (4.3-6) unstable; urgency=medium
 
   * Apply upstream patches 001 - 008:
@@ -484,6 +1050,27 @@ bash (4.3-5) unstable; urgency=medium
 
  -- Matthias Klose <doko@debian.org>  Sat, 29 Mar 2014 19:10:21 +0100
 
+bash (4.3-4ubuntu2) trusty; urgency=medium
+
+  * Fix a display issue when a multiline command is aborted with ^C.
+  * Fix a crash after a failed history expansion. LP: #1294669.
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 28 Mar 2014 19:56:55 +0100
+
+bash (4.3-4ubuntu1) trusty; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - skel.bashrc:
+      - Run lesspipe.
+      - Enable ls aliases.
+      - Set options in ll alias to -alF.
+      - Define an alert alias.
+      - Enabled colored grep aliases.
+    - etc.bash.bashrc:
+      - Add sudo hint.
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 21 Mar 2014 15:54:30 +0100
+
 bash (4.3-4) unstable; urgency=high
 
   * Fix an issue with an associative array expanding to the
@@ -495,6 +1082,20 @@ bash (4.3-4) unstable; urgency=high
 
  -- Matthias Klose <doko@debian.org>  Fri, 21 Mar 2014 15:20:45 +0100
 
+bash (4.3-3ubuntu1) trusty; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - skel.bashrc:
+      - Run lesspipe.
+      - Enable ls aliases.
+      - Set options in ll alias to -alF.
+      - Define an alert alias.
+      - Enabled colored grep aliases.
+    - etc.bash.bashrc:
+      - Add sudo hint.
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed, 19 Mar 2014 19:37:16 +0100
+
 bash (4.3-3) unstable; urgency=medium
 
   * Fix an issue with with empty completions and bash-completion.
@@ -507,6 +1108,20 @@ bash (4.3-3) unstable; urgency=medium
 
  -- Matthias Klose <doko@debian.org>  Wed, 19 Mar 2014 18:54:13 +0100
 
+bash (4.3-2ubuntu1) trusty; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - skel.bashrc:
+      - Run lesspipe.
+      - Enable ls aliases.
+      - Set options in ll alias to -alF.
+      - Define an alert alias.
+      - Enabled colored grep aliases.
+    - etc.bash.bashrc:
+      - Add sudo hint.
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed, 05 Mar 2014 05:47:41 +0100
+
 bash (4.3-2) unstable; urgency=medium
 
   * Build-depend on texlive-fonts-recommended.
@@ -515,6 +1130,20 @@ bash (4.3-2) unstable; urgency=medium
 
  -- Matthias Klose <doko@debian.org>  Wed, 05 Mar 2014 05:05:16 +0100
 
+bash (4.3-1ubuntu1) trusty; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - skel.bashrc:
+      - Run lesspipe.
+      - Enable ls aliases.
+      - Set options in ll alias to -alF.
+      - Define an alert alias.
+      - Enabled colored grep aliases.
+    - etc.bash.bashrc:
+      - Add sudo hint.
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon, 03 Mar 2014 22:52:05 +0100
+
 bash (4.3-1) unstable; urgency=medium
 
   * Bash 4.3 release.
@@ -589,6 +1218,60 @@ bash (4.2-5.1) unstable; urgency=low
 
  -- Nicolas Boulenguez <nicolas@debian.org>  Tue, 11 Dec 2012 22:02:44 +0100
 
+bash (4.2-5ubuntu3) raring; urgency=low
+
+  * Merge with Debian.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sat, 30 Mar 2013 15:28:53 +0100
+
+bash (4.2-5.3) unstable; urgency=low
+
+  * Apply upstream patches 038 - 045, fixes for
+    - If a backslash-newline (which is removed) with no other input is given as
+      input to `read', the shell tries to dereference a null pointer and
+      segfaults.
+    - Under certain circumstances, bash attempts to expand variables in
+      arithmetic expressions even when evaluation is being suppressed.
+    - Output redirection applied to builtin commands missed I/O errors if
+      they happened when the file descriptor was closed, rather than on write
+      (e.g., like with an out-of-space error on a remote NFS file system).
+    - Process substitution incorrectly inherited a flag that inhibited using the
+      (local) temporary environment for variable lookups if it was providing
+      the filename to a redirection.  The intent the flag is to enforce the
+      Posix command expansion ordering rules.
+    - Compilation failed after specifying the  `--enable-minimal-config' option
+      to configure (more specifically, specifying `--disable-alias').
+    - When SIGCHLD is trapped, and a SIGCHLD trap handler runs when a pending
+      `read -t' invocation times out and generates SIGALRM, bash can crash with
+      a segmentation fault.
+    - When converting a multibyte string to a wide character string as part of
+      pattern matching, bash does not handle the end of the string correctly,
+      causing the search for the NUL to go beyond the end of the string and
+      reference random memory.  Depending on the contents of that memory, bash
+      can produce errors or crash.
+    - The <&n- and >&n- redirections, which move one file descriptor to anothe,
+      leave the file descriptor closed when applied to builtins or compound
+      commands.
+  * Fix parallel build (Steven Chamberlain). Closes: #694659.
+  * Fix german translations. Closes: #688571.
+  * Fix typo in man page. Closes: #696706.
+
+ -- Matthias Klose <doko@debian.org>  Sat, 30 Mar 2013 14:56:51 +0100
+
+bash (4.2-5.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * debian/bash.preinst-lib.c: typo in fcntl argument (Closes: #679198).
+
+ -- Nicolas Boulenguez <nicolas@debian.org>  Tue, 11 Dec 2012 22:02:44 +0100
+
+bash (4.2-5.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * debian/bash.preinst-lib.c: typo in fcntl argument (Closes: #679198).
+
+ -- Nicolas Boulenguez <nicolas@debian.org>  Tue, 11 Dec 2012 22:02:44 +0100
+
 bash (4.2-5) unstable; urgency=low
 
   * Apply upstream patch 037, fix for
@@ -597,6 +1280,12 @@ bash (4.2-5) unstable; urgency=low
 
  -- Matthias Klose <doko@debian.org>  Fri, 03 Aug 2012 01:21:14 +0200
 
+bash (4.2-4ubuntu1) quantal; urgency=low
+
+  * Merge with Debian.
+
+ -- Matthias Klose <doko@debian.org>  Thu, 12 Jul 2012 23:52:40 +0200
+
 bash (4.2-4) unstable; urgency=high
 
   * Apply upstream patches 030 - 036, fixes for
@@ -655,6 +1344,24 @@ bash (4.2-3) unstable; urgency=low
 
  -- Matthias Klose <doko@debian.org>  Sun, 01 Jul 2012 13:45:35 +0200
 
+bash (4.2-2ubuntu3) quantal; urgency=low
+
+  * Stop hardcoding command-not-found's interpreter.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Fri, 29 Jun 2012 10:16:47 +0100
+
+bash (4.2-2ubuntu2) precise; urgency=low
+
+  * Really apply upstream patches 021 - 024.
+
+ -- Matthias Klose <doko@ubuntu.com>  Tue, 03 Apr 2012 17:27:05 +0200
+
+bash (4.2-2ubuntu1) precise; urgency=low
+
+  * Merge with Debian; remaining changes:
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon, 02 Apr 2012 23:58:07 +0200
+
 bash (4.2-2) unstable; urgency=low
 
   * Fix command-not-found location. Closes: #529313.
@@ -666,6 +1373,34 @@ bash (4.2-2) unstable; urgency=low
 
  -- Matthias Klose <doko@debian.org>  Fri, 30 Mar 2012 19:20:04 +0200
 
+bash (4.2-1ubuntu3) precise; urgency=low
+
+  * When cross-building, use the cross-strip, not the host strip.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Fri, 30 Mar 2012 23:09:19 +0000
+
+bash (4.2-1ubuntu2) precise; urgency=low
+
+  * Build-depend on gettext:any instead of on gettext, so that apt-get can
+    properly resolve build-dependencies on the tool when cross-building.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Thu, 29 Mar 2012 21:50:28 -0700
+
+bash (4.2-1ubuntu1) precise; urgency=low
+
+  * Merge with Debian; remaining changes:
+    - Build from the upstream sources, build the documentation in info format.
+    - skel.bashrc:
+      - Run lesspipe.
+      - Enable ls aliases.
+      - Set options in ll alias to -alF.
+      - Define an alert alias.
+      - Enabled colored grep aliases. 
+    - etc.bash.bashrc:
+      - Add sudo hint.
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed, 30 Nov 2011 11:30:24 +0100
+
 bash (4.2-1) unstable; urgency=low
 
   [ Matthias Klose ]
@@ -727,6 +1462,41 @@ bash (4.2-1) unstable; urgency=low
 
  -- Matthias Klose <doko@debian.org>  Wed, 30 Nov 2011 07:29:05 +0100
 
+bash (4.2-0ubuntu4) oneiric; urgency=low
+
+  * Apply upstream patches:
+    - 009: Fix segfault running `fc -l' two times in succession.
+    - 010: Correctly print/reproduce here documents attached to commands
+      inside compound commands.
+  * Fix parsing of double doublequotes. LP: #780441.
+  * /etc/bash.bashrc:
+    - Fix quoting issue calling command-not-found. LP: #754859. Closes: #587185.
+    - For .hushlogin file for sudo hint. LP: #672496.
+  * Don't cache the value of brk between sbrk calls (Samuel Thibault).
+    Closes: #614815.
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed, 18 May 2011 10:56:41 +0200
+
+bash (4.2-0ubuntu3) natty; urgency=low
+
+  * Apply upstream patches 007 - 008.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 31 Mar 2011 17:59:39 +0200
+
+bash (4.2-0ubuntu2) natty; urgency=high
+
+  * Apply upstream patches 001 - 006.
+  * Fix bug in case evaluation handling (Chet Ramey). LP: #728748.
+  * Work around build failure in bash-static on amd64.
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 04 Mar 2011 00:16:53 +0100
+
+bash (4.2-0ubuntu1) natty; urgency=low
+
+  * Bash 4.2 release.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 24 Feb 2011 01:25:40 +0100
+
 bash (4.1-3) unstable; urgency=low
 
   * Apply upstream patches 003, 004, 005.
@@ -741,12 +1511,91 @@ bash (4.1-3) unstable; urgency=low
 
  -- Matthias Klose <doko@debian.org>  Sat, 10 Apr 2010 10:35:29 +0200
 
+bash (4.1-2ubuntu5) natty; urgency=low
+
+  * No-change upload to reduce changelogs.
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Mon, 13 Dec 2010 12:46:59 +0100
+
+bash (4.1-2ubuntu4) maverick; urgency=low
+
+  * debian/skel.bashrc: add 'alert' alias, LP: #616028
+
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Tue, 10 Aug 2010 15:35:08 -0400
+
+bash (4.1-2ubuntu3) lucid; urgency=low
+
+  * Rebuild statically linked bash-static binary against recent libc.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sun, 18 Apr 2010 23:59:44 +0200
+
+bash (4.1-2ubuntu2) lucid; urgency=low
+
+  * Apply upstream patches 003, 004, 005.
+    - Fix crash with command completion on a word with a quoted globbing
+      character.
+    - Fix executing a shell function in Posix mode without local
+      variables, bash will not propagate a variable in a special builtin's
+      temporary	environment to have global scope.
+    - Fix the `read' builtin times out after the timeout specified with -t
+      is exceeded, it does not reset the flags that tell signal handlers to
+      process signals immediately instead of deferring their handling.
+  * Fix crash in declare builtin. LP: #556101.
+  * README.Debian:
+    - Remove references to bash-minimal.
+    - Mention that the upstream changelog can be found in the bash-doc
+      package.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sat, 10 Apr 2010 12:56:48 +0200
+
+bash (4.1-2ubuntu1) lucid; urgency=low
+
+  [ Dustin Kirkland ]
+  * Merge from debian testing.  Remaining changes:
+    - Build from the upstream sources, build the documentation in info format.
+    - /etc/bash.bashrc:
+      + add sudo hint
+      + allow special characters
+      + add ll, la, l aliases
+    - /etc/skel/.bashrc:
+      + don't set HISTCONTROL twice
+      + set HISTSIZE to a reasonable 2000
+      + eval lesspipe
+      + enable colored grep
+      + add ll, la, l aliases
+  * New bug fix, LP: #545262
+    - /etc/skel/.bashrc: Uncomment useful aliases for ll, la, and l,
+      to better match sysadmin's expectations coming from other
+      enterprise distros
+
+  [ Matthias Klose ]
+  * Set HISTFILESIZE to 2000 in the skeleton bashrc. LP: #544542.
+
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Tue, 23 Mar 2010 11:56:51 -0700
+
 bash (4.1-2) unstable; urgency=low
 
   * Apply upstream patches 001, 002.
 
  -- Matthias Klose <doko@debian.org>  Fri, 12 Mar 2010 02:08:45 +0100
 
+bash (4.1-1ubuntu2) lucid; urgency=low
+
+  * Allow special characters in home path in /etc/bash.bashrc
+    (LP: #330664)
+  * skel.bashrc: Don't set HISTCONTROL twice
+    (LP: #465500)
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Wed, 10 Feb 2010 23:10:50 -0800
+
+bash (4.1-1ubuntu1) lucid; urgency=low
+
+  * Merge with Debian; remaining changes:
+    - Build from the upstream sources, build the documentation in info format.
+    - /etc/skel/.bashrc: eval lesspipe.
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon, 04 Jan 2010 19:10:28 +0100
+
 bash (4.1-1) unstable; urgency=low
 
   * New upstream version 4.1.
@@ -775,6 +1624,20 @@ bash (4.0-6) unstable; urgency=medium
 
  -- Matthias Klose <doko@debian.org>  Sun, 13 Sep 2009 13:35:38 +0200
 
+bash (4.0-5ubuntu2) karmic; urgency=low
+
+  * Still ship the sh and sh(1) symlinks. LP: #429048.
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon, 14 Sep 2009 06:51:00 +0200
+
+bash (4.0-5ubuntu1) karmic; urgency=low
+
+  * Merge with Debian; remaining changes:
+    - Build from the upstream sources, build the documentation in info format.
+    - /etc/skel/.bashrc: eval lesspipe.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sun, 13 Sep 2009 13:22:17 +0200
+
 bash (4.0-5) unstable; urgency=low
 
   * Re-add dependency on dash, lost with the upload of 4.0.
@@ -785,6 +1648,28 @@ bash (4.0-5) unstable; urgency=low
 
  -- Matthias Klose <doko@debian.org>  Sun, 13 Sep 2009 12:55:54 +0200
 
+bash (4.0-4ubuntu2) karmic; urgency=low
+
+  * Changes to the skeleton .bashrc:
+    - Source ~/.bash_aliases by default. LP: #408329.
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon, 24 Aug 2009 13:59:12 +0200
+
+bash (4.0-4ubuntu1) karmic; urgency=low
+
+  * Merge with Debian; remaining changes:
+    - Build from the upstream sources, build the documentation in info format.
+    - /etc/skel/.bashrc: eval lesspipe.
+  * Changes to the skeleton .bashrc:
+    - Source .bash_aliases after defining aliases. LP: #400686.
+    - Enable color support for grep. LP: #386502.
+  * The bash docs now  describe uname -s not having any effect on many
+    systems. LP: #378595.
+  * Don't ship an info dir file. LP: #358932.
+  * Fix some lintian warnings.
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon, 24 Aug 2009 12:06:59 +0200
+
 bash (4.0-4) unstable; urgency=low
 
   * Apply upstream patches 024 - 028.
@@ -820,6 +1705,14 @@ bash (4.0-2) experimental; urgency=low
 
  -- Matthias Klose <doko@debian.org>  Sat, 21 Mar 2009 15:06:46 +0100
 
+bash (4.0-1ubuntu1) jaunty; urgency=low
+
+  * Merge with Debian; remaining changes:
+    - Build from the upstream sources, build the documentation in info format.
+    - /etc/skel/.bashrc: eval lesspipe.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sun, 01 Mar 2009 11:00:00 +0100
+
 bash (4.0-1) experimental; urgency=low
 
   * New upstream version 4.0.
@@ -838,12 +1731,32 @@ bash (3.2-6) unstable; urgency=medium
 
  -- Matthias Klose <doko@debian.org>  Mon, 20 Jul 2009 23:56:24 +0000
 
+bash (3.2-5ubuntu1) jaunty; urgency=low
+
+  * Merge with Debian; remaining changes:
+
+ -- Matthias Klose <doko@ubuntu.com>  Sun, 01 Mar 2009 10:40:20 +0100
+
+bash (3.2-6) unstable; urgency=medium
+
+  * bash. Depend on dash to install dash as a required package.
+
+ -- Matthias Klose <doko@debian.org>  Mon, 20 Jul 2009 23:56:24 +0000
+
 bash (3.2-5) unstable; urgency=low
 
   * Apply upstream fixes 040 - 048.
 
  -- Matthias Klose <doko@debian.org>  Sun, 01 Mar 2009 10:20:52 +0100
 
+bash (3.2-4ubuntu1) intrepid; urgency=low
+
+  * Merge with Debian; remaining changes:
+    - Build from the upstream sources, build the documentation in info format.
+    - /etc/skel/.bashrc: eval lesspipe.
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon, 12 May 2008 18:53:01 +0200
+
 bash (3.2-4) unstable; urgency=low
 
   * bash-minimal, bash-static: Only call `add-shell' on new installations.
@@ -851,6 +1764,14 @@ bash (3.2-4) unstable; urgency=low
 
  -- Matthias Klose <doko@debian.org>  Mon, 12 May 2008 18:49:07 +0200
 
+bash (3.2-3ubuntu1) intrepid; urgency=low
+
+  * Merge with Debian; remaining changes:
+    - Build from the upstream sources, build the documentation in info format.
+    - /etc/skel/.bashrc: eval lesspipe.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sun, 11 May 2008 08:32:22 +0000
+
 bash (3.2-3) unstable; urgency=low
 
   * /etc/skel/.bashrc: Overwrite SHELL for calling lesspipe. Closes: #385168.
@@ -860,6 +1781,13 @@ bash (3.2-3) unstable; urgency=low
 
  -- Matthias Klose <doko@debian.org>  Sun, 20 Apr 2008 13:31:10 +0200
 
+bash (3.2-2ubuntu1) intrepid; urgency=low
+
+  * Merge with Debian; remaining changes:
+    - Build from the upstream sources, build the documentation in info format.
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed, 07 May 2008 11:31:40 +0200
+
 bash (3.2-2) unstable; urgency=low
 
   * Add a shopt option compat31 to fall back to the behaviour of bash-3.1 
@@ -926,6 +1854,235 @@ bash (3.2-1) experimental; urgency=low
 
  -- Matthias Klose <doko@debian.org>  Sun, 10 Feb 2008 23:49:35 +0100
 
+bash (3.2-0ubuntu17) hardy-proposed; urgency=low
+
+  * /etc/skel/.bashrc: Fix typo, forcing a colored prompt. LP: #223256.
+  * Add missing md5sum for feisty and gutsy /etc/skel/.bash_profile,
+    so it is removed on upgrade to hardy if unmodified. LP: #211406.
+  * Apply upstream patches 034 - 039, applying fixes for:
+    - The bash getcwd replacement will write past the end of allocated memory
+      when it allocates the buffer itself if it uses the buffer size passed
+      as an argument, and that size is less than the length of the pathname.
+    - Bash incorrectly puts the second and subsequent children spawned by a
+      shell forked to run a command substitution in the wrong process group.
+    - When initializing a subshell, bash did not reset a sentinel keeping
+      track of the number of command substitutions, leading to an infinite
+      loop if an error was encountered in the subshell.
+    - Bash inappropriately evaluates command substitutions while expanding
+      directory names as part of command substitution.
+    - When reading input lines into a single variable using the `read' builtin,
+      bash did not free the memory it read after assigining it to the named
+      variable, causing a memory leak noticable when reading large amounts of
+      data.
+    - Replace shell-compat patches with upstream patch 039 (compat31).
+  * Reenable running the testsuite during the build.
+  * Only call add-shell on new installations; guard remove-shell in post
+    removal.
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed, 07 May 2008 09:56:53 +0200
+
+bash (3.2-0ubuntu16) hardy; urgency=low
+
+  * Remove /etc/skel/.bash_profile, if it is unmodified; if modified and
+    /etc/skel/.profile is unmodifed, move .bash_profile to .profile.
+    LP: #211406.
+  * /etc/skel/.bashrc: Add an option to blurt a terminal window with a
+    colored prompt. LP: #103929.
+  * /etc/skel/.bashrc: Add color support for grep and friends (commented out 
+    by default). LP: #144632.
+  * /etc/skel/.profile: Avoid the use of `~'. LP: #200283.
+  * Add a shopt option compat31 to falls back to the behaviour of bash-3.1 
+    and earlier versions, in that quoting the string argument to the [[ 
+    command's =~ +operator does not force string matching. LP: #110407.
+
+ -- Matthias Klose <doko@ubuntu.com>  Tue, 15 Apr 2008 01:24:06 +0200
+
+bash (3.2-0ubuntu15) hardy; urgency=low
+
+  * Don't run command-not-found from the shell scripts when it has been
+    removed in the meantime (LP: #194939)
+
+ -- Kjell Braden <fnord@pentabarf.de>  Sun, 24 Feb 2008 12:01:31 +0100
+
+bash (3.2-0ubuntu14) hardy; urgency=low
+
+  * Build-depend on sharutils ... but save the control file before uploading.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sat, 09 Feb 2008 03:10:16 +0100
+
+bash (3.2-0ubuntu13) hardy; urgency=low
+
+  * Build-depend on sharutils.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sat, 09 Feb 2008 00:19:37 +0000
+
+bash (3.2-0ubuntu12) hardy; urgency=low
+
+  * Apply upstream patches 026 - 033. Fixes for:
+    - Keep the Apple linker from attempting to link bash against Apple's
+      readline library "replacement" rather than the one shipped with bash.
+    - When updating the display after displaying, for instance, a list
+      of possible completions, readline will place the cursor at the wrong
+      position if the prompt contains invisible characters and a newline.
+      LP: #119938.
+    - Under some circumstances, readline will incorrectly display a prompt
+      string containing invisible characters after the final newline.
+    - When the bash arithmetic expression evaluator has temporarily turned off
+      evalation, such as when parsing a pre- or post-decrement or -increment
+      operator, and an error occurs, evaluation is not re-enabled.
+    - If redirections attached to a compound command fail, bash does not set
+      the command's exit status correctly.  This only happens when the command
+      is the first in a sequential list.
+    - In certain cases when outputting characters at the end of the line, e.g.,
+      when displaying the prompt string, readline positions the cursor
+      incorrectly if the prompt string contains invisible characters and the
+      text being drawn begins before the last invisible character in the line.
+    - There is an off-by-one error in the code that buffers characters
+      received very quickly in succession, causing characters to be dropped.
+    - References made within a function to an uninitialized local array
+      variable using the [*] subscript in a double-quoted string  can result
+      in spurious ASCII 127 characters in the expanded value.
+  * Remove bash-completion from the source.
+  * Remove the conflict with bash-completion, recommend bash-completion.
+  * debian/skel.bashrc: Check for dircolors before using it. LP: #121992.
+  * Include correct bash.pot file. LP: #104261.
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 08 Feb 2008 19:26:17 +0100
+
+bash (3.2-0ubuntu11) gutsy; urgency=low
+
+  * Move CWRU/changelog from the bash to the bash-doc package (we already
+    have the CHANGES files).
+  * Support safe-upgrade and full-upgrade in aptitude auto completion.
+    (Benjamin Rubin). LP: #128575.
+
+  [ Daniel Hahler]
+  * Apply upstream patches 018 - 025 (LP: #147946), fixes for:
+    - 018: Fix losing saved status of a background job and fix
+      infinite loop after creating and waiting for 4096 jobs.
+    - 019: Properly report error status when rl_read_key returns -1,
+      fixes cause of input loops.
+    - 020: Fix state consistency in some cases of error processing,
+      when jumping back to the top-level processing loop from
+      a builtin command.
+    - 021: When the parser read a backslash-escaped character that would
+      be treated internally as an escape, it would double the number
+      of escape characters.
+    - 022: POSIX specifies that the `read' builtin invoked from an interative
+      shell must prompt with $PS2 when a line is continued using a backslash
+      while reading from a terminal.
+    - 023: When an error occurs during the pattern removal word expansion,
+      the shell can free unallocated memory or free memory multiple times.
+    - 024: Fix calculation of screen position when performing a redisplay in
+      which the new text uses more space, but fewer bytes.
+    - 025: Fix dropping each 511th character of buffered input, e.g. when
+      pasting a large amount of data.
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 05 Oct 2007 15:31:40 +0200
+
+bash (3.2-0ubuntu10) gutsy; urgency=low
+
+  * Trigger rebuild for hppa
+
+ -- LaMont Jones <lamont@ubuntu.com>  Fri, 28 Sep 2007 10:34:31 -0600
+
+bash (3.2-0ubuntu9) gutsy; urgency=low
+
+  * debian/etc.bash.bashrc:
+    - updated for new location of command-not-found
+    - fix parsing of commands that look like arguments (LP: #124301)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 27 Aug 2007 08:53:07 +0200
+
+bash (3.2-0ubuntu8) gutsy; urgency=low
+
+  * Apply upstream patch 014 - 017, fixes for:
+    - Mishandling word splitting under certain circumstances when IFS is
+      null (IFS=).
+    - Fix unlinking FIFOs under certain circumstances, when using FIFOs
+      for process substitution.
+    - Fixes for displaying long prompts.
+  * textex -> texlive transition.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 17 May 2007 11:39:42 +0200
+
+bash (3.2-0ubuntu7) feisty; urgency=low
+
+  * Apply upstream patch 011 - 013, fixes for:
+    - 011: Under certain circumstances (loopback mounts), the bash getcwd does
+      not return correct results.  This patch allows the use of the Solaris
+      libc getcwd even though it doesn't dynamically allocate memory.
+    - 012: Some systems (AIX 4.x) don't implement the PRI_xxx macros correctly,
+      causing syntax errors when attempting to compile bash on those systems.
+      This patch adds support for the PRI_MACROS_BROKEN define.
+    - 013: Readline neglects to reallocate the array it uses to keep track
+      of wrapped screen lines when increasing its size.  This will eventually
+      result in segmentation faults when given sufficiently long input.
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri,  6 Apr 2007 15:34:09 +0200
+
+bash (3.2-0ubuntu6) feisty; urgency=low
+
+  * Apply upstream patch 010.
+    The glibc implementation of regcomp/regexec does not allow backslashes to
+    escape "ordinary" pattern characters when matching.  Bash used backslashes
+    to quote all characters when the pattern argument to the [[ special
+    command's =~ operator was quoted.  This caused the match to fail on Linux
+    and other systems using GNU libc.
+
+ -- Matthias Klose <doko@ubuntu.com>  Tue,  6 Mar 2007 03:59:49 +0100
+
+bash (3.2-0ubuntu5) feisty; urgency=low
+
+  * Install /etc/skel/.profile, instead of /etc/skel/.bash_profile.
+    Users will find a ~/.profile instead of ~/.bash_profile; ~/.profile
+    is not read by a bash login shell, if ~/.bash_profile still exists.
+  * Fix one more crash in clear_console. Ubuntu #87402.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sat,  3 Mar 2007 14:06:07 +0100
+
+bash (3.2-0ubuntu4) feisty; urgency=low
+
+  * Fix crash in clear_console. Ubuntu #85165.
+  * Fix scp command completion. Ubuntu #82849.
+  * Set Ubuntu maintainer address.
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed, 21 Feb 2007 15:38:51 +0100
+
+bash (3.2-0ubuntu3) feisty; urgency=low
+
+  * debian/rules: Adjust to changed brace expansion in 3.2.
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon,  8 Jan 2007 16:29:27 +0000
+
+bash (3.2-0ubuntu2) feisty; urgency=low
+
+  * Apply upstream patches 006 - 009.
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon,  8 Jan 2007 11:07:45 +0000
+
+bash (3.2-0ubuntu1) feisty; urgency=low
+
+  * New upstream version.
+    - Remove rl-inputrc.dpatch, applied upstream.
+    - Remove ulimit.dpatch, ulimit-doc.dpatch, read-memleak, login-shell,
+      man-typos, applied upstream.
+  * Bugs fixed upstream:
+    - Traps overwrite job names. Ubuntu #41082.
+  * Apply upstream patches 001 - 005.
+  * Set HISTCONTROL to ignoreboth. Ubuntu #66539.
+  * Fix comment about umask setting in /etc/skel/.bash_profile. Ubuntu #71294.
+  * bash-completion:
+    - Fix typo in pkg-config completion. Ubuntu #58054.
+    - Add completion for apt-get autoremove. Ubuntu #60666.
+    - Add kaffeine completion for srt files. Ubuntu #64274.
+  * Merge with Debian unstable; remaining changes:
+    - Source package built using the unmodified upstream tarball.
+    - Build the bash-doc package including the texinfo docs.
+    - Skeleton scripts.
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon,  4 Dec 2006 10:01:04 +0000
+
 bash (3.1dfsg-9) unstable; urgency=low
 
   * Remove bash-completion from the source.
@@ -957,6 +2114,30 @@ bash (3.1dfsg-6) unstable; urgency=low
 
  -- Matthias Klose <doko@debian.org>  Thu, 12 Oct 2006 22:35:46 +0200
 
+bash (3.1-5ubuntu3) edgy; urgency=low
+
+  * debian/bash_completion/bash_completion:
+    - added new apt autoremove option
+  * debian/etc.bash.bashrc:
+    - if the command-not-found package is installed, use it
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 19 Sep 2006 21:56:57 +0200
+
+bash (3.1-5ubuntu2) edgy; urgency=low
+
+  * debian/patches/command-not-found-bashrc.diff:
+    - support the command-not-found package (if installed) 
+      out-of-the-box (command-not-found-magic spec)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 28 Aug 2006 20:22:52 +0200
+
+bash (3.1-5ubuntu1) edgy; urgency=low
+
+  * Resynchronize with Debian unstable.
+    - Remaining change: bashrc sudo hint.
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed,  5 Jul 2006 13:11:22 +0000
+
 bash (3.1-5) unstable; urgency=low
 
   * Work around the broken remove-shell, not checking for the existance
@@ -2671,3 +3852,4 @@ bash (1.14.7-1) frozen unstable; urgency
   * default unreadable .bash_history in /etc/skel (fixes 1549).
 
  -- Guy Maor <maor@ece.utexas.edu>  Sat, 9 Nov 1996 05:07:31 -0600
+
diff -pruN 5.2.15-2/debian/control 5.2.15-2ubuntu1/debian/control
--- 5.2.15-2/debian/control	2022-08-25 14:45:45.000000000 +0000
+++ 5.2.15-2ubuntu1/debian/control	2023-01-07 07:34:42.000000000 +0000
@@ -1,7 +1,8 @@
 Source: bash
 Section: base
 Priority: required
-Maintainer: Matthias Klose <doko@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Matthias Klose <doko@debian.org>
 Standards-Version: 4.6.1
 Build-Depends: autoconf, autotools-dev, bison, libncurses5-dev,
  texinfo, texi2html, debhelper (>= 11), gettext, sharutils,
diff -pruN 5.2.15-2/debian/etc.bash.bashrc 5.2.15-2ubuntu1/debian/etc.bash.bashrc
--- 5.2.15-2/debian/etc.bash.bashrc	2018-02-06 10:51:32.000000000 +0000
+++ 5.2.15-2ubuntu1/debian/etc.bash.bashrc	2023-01-07 07:34:42.000000000 +0000
@@ -40,6 +40,19 @@ fi
 #  fi
 #fi
 
+# sudo hint
+if [ ! -e "$HOME/.sudo_as_admin_successful" ] && [ ! -e "$HOME/.hushlogin" ] ; then
+    case " $(groups) " in *\ admin\ *|*\ sudo\ *)
+    if [ -x /usr/bin/sudo ]; then
+	cat <<-EOF
+	To run a command as administrator (user "root"), use "sudo <command>".
+	See "man sudo_root" for details.
+	
+	EOF
+    fi
+    esac
+fi
+
 # if the command-not-found package is installed, use it
 if [ -x /usr/lib/command-not-found -o -x /usr/share/command-not-found/command-not-found ]; then
 	function command_not_found_handle {
diff -pruN 5.2.15-2/debian/patches/deb-bash-config.diff 5.2.15-2ubuntu1/debian/patches/deb-bash-config.diff
--- 5.2.15-2/debian/patches/deb-bash-config.diff	2022-06-01 08:50:51.000000000 +0000
+++ 5.2.15-2ubuntu1/debian/patches/deb-bash-config.diff	2023-01-07 07:34:42.000000000 +0000
@@ -25,6 +25,15 @@
 +#undef DEFAULT_MAIL_DIRECTORY
 --- a/config-top.h
 +++ b/config-top.h
+@@ -63,7 +63,7 @@
+ /* The default value of the PATH variable. */
+ #ifndef DEFAULT_PATH_VALUE
+ #define DEFAULT_PATH_VALUE \
+-  "/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin:."
++  "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+ #endif
+
+ /* If you want to unconditionally set a value for PATH in every restricted
 @@ -97,20 +97,20 @@
  #define DEFAULT_BASHRC "~/.bashrc"
  
diff -pruN 5.2.15-2/debian/skel.bashrc 5.2.15-2ubuntu1/debian/skel.bashrc
--- 5.2.15-2/debian/skel.bashrc	2015-01-28 16:34:29.000000000 +0000
+++ 5.2.15-2ubuntu1/debian/skel.bashrc	2023-01-07 07:34:42.000000000 +0000
@@ -28,7 +28,7 @@ shopt -s checkwinsize
 #shopt -s globstar
 
 # make less more friendly for non-text input files, see lesspipe(1)
-#[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)"
+[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)"
 
 # set variable identifying the chroot you work in (used in the prompt below)
 if [ -z "${debian_chroot:-}" ] && [ -r /etc/debian_chroot ]; then
@@ -79,18 +79,22 @@ if [ -x /usr/bin/dircolors ]; then
     #alias dir='dir --color=auto'
     #alias vdir='vdir --color=auto'
 
-    #alias grep='grep --color=auto'
-    #alias fgrep='fgrep --color=auto'
-    #alias egrep='egrep --color=auto'
+    alias grep='grep --color=auto'
+    alias fgrep='fgrep --color=auto'
+    alias egrep='egrep --color=auto'
 fi
 
 # colored GCC warnings and errors
 #export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01'
 
 # some more ls aliases
-#alias ll='ls -l'
-#alias la='ls -A'
-#alias l='ls -CF'
+alias ll='ls -alF'
+alias la='ls -A'
+alias l='ls -CF'
+
+# Add an "alert" alias for long running commands.  Use like so:
+#   sleep 10; alert
+alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"'
 
 # Alias definitions.
 # You may want to put all your additions into a separate file like
diff -pruN 5.2.15-2/debian/tests/builtin-path.sh 5.2.15-2ubuntu1/debian/tests/builtin-path.sh
--- 5.2.15-2/debian/tests/builtin-path.sh	1970-01-01 00:00:00.000000000 +0000
+++ 5.2.15-2ubuntu1/debian/tests/builtin-path.sh	2023-01-07 07:34:42.000000000 +0000
@@ -0,0 +1,14 @@
+#!/bin/bash
+set -e
+expected_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+actual_path=$(env -u PATH /bin/bash -c 'echo $PATH')
+if [ "$expected_path" == "$actual_path" ]
+then
+    echo OK
+else
+    echo FAIL, expected
+    echo $expected_path
+    echo but got:
+    echo $actual_path
+    exit 1
+fi
diff -pruN 5.2.15-2/debian/tests/control 5.2.15-2ubuntu1/debian/tests/control
--- 5.2.15-2/debian/tests/control	1970-01-01 00:00:00.000000000 +0000
+++ 5.2.15-2ubuntu1/debian/tests/control	2023-01-07 07:34:42.000000000 +0000
@@ -0,0 +1,2 @@
+Tests: builtin-path.sh
+Depends: bash
