diff -pruN 4.3.17-dev-0+20120621-1/debian/changelog 4.3.17-dev-0+20120621-1ubuntu1/debian/changelog
--- 4.3.17-dev-0+20120621-1/debian/changelog	2012-06-24 20:46:37.000000000 +0000
+++ 4.3.17-dev-0+20120621-1ubuntu1/debian/changelog	2012-07-18 14:43:41.000000000 +0000
@@ -1,3 +1,13 @@
+zsh-beta (4.3.17-dev-0+20120621-1ubuntu1) quantal; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Add "add-shell /bin/zsh" because zsh-beta is already registered
+      as an alternative to zsh, and this is needed to be able to have
+      zsh-beta as the only installed zsh.
+    - Don't set PATH in zshenv any more.
+
+ -- Logan Rosen <logatronico@gmail.com>  Sun, 15 Jul 2012 03:49:38 -0400
+
 zsh-beta (4.3.17-dev-0+20120621-1) unstable; urgency=low
 
   * Update to HEAD.
@@ -22,6 +32,17 @@ zsh-beta (4.3.17-dev-0+20120523-1) unsta
 
  -- Clint Adams <clint@debian.org>  Thu, 24 May 2012 20:06:09 -0400
 
+zsh-beta (4.3.17-dev-0+20120305-1ubuntu1) quantal; urgency=low
+
+  * Manual merge from debian unstable. (due to MoM being broken for this).
+    Remaining changes:
+    - Add "add-shell /bin/zsh" because zsh-beta is already registered
+      as an alternative to zsh, and this is needed to be able to have
+      zsh-beta as the only installed zsh.
+    - Don't set PATH in zshenv any more.
+ 
+ -- Bhavani Shankar <bhavi@ubuntu.com>  Thu, 10 May 2012 15:11:14 -0700
+
 zsh-beta (4.3.17-dev-0+20120305-1) unstable; urgency=low
 
   * Update to HEAD.
@@ -52,6 +73,17 @@ zsh-beta (4.3.13-1) unstable; urgency=lo
 
  -- Clint Adams <clint@debian.org>  Wed, 30 Nov 2011 18:25:03 -0500
 
+zsh-beta (4.3.12-dev-1+20110925-1ubuntu1) precise; urgency=low
+
+  * Manual merge from debian testing. (due to MoM not being updated).
+    Remaining changes:
+    - Add "add-shell /bin/zsh" because zsh-beta is already registered
+      as an alternative to zsh, and this is needed to be able to have
+      zsh-beta as the only installed zsh.
+    - Don't set PATH in zshenv any more.
+
+ -- Bhavani Shankar <bhavi@ubuntu.com>  Mon, 16 May 2011 20:28:06 +0530
+
 zsh-beta (4.3.12-dev-1+20110925-1) unstable; urgency=low
 
   * Update to HEAD.
@@ -119,6 +151,17 @@ zsh-beta (4.3.11-dev-2+20110517-1) unsta
 
  -- Clint Adams <clint@debian.org>  Tue, 17 May 2011 15:20:45 -0400
 
+zsh-beta (4.3.11-dev-1+20110504-1ubuntu1) oneiric; urgency=low
+
+  * Manual merge from debian unstable (due to MoM not being updated).
+    Remaining changes:
+    - Add "add-shell /bin/zsh" because zsh-beta is already registered
+      as an alternative to zsh, and this is needed to be able to have
+      zsh-beta as the only installed zsh.
+    - Don't set PATH in zshenv any more.
+
+ -- Bhavani Shankar <bhavi@ubuntu.com>  Mon, 16 May 2011 20:28:06 +0530
+
 zsh-beta (4.3.11-dev-1+20110504-1) unstable; urgency=low
 
   * Update to HEAD.
@@ -193,12 +236,34 @@ zsh-beta (4.3.10-dev-2+20101110-1) unsta
 
  -- Clint Adams <clint@zsh.org>  Thu, 11 Nov 2010 13:56:23 -0500
 
+zsh-beta (4.3.10-dev-2+20101022-1ubuntu1) natty; urgency=low
+
+  * Manual merge from debian unstable (due to MoM not being updated).
+    Remaining changes:
+    - Add "add-shell /bin/zsh" because zsh-beta is already registered
+      as an alternative to zsh, and this is needed to be able to have
+      zsh-beta as the only installed zsh.
+    - Don't set PATH in zshenv any more
+
+ -- Bhavani Shankar <bhavi@ubuntu.com>  Mon, 01 Nov 2010 18:34:51 +0530
+
 zsh-beta (4.3.10-dev-2+20101022-1) unstable; urgency=low
 
   * Update to HEAD.
 
  -- Clint Adams <schizo@debian.org>  Sun, 24 Oct 2010 17:35:44 -0400
 
