diff -u nedit-5.5/debian/control nedit-5.5/debian/control
--- nedit-5.5/debian/control
+++ nedit-5.5/debian/control
@@ -1,8 +1,9 @@
 Source: nedit
 Section: editors
 Priority: optional
-Maintainer: Debian QA Group <packages@qa.debian.org>
-Build-Depends: debhelper (>= 5), lesstif2-dev (>= 1:0.93.94-2), libx11-dev, libxt-dev, x11proto-core-dev, bison
+XSBC-Original-Maintainer: Alexandre Pineau <alexandre.pineau@free.fr>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+Build-Depends: debhelper (>= 5), libmotif-dev, libx11-dev, libxt-dev, x11proto-core-dev, bison, libxp-dev, libxext-dev
 Homepage: http://www.nedit.org/
 Standards-Version: 3.8.0
 
diff -u nedit-5.5/debian/changelog nedit-5.5/debian/changelog
--- nedit-5.5/debian/changelog
+++ nedit-5.5/debian/changelog
@@ -1,3 +1,12 @@
+nedit (1:5.5-3ubuntu1) jaunty; urgency=low
+
+  * Merge from debian unstable, remaining changes (LP: #299318):
+    - Added build-dep to libxext-dev and libxp-dev.
+  * debian/control: Replaced lesstif2 with libmotif-dev, because with Ubuntu's
+    new lesstif2 version nedit doesn't work
+
+ -- Nick Ellery <nick.ellery@ubuntu.com>  Sun, 16 Nov 2008 11:05:43 +0000
+
 nedit (1:5.5-3) unstable; urgency=low
 
   * QA upload
@@ -23,6 +32,31 @@
 
  -- Paul Gevers <paul@climbing.nl>  Sat, 15 Nov 2008 14:04:40 -0600
 
+nedit (1:5.5-2ubuntu3) feisty; urgency=low
+
+  * Added build-dep libxext-dev to fix FTBFS.  Again.
+
+ -- Sarah Hobbs <hobbsee@ubuntu.com>  Mon,  2 Apr 2007 01:18:48 +1000
+
+nedit (1:5.5-2ubuntu2) feisty; urgency=low
+
+  [ ville palo ]
+  * Fixed broken build by adding build-dependency x11proto-print-dev and
+    libxp-dev, closes malone #81103
+
+  [ Sarah Hobbs ]
+  * Updated maintainer details, according to spec.
+
+ -- Sarah Hobbs <hobbsee@ubuntu.com>  Sun,  1 Apr 2007 20:16:44 +1000
+
+nedit (1:5.5-2ubuntu1) edgy; urgency=low
+
+  * Merge from debian unstable.
+  * debian/control: Replaced lesstif2 with libmotif-dev, because with ubuntus
+    new lesstif2 version nedit doesn't work
+
+ -- Stephan Hermann <sh@sourcecode.de>  Wed,  5 Jul 2006 18:02:05 +0200
+
 nedit (1:5.5-2) unstable; urgency=low
 
   * add Nedit icon to menu entry (in debian/menu and debian/rules)
@@ -48,6 +82,12 @@
 
  -- Steinar H. Gunderson <sesse@debian.org>  Sat, 21 Jan 2006 03:07:31 +0100
 
+nedit (1:5.5-1ubuntu1) breezy; urgency=low
+
+  * debian/control: added libxp-dev to build properly
+
+ -- Stephan Hermann <sh@sourcecode.de>  Sat,  8 Oct 2005 20:48:52 +0200
+
 nedit (1:5.5-1) unstable; urgency=low
 
   * New upstream release (Closes: #283086)
@@ -306,0 +347 @@
+