+zsh-beta (4.3.10-dev-2+20100908-1ubuntu1) natty; urgency=low
+
+  * Manual merge from debian unstable (due to MoM not being updated).
+    Remaining changes:
+    - Add "add-shell /bin/zsh" because zsh-beta is already registered
+      as an alternative to zsh, and this is needed to be able to have
+      zsh-beta as the only installed zsh.
+    - Don't set PATH in zshenv any more
+ 
+ -- Bhavani Shankar <bhavi@ubuntu.com>  Sun, 17 Oct 2010 09:56:15 +0530
+
 zsh-beta (4.3.10-dev-2+20100908-1) unstable; urgency=low
 
   * Update to HEAD.
@@ -224,6 +289,17 @@ zsh-beta (4.3.10-dev-2+20100810-1) unsta
 
  -- Clint Adams <schizo@debian.org>  Tue, 10 Aug 2010 14:27:03 -0400
 
+zsh-beta (4.3.10-dev-1+20100720-1ubuntu1) maverick; urgency=low
+
+  * Manual merge from debian unstable (due to MoM not being updated)
+    (LP: #592526). Remaining changes:
+    - Add "add-shell /bin/zsh" because zsh-beta is already registered
+      as an alternative to zsh, and this is needed to be able to have
+      zsh-beta as the only installed zsh.
+    - Don't set PATH in zshenv any more
+
+ -- Bhavani Shankar <bhavi@ubuntu.com>  Tue, 27 Jul 2010 11:44:10 +0530
+
 zsh-beta (4.3.10-dev-1+20100720-1) unstable; urgency=low
 
   * Update to HEAD.
@@ -374,6 +450,16 @@ zsh-beta (4.3.10-dev-1+20091104-1) unsta
 
  -- Clint Adams <schizo@debian.org>  Wed, 04 Nov 2009 22:32:26 -0500
 
+zsh-beta (4.3.10-dev-1+20091024-1ubuntu1) lucid; urgency=low
+
+  * Merge from debian testing, remaining changes: LP: #477495
+    - Add "add-shell /bin/zsh" because zsh-beta is already registered
+      as an alternative to zsh, and this is needed to be able to have
+      zsh-beta as the only installed zsh.
+    - Don't set PATH in zshenv any more
+
+ -- Bhavani Shankar <right2bhavi@gmail.com>  Sat, 07 Nov 2009 20:15:19 +0530
+
 zsh-beta (4.3.10-dev-1+20091024-1) unstable; urgency=medium
 
   * Update to HEAD.
@@ -433,6 +519,16 @@ zsh-beta (4.3.10-dev-1+20090730-1) unsta
 
  -- Clint Adams <schizo@debian.org>  Fri, 31 Jul 2009 23:56:58 -0400
 
+zsh-beta (4.3.10-dev-1+20090717-1ubuntu1) karmic; urgency=low
+
+  * Merge from debian unstable, remaining changes: LP: #404571
+    - Add "add-shell /bin/zsh" because zsh-beta is already registered
+      as an alternative to zsh, and this is needed to be able to have
+      zsh-beta as the only installed zsh.
+    - Don't set PATH in zshenv any more
+
+ -- Bhavani Shankar <right2bhavi@gmail.com>  Sat, 25 Jul 2009 20:26:26 +0530
+
 zsh-beta (4.3.10-dev-1+20090717-1) unstable; urgency=low
 
   * Update to HEAD.
@@ -458,6 +554,16 @@ zsh-beta (4.3.10-dev-1+20090605-1) unsta
 
  -- Clint Adams <schizo@debian.org>  Mon, 08 Jun 2009 14:13:10 -0400
 
+zsh-beta (4.3.10-dev-1+20090602-1ubuntu1) karmic; urgency=low
+
+  * Merge from debian unstable, remaining changes: LP: #374728
+    - Add "add-shell /bin/zsh" because zsh-beta is already registered
+      as an alternative to zsh, and this is needed to be able to have
+      zsh-beta as the only installed zsh.
+    - Don't set PATH in zshenv any more
+
+ -- Bhavani Shankar <right2bhavi@gmail.com>  Sun, 07 Jun 2009 11:06:16 +0530
+
 zsh-beta (4.3.10-dev-1+20090602-1) unstable; urgency=medium
 
   * Update to HEAD.
@@ -489,6 +595,16 @@ zsh-beta (4.3.9-dev-3+20090506-1) unstab
 
  -- Clint Adams <schizo@debian.org>  Wed, 06 May 2009 13:28:24 -0400
 
+zsh-beta (4.3.9-dev-3+20090425-1ubuntu1) karmic; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+     - Add "add-shell /bin/zsh" because zsh-beta is already registered
+       as an alternative to zsh, and this is needed to be able to have
+       zsh-beta as the only installed zsh.
+    - Don't set PATH in zshenv any more
+
+ -- Lionel Porcheron <lionel@alveonet.org>  Tue, 28 Apr 2009 11:16:47 +0200
+
 zsh-beta (4.3.9-dev-3+20090425-1) unstable; urgency=low
 
   * Update to HEAD.
@@ -559,6 +675,16 @@ zsh-beta (4.3.9-dev-1+20090225-1) unstab
 
  -- Clint Adams <schizo@debian.org>  Thu, 26 Feb 2009 00:25:56 -0500
 
+zsh-beta (4.3.9-dev-1+20090214-1ubuntu1) jaunty; urgency=low
+
+  * Merge from Debian unstable. Remaining Ubuntu changes:
+    - Add "add-shell /bin/zsh" because zsh-beta is already registered
+       as an alternative to zsh, and this is needed to be able to have
+       zsh-beta as the only installed zsh.
+    - Don't set PATH in zshenv any more
+
+ -- Lionel Porcheron <lionel@alveonet.org>  Wed, 18 Feb 2009 22:14:17 +0100
+
 zsh-beta (4.3.9-dev-1+20090214-1) unstable; urgency=low
 
   * Update to HEAD.
@@ -609,6 +735,16 @@ zsh-beta (4.3.9-dev-1+20081230-1) unstab
 
  -- Clint Adams <schizo@debian.org>  Thu, 01 Jan 2009 16:04:41 -0500
 
+zsh-beta (4.3.9-dev-1+20081218-1ubuntu1) jaunty; urgency=low
+
+  * Merge from Debian unstable. Remaining Ubuntu changes:
+    - Add "add-shell /bin/zsh" because zsh-beta is already registered
+       as an alternative to zsh, and this is needed to be able to have
+       zsh-beta as the only installed zsh.
+    - Don't set PATH in zshenv any more
+
+ -- Lionel Porcheron <lionel@alveonet.org>  Mon, 29 Dec 2008 18:05:04 +0100
+
 zsh-beta (4.3.9-dev-1+20081218-1) unstable; urgency=low
 
   * Update to HEAD.
@@ -627,6 +763,16 @@ zsh-beta (4.3.9-dev-1+20081210-1) unstab
 
  -- Clint Adams <schizo@debian.org>  Wed, 10 Dec 2008 21:38:32 -0500
 
+zsh-beta (4.3.9-dev-1+20081202-1ubuntu1) jaunty; urgency=low
+
+  * Merge from Debian unstable. Remaining Ubuntu changes:
+    - Add "add-shell /bin/zsh" because zsh-beta is already registered
+       as an alternative to zsh, and this is needed to be able to have
+       zsh-beta as the only installed zsh.
+    - Don't set PATH in zshenv any more
+
+ -- Lionel Porcheron <lionel@alveonet.org>  Sun, 07 Dec 2008 23:14:12 +0100
+
 zsh-beta (4.3.9-dev-1+20081202-1) unstable; urgency=low
 
   * Update to HEAD.
@@ -651,6 +797,16 @@ zsh-beta (4.3.9-dev-1+20081118-1) unstab
 
  -- Clint Adams <schizo@debian.org>  Wed, 19 Nov 2008 21:38:17 -0500
 
+zsh-beta (4.3.9-dev-0+20081115-1ubuntu1) jaunty; urgency=low
+
+  * Merge from debian unstable, remaining changes: (LP: #298714)
+    - Add "add-shell /bin/zsh" because zsh-beta is already registered
+       as an alternative to zsh, and this is needed to be able to have
+       zsh-beta as the only installed zsh.
+    - Don't set PATH in zshenv any more
+
+ -- Bhavani Shankar <right2bhavi@gmail.com>  Sun, 16 Nov 2008 20:43:10 +0530
+
 zsh-beta (4.3.9-dev-0+20081115-1) unstable; urgency=medium
 
   * Update to HEAD.
@@ -820,6 +976,17 @@ zsh-beta (4.3.6-dev-0+20080819-1) unstab
 
  -- Clint Adams <schizo@debian.org>  Tue, 19 Aug 2008 07:24:39 -0400
 
+zsh-beta (4.3.6-dev-0+20080723-1ubuntu1) intrepid; urgency=low
+
+  * Merge from Debian unstable. Remaining Ubuntu changes:
+    -  Add "add-shell /bin/zsh" because zsh-beta is already registered
+       as an alternative to zsh, and this is needed to be able to have
+       zsh-beta as the only installed zsh.
+    - Don't set PATH in zshenv any more
+    - Update maintainer in field debian/control.
+
+ -- Lionel Porcheron <lionel.porcheron@ubuntu.com>  Wed, 13 Aug 2008 21:46:39 +0200
+
 zsh-beta (4.3.6-dev-0+20080723-1) unstable; urgency=medium
 
   * Update to HEAD.
@@ -888,6 +1055,17 @@ zsh-beta (4.3.6-dev-0+20080520-1) unstab
 
  -- Clint Adams <schizo@debian.org>  Wed, 21 May 2008 21:36:33 -0400
 
+zsh-beta (4.3.6-dev-0+20080516-1ubuntu1) intrepid; urgency=low
+
+  * Merge from Debian unstable. Remaining Ubuntu changes:
+    -  Add "add-shell /bin/zsh" because zsh-beta is already registered
+       as an alternative to zsh, and this is needed to be able to have
+       zsh-beta as the only installed zsh.
+    - Don't set PATH in zshenv any more
+    - Update maintainer in field debian/control.
+
+ -- Lionel Porcheron <lionel.porcheron@ubuntu.com>  Wed, 21 May 2008 21:15:49 +0200
+
 zsh-beta (4.3.6-dev-0+20080516-1) unstable; urgency=medium
 
   * Update to HEAD.
@@ -1031,6 +1209,17 @@ zsh-beta (4.3.5-dev-0+20080222-1) unstab
 
  -- Clint Adams <schizo@debian.org>  Thu, 21 Feb 2008 22:12:18 -0500
 
+zsh-beta (4.3.5-dev-0+20080211-1ubuntu1) hardy; urgency=low
+
+  * Merge from Debian unstable. Remaining Ubuntu changes:
+    -  Add "add-shell /bin/zsh" because zsh-beta is already registered
+       as an alternative to zsh, and this is needed to be able to have
+       zsh-beta as the only installed zsh.
+    - Don't set PATH in zshenv any more
+    - Update maintainer in field debian/control.
+
+ -- Lionel Porcheron <lionel.porcheron@ubuntu.com>  Thu, 14 Feb 2008 11:39:16 +0100
+
 zsh-beta (4.3.5-dev-0+20080211-1) unstable; urgency=low
 
   * Update to HEAD.
@@ -1043,6 +1232,17 @@ zsh-beta (4.3.5-dev-0+20080209-1) unstab
 
  -- Clint Adams <schizo@debian.org>  Sat, 09 Feb 2008 15:45:05 -0500
 
+zsh-beta (4.3.5-dev-0+20080205-1ubuntu1) hardy; urgency=low
+
+  * Merge from Debian unstable. Remaining Ubuntu changes:
+    -  Add "add-shell /bin/zsh" because zsh-beta is already registered
+       as an alternative to zsh, and this is needed to be able to have
+       zsh-beta as the only installed zsh.
+    - Don't set PATH in zshenv any more
+    - Update maintainer in field debian/control.
+
+ -- Lionel Porcheron <lionel.porcheron@ubuntu.com>  Thu, 07 Feb 2008 11:03:35 +0100
+
 zsh-beta (4.3.5-dev-0+20080205-1) unstable; urgency=medium
 
   * Update to HEAD.
@@ -1056,6 +1256,17 @@ zsh-beta (4.3.5-dev-0+20080202-1) unstab
 
  -- Clint Adams <schizo@debian.org>  Sun, 03 Feb 2008 10:51:40 -0500
 
+zsh-beta (4.3.4-dev-8+20080130-1ubuntu1) hardy; urgency=low
+
+  * Merge from Debian unstable. Remaining Ubuntu changes:
+    -  Add "add-shell /bin/zsh" because zsh-beta is already registered
+       as an alternative to zsh, and this is needed to be able to have
+       zsh-beta as the only installed zsh.
+    - Don't set PATH in zshenv any more
+    - Update maintainer in field debian/control.
+
+ -- Lionel Porcheron <lionel.porcheron@ubuntu.com>  Sat, 02 Feb 2008 19:00:10 +0100
+
 zsh-beta (4.3.4-dev-8+20080130-1) unstable; urgency=low
 
   * Update to HEAD.
@@ -1088,6 +1299,17 @@ zsh-beta (4.3.4-dev-7+20080113-1) unstab
 
  -- Clint Adams <schizo@debian.org>  Mon, 14 Jan 2008 23:16:30 -0500
 
+zsh-beta (4.3.4-dev-7+20080111-1ubuntu1) hardy; urgency=low
+
+  * Merge from Debian unstable. Remaining Ubuntu changes:
+    -  Add "add-shell /bin/zsh" because zsh-beta is already registered
+       as an alternative to zsh, and this is needed to be able to have
+       zsh-beta as the only installed zsh.
+    - Don't set PATH in zshenv any more
+    - Update maintainer in field debian/control.
+
+ -- Lionel Porcheron <lionel.porcheron@ubuntu.com>  Sun, 13 Jan 2008 23:09:21 +0100
+
 zsh-beta (4.3.4-dev-7+20080111-1) unstable; urgency=low
 
   * Update to HEAD.
@@ -1173,6 +1395,17 @@ zsh-beta (4.3.4-dev-4+20071211-1) unstab
 
  -- Clint Adams <schizo@debian.org>  Tue, 11 Dec 2007 10:02:31 -0500
 
+zsh-beta (4.3.4-dev-3+20071210-1ubuntu1) hardy; urgency=low
+
+  * Merge from Debian unstable. Remaining Ubuntu changes:
+    -  Add "add-shell /bin/zsh" because zsh-beta is already registered
+       as an alternative to zsh, and this is needed to be able to have
+       zsh-beta as the only installed zsh.
+    - Don't set PATH in zshenv any more
+    - Update maintainer in field debian/control.
+
+ -- Lionel Porcheron <lionel.porcheron@ubuntu.com>  Tue, 11 Dec 2007 17:51:11 +0100
+
 zsh-beta (4.3.4-dev-3+20071210-1) unstable; urgency=low
 
   * Update to HEAD.
@@ -1234,6 +1467,17 @@ zsh-beta (4.3.4-dev-3+20071201-1) unstab
 
  -- Clint Adams <schizo@debian.org>  Sun, 02 Dec 2007 11:21:19 -0500
 
+zsh-beta (4.3.4-dev-3+20071130-1ubuntu1) hardy; urgency=low
+
+  * Merge from Debian unstable. Remaining Ubuntu changes:
+    -  Add "add-shell /bin/zsh" because zsh-beta is already registered
+       as an alternative to zsh, and this is needed to be able to have
+       zsh-beta as the only installed zsh.
+    - Don't set PATH in zshenv any more
+    - Update maintainer in field debian/control.
+
+ -- Lionel Porcheron <lionel.porcheron@ubuntu.com>  Sun, 02 Dec 2007 11:30:56 +0100
+
 zsh-beta (4.3.4-dev-3+20071130-1) unstable; urgency=low
 
   * Update to HEAD.
@@ -1283,6 +1527,17 @@ zsh-beta (4.3.4-dev-1+20071118-1) unstab
 
  -- Clint Adams <schizo@debian.org>  Sun, 18 Nov 2007 15:59:29 -0500
 
+zsh-beta (4.3.4-dev-1+20071112-1ubuntu1) hardy; urgency=low
+
+  * Merge from Debian unstable. Remaining Ubuntu changes:
+    -  Add "add-shell /bin/zsh" because zsh-beta is already registered
+       as an alternative to zsh, and this is needed to be able to have
+       zsh-beta as the only installed zsh.
+    - Don't set PATH in zshenv any more
+    - Update maintainer in field debian/control.
+
+ -- Lionel Porcheron <lionel.porcheron@ubuntu.com>  Thu, 22 Nov 2007 00:20:05 +0100
+
 zsh-beta (4.3.4-dev-1+20071112-1) unstable; urgency=low
 
   * Update to HEAD.
@@ -1295,6 +1550,17 @@ zsh-beta (4.3.4-dev-1+20071101-1) unstab
 
  -- Clint Adams <schizo@debian.org>  Sun, 04 Nov 2007 10:55:31 -0500
 
+zsh-beta (4.3.4-dev-1+20071030-1ubuntu1) hardy; urgency=low
+
+  * Merge from Debian unstable. Remaining Ubuntu changes:
+    -  Add "add-shell /bin/zsh" because zsh-beta is already registered
+       as an alternative to zsh, and this is needed to be able to have
+       zsh-beta as the only installed zsh.
+    - Don't set PATH in zshenv any more
+    - Update maintainer in field debian/control.
+
+ -- Lionel Porcheron <lionel.porcheron@ubuntu.com>  Wed, 07 Nov 2007 21:17:29 +0100
+
 zsh-beta (4.3.4-dev-1+20071030-1) unstable; urgency=low
 
   * Update to HEAD.
@@ -1313,12 +1579,34 @@ zsh-beta (4.3.4-dev-1+20071028-1) unstab
 
  -- Clint Adams <schizo@debian.org>  Sun, 28 Oct 2007 19:56:07 -0400
 
+zsh-beta (4.3.4-dev-1+20071025-1ubuntu1) hardy; urgency=low
+
+  * Merge from Debian unstable. Remaining Ubuntu changes:
+    -  Add "add-shell /bin/zsh" because zsh-beta is already registered
+       as an alternative to zsh, and this is needed to be able to have
+       zsh-beta as the only installed zsh.
+    - Don't set PATH in zshenv any more
+    - Update maintainer in field debian/control.
+
+ -- Lionel Porcheron <lionel.porcheron@ubuntu.com>  Mon, 29 Oct 2007 11:09:37 +0100
+
 zsh-beta (4.3.4-dev-1+20071025-1) unstable; urgency=low
 
   * Update to HEAD.
 
  -- Clint Adams <schizo@debian.org>  Thu, 25 Oct 2007 10:03:07 -0400
 
+zsh-beta (4.3.4-dev-1+20071020-1ubuntu1) hardy; urgency=low
+
+  * Merge from Debian unstable. Remaining Ubuntu changes:
+    -  Add "add-shell /bin/zsh" because zsh-beta is already registered
+       as an alternative to zsh, and this is needed to be able to have
+       zsh-beta as the only installed zsh.
+    - Don't set PATH in zshenv any more
+    - Update maintainer in field debian/control.
+
+ -- Lionel Porcheron <lionel.porcheron@ubuntu.com>  Tue, 23 Oct 2007 21:03:15 +0200
+
 zsh-beta (4.3.4-dev-1+20071020-1) unstable; urgency=low
 
   * Update to HEAD.
@@ -1418,54 +1706,153 @@ zsh-beta (4.3.4-dev-0+20070816-1) unstab
 
  -- Clint Adams <schizo@debian.org>  Thu, 16 Aug 2007 19:25:36 -0400
 
+zsh-beta (4.3.4-dev-0+20070809-1ubuntu1) gutsy; urgency=low
+
+  * Merge from Debian unstable. Remaining Ubuntu changes:
+    -  Add "add-shell /bin/zsh" because zsh-beta is already registered
+       as an alternative to zsh, and this is needed to be able to have
+       zsh-beta as the only installed zsh.
+    - Don't set PATH in zshenv any more
+    - Update maintainer in field debian/control.
+
+ -- Lionel Porcheron <lionel.porcheron@ubuntu.com>  Sun, 12 Aug 2007 13:47:01 +0200
+
 zsh-beta (4.3.4-dev-0+20070809-1) unstable; urgency=medium
 
   * Update to HEAD.
 
  -- Clint Adams <schizo@debian.org>  Sat, 11 Aug 2007 00:57:11 -0400
 
+zsh-beta (4.3.4-dev-0+20070730-1ubuntu1) gutsy; urgency=low
+
+  * Merge from Debian unstable. Remaining Ubuntu changes:
+    -  Add "add-shell /bin/zsh" because zsh-beta is already registered
+       as an alternative to zsh, and this is needed to be able to have
+       zsh-beta as the only installed zsh.
+    - Don't set PATH in zshenv any more
+    - Update maintainer in field debian/control.
+
+ -- Lionel Porcheron <lionel.porcheron@ubuntu.com>  Wed, 01 Aug 2007 08:04:22 +0200
+
 zsh-beta (4.3.4-dev-0+20070730-1) unstable; urgency=low
 
   * Update to HEAD.
 
  -- Clint Adams <schizo@debian.org>  Mon, 30 Jul 2007 20:02:31 -0400
 
+zsh-beta (4.3.4-dev-0+20070725-1ubuntu1) gutsy; urgency=low
+
+  * Merge from Debian unstable. Remaining Ubuntu changes:
+    -  Add "add-shell /bin/zsh" because zsh-beta is already registered
+       as an alternative to zsh, and this is needed to be able to have
+       zsh-beta as the only installed zsh.
+    - Don't set PATH in zshenv any more
+    - Update maintainer in field debian/control.
+
+ -- Lionel Porcheron <lionel.porcheron@ubuntu.com>  Thu, 26 Jul 2007 12:08:13 +0200
+
 zsh-beta (4.3.4-dev-0+20070725-1) unstable; urgency=medium
 
   * Update to HEAD.
 
  -- Clint Adams <schizo@debian.org>  Wed, 25 Jul 2007 11:14:48 -0400
 
+zsh-beta (4.3.4-dev-0+20070720-1ubuntu1) gutsy; urgency=low
+
+  * Merge from Debian unstable. Remaining Ubuntu changes:
+    -  Add "add-shell /bin/zsh" because zsh-beta is already registered
+       as an alternative to zsh, and this is needed to be able to have
+       zsh-beta as the only installed zsh.
+    - Don't set PATH in zshenv any more
+    - Update maintainer in field debian/control.
+
+ -- Lionel Porcheron <lionel.porcheron@ubuntu.com>  Mon, 23 Jul 2007 09:52:51 +0200
+
 zsh-beta (4.3.4-dev-0+20070720-1) unstable; urgency=low
 
   * Update to HEAD.
 
  -- Clint Adams <schizo@debian.org>  Sun, 22 Jul 2007 07:47:43 -0400
 
+zsh-beta (4.3.4-dev-0+20070713-1ubuntu1) gutsy; urgency=low
+
+  * Merge from Debian unstable. Remaining Ubuntu changes:
+    -  Add "add-shell /bin/zsh" because zsh-beta is already registered
+       as an alternative to zsh, and this is needed to be able to have
+       zsh-beta as the only installed zsh.
+    - Don't set PATH in zshenv any more
+    - Update maintainer in field debian/control.
+
+ -- Lionel Porcheron <lionel.porcheron@ubuntu.com>  Mon, 16 Jul 2007 00:17:24 +0200
+
 zsh-beta (4.3.4-dev-0+20070713-1) unstable; urgency=medium
 
   * Update to HEAD.
 
  -- Clint Adams <schizo@debian.org>  Sun, 15 Jul 2007 10:03:04 -0400
 
+zsh-beta (4.3.4-dev-0+20070711-1ubuntu1) gutsy; urgency=low
+
+  * Merge from Debian unstable. Remaining Ubuntu changes:
+    -  Add "add-shell /bin/zsh" because zsh-beta is already registered
+       as an alternative to zsh, and this is needed to be able to have
+       zsh-beta as the only installed zsh.
+    - Don't set PATH in zshenv any more
+    - Update maintainer in field debian/control.
+
+ -- Lionel Porcheron <lionel.porcheron@ubuntu.com>  Fri, 13 Jul 2007 12:10:06 +0200
+
 zsh-beta (4.3.4-dev-0+20070711-1) unstable; urgency=low
 
   * Update to HEAD.
 
  -- Clint Adams <schizo@debian.org>  Wed, 11 Jul 2007 22:47:10 -0400
 
+zsh-beta (4.3.4-dev-0+20070706-1ubuntu1) gutsy; urgency=low
+
+  * Merge from Debian unstable. Remaining Ubuntu changes:
+    -  Add "add-shell /bin/zsh" because zsh-beta is already registered
+       as an alternative to zsh, and this is needed to be able to have
+       zsh-beta as the only installed zsh.
+    - Don't set PATH in zshenv any more
+    - Update maintainer in field debian/control.
+
+ -- Lionel Porcheron <lionel.porcheron@ubuntu.com>  Sun, 08 Jul 2007 17:09:18 +0200
+
 zsh-beta (4.3.4-dev-0+20070706-1) unstable; urgency=low
 
   * Update to HEAD.
 
  -- Clint Adams <schizo@debian.org>  Sat, 07 Jul 2007 15:11:22 -0400
 
+zsh-beta (4.3.4-dev-0+20070701-1ubuntu1) gutsy; urgency=low
+
+  * Merge from Debian unstable. Remaining Ubuntu changes:
+    -  Add "add-shell /bin/zsh" because zsh-beta is already registered
+       as an alternative to zsh, and this is needed to be able to have
+       zsh-beta as the only installed zsh.
+    - Don't set PATH in zshenv any more
+    - Update maintainer in field debian/control.
+
+ -- Lionel Porcheron <lionel.porcheron@ubuntu.com>  Tue, 03 Jul 2007 00:00:23 +0200
+
 zsh-beta (4.3.4-dev-0+20070701-1) unstable; urgency=low
 
   * Update to HEAD.
 
  -- Clint Adams <schizo@debian.org>  Sun, 01 Jul 2007 18:53:46 -0400
 
+zsh-beta (4.3.4-dev-0+20070628-1ubuntu1) gutsy; urgency=low
+
+  * Merge from Debian unstable. Remaining Ubuntu changes:
+    -  Add "add-shell /bin/zsh" because zsh-beta is already registered
+       as an alternative to zsh, and this is needed to be able to have
+       zsh-beta as the only installed zsh.
+    - Don't set PATH in zshenv any more
+    - Update maintainer in field debian/control.
+
+ -- Lionel Porcheron <lionel.porcheron@ubuntu.com>  Sat, 30 Jun 2007 00:52:26 +0200
+
 zsh-beta (4.3.4-dev-0+20070628-1) unstable; urgency=low
 
   * Update to HEAD.
@@ -1484,12 +1871,34 @@ zsh-beta (4.3.4-dev-0+20070624-1) unstab
 
  -- Clint Adams <schizo@debian.org>  Sun, 24 Jun 2007 23:35:39 -0400
 
+zsh-beta (4.3.4-dev-0+20070614-1ubuntu1) gutsy; urgency=low
+
+  * Merge from Debian unstable. Remaining Ubuntu changes:
+    -  Add "add-shell /bin/zsh" because zsh-beta is already registered
+       as an alternative to zsh, and this is needed to be able to have
+       zsh-beta as the only installed zsh.
+    - Don't set PATH in zshenv any more
+    - Update maintainer in field debian/control.
+
+ -- Lionel Porcheron <lionel.porcheron@ubuntu.com>  Fri, 15 Jun 2007 12:46:32 +0200
+
 zsh-beta (4.3.4-dev-0+20070614-1) unstable; urgency=low
 
   * Update to HEAD.
 
  -- Clint Adams <schizo@debian.org>  Thu, 14 Jun 2007 16:22:38 -0400
 
+zsh-beta (4.3.4-dev-0+20070611-1ubuntu1) gutsy; urgency=low
+
+  * Merge from Debian unstable, remaining changes:
+    -  Add "add-shell /bin/zsh" because zsh-beta is already registered
+       as an alternative to zsh, and this is needed to be able to have
+       zsh-beta as the only installed zsh. (LP: #67900)
+    - Don't set PATH in zshenv any more
+    - Update maintainer in field debian/control.
+
+ -- Michele Angrisano <micheleangrisano@ubuntu.com>  Wed, 13 Jun 2007 14:13:03 +0200
+
 zsh-beta (4.3.4-dev-0+20070611-1) unstable; urgency=low
 
   * Update to HEAD.
@@ -1586,6 +1995,19 @@ zsh-beta (4.3.4-dev-0+20070501-1) unstab
 
  -- Clint Adams <schizo@debian.org>  Tue, 01 May 2007 10:06:19 -0400
 
+zsh-beta (4.3.4-dev-0+20070430-1ubuntu1) gutsy; urgency=low
+
+  * Merge from debian unstable
+  * kept changes:
+     - debian/postinst:
+       Add "add-shell /bin/zsh" because zsh-beta is already registered
+       as an alternative to zsh, and this is needed to be able to have
+       zsh-beta as the only installed zsh. (LP: #67900)
+     - Don't set PATH in zshenv any more
+  * debian/rules: update maintainer field
+ 
+ -- Reinhard Tartler <siretart@tauware.de>  Tue,  1 May 2007 16:09:04 +0200
+
 zsh-beta (4.3.4-dev-0+20070430-1) unstable; urgency=low
 
   * Update to HEAD.
@@ -1760,6 +2182,23 @@ zsh-beta (4.3.2-dev-1+20070203-1) unstab
 
  -- Clint Adams <schizo@debian.org>  Sat,  3 Feb 2007 22:10:49 -0500
 
+zsh-beta (4.3.2-dev-1+20070129-1ubuntu2) feisty; urgency=low
+
+  * debian/postinst:
+    - Add "add-shell /bin/zsh" because zsh-beta is already registered
+      as an alternative to zsh, and this is needed to be able to have
+      zsh-beta as the only installed zsh. (LP: #67900)
+  * debian/rules: change the maintainer address.
+
+ -- Timo Aaltonen <tepsipakki@ubuntu.com>  Tue, 13 Mar 2007 17:12:55 +0200
+
+zsh-beta (4.3.2-dev-1+20070129-1ubuntu1) feisty; urgency=low
+
+  * Merge from Debian unstable. Ubuntu change:
+     - Don't set PATH in zshenv any more
+
+ -- Adrien Cunin <adri2000@gmail.com>  Thu,  1 Feb 2007 23:41:04 +0100
+
 zsh-beta (4.3.2-dev-1+20070129-1) unstable; urgency=low
 
   * Update to HEAD.
@@ -1802,6 +2241,13 @@ zsh-beta (4.3.2-dev-1+20070109-1) unstab
 
  -- Clint Adams <schizo@debian.org>  Fri, 12 Jan 2007 18:09:15 -0500
 
+zsh-beta (4.3.2-dev-1+20070105-1ubuntu1) feisty; urgency=low
+
+  * Merge from Debian unstable, remaining changes:
+    - Don't set PATH in zshenv any more.
+
+ -- ville palo <vi64pa@gmail.com>  Sun, 07 Jan 2007 09:23:56 +0000
+
 zsh-beta (4.3.2-dev-1+20070105-1) unstable; urgency=low
 
   * Update to HEAD.
@@ -1814,6 +2260,15 @@ zsh-beta (4.3.2-dev-1+20070102-1) unstab
 
  -- Clint Adams <schizo@debian.org>  Wed,  3 Jan 2007 18:52:38 -0500
 
+zsh-beta (4.3.2-dev-1+20061217-1ubuntu1) feisty; urgency=low
+
+  * Re-sync with Debian. Kept the following change:
+  * zsh-beta (4.3.0-dev-2+20060113-2ubuntu1) dapper; urgency=low
+    * Don't set PATH in zshenv any more.
+  *  -- Tollef Fog Heen <tfheen@ubuntu.com>  Wed, 18 Jan 2006 10:54:53 +0100
+
+ -- Barry deFreese <bddebian@comcast.net>  Mon, 18 Dec 2006 21:35:37 -0500
+
 zsh-beta (4.3.2-dev-1+20061217-1) unstable; urgency=low
 
   * Update to HEAD.
@@ -4006,3 +4461,4 @@ zsh (3.0.4-1) unstable; urgency=low
   * Added Joey Hess's compctl example for dpkg to /usr/doc/zsh/examples
 
  -- Clint Adams <schizo@debian.org>  Thu, 24 Jul 1997 13:42:49 -0400
+
diff -pruN 4.3.17-dev-0+20120621-1/debian/control 4.3.17-dev-0+20120621-1ubuntu1/debian/control
--- 4.3.17-dev-0+20120621-1/debian/control	2012-06-24 20:46:37.000000000 +0000
+++ 4.3.17-dev-0+20120621-1ubuntu1/debian/control	2012-07-18 14:43:41.000000000 +0000
@@ -2,7 +2,8 @@ Source: zsh-beta
 Section: shells
 Priority: optional
 Build-Depends: yodl, texinfo, groff-base, bsdmainutils, libncursesw5-dev, texi2html (>= 1.76-2), libcap-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libpcre3-dev, libgdbm-dev
-Maintainer: Clint Adams <clint@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Clint Adams <clint@debian.org>
 Standards-Version: 3.9.2
 
 Package: zsh-beta
diff -pruN 4.3.17-dev-0+20120621-1/debian/postinst 4.3.17-dev-0+20120621-1ubuntu1/debian/postinst
--- 4.3.17-dev-0+20120621-1/debian/postinst	2012-06-24 20:46:37.000000000 +0000
+++ 4.3.17-dev-0+20120621-1ubuntu1/debian/postinst	2012-07-18 14:43:41.000000000 +0000
@@ -22,6 +22,6 @@ update-alternatives --install /bin/zsh z
 mkdir -m2775 -p /usr/local/share/zsh-beta/site-functions && chown root:staff \
                /usr/local/share/zsh-beta/site-functions || true
 
-add-shell /bin/zsh-beta
+add-shell /bin/zsh
 
 exit 0
diff -pruN 4.3.17-dev-0+20120621-1/debian/zshenv 4.3.17-dev-0+20120621-1ubuntu1/debian/zshenv
--- 4.3.17-dev-0+20120621-1/debian/zshenv	2012-06-24 20:46:37.000000000 +0000
+++ 4.3.17-dev-0+20120621-1ubuntu1/debian/zshenv	2012-07-18 14:43:41.000000000 +0000
@@ -12,7 +12,3 @@
 #
 # Global Order: zshenv, zprofile, zshrc, zlogin
 
-if [[ -z "$PATH" || "$PATH" == "/bin:/usr/bin" ]]
-then
-	export PATH="/usr/local/bin:/usr/bin:/bin:/usr/games"
-fi
