diff -Nru directfb-1.2.10.0/debian/changelog directfb-1.2.10.0/debian/changelog
--- directfb-1.2.10.0/debian/changelog	2010-06-30 23:41:41.000000000 +0530
+++ directfb-1.2.10.0/debian/changelog	2010-07-03 12:42:03.000000000 +0530
@@ -1,3 +1,10 @@
+directfb (1.2.10.0-4ubuntu1) maverick; urgency=low
+
+  * Merge from debian unstable.(LP: #601300) Remaining changes:
+    - build using libjpeg62-dev rather than libjpeg-dev
+
+ -- Bhavani Shankar <bhavi@ubuntu.com>  Sat, 03 Jul 2010 12:41:19 +0530
+
 directfb (1.2.10.0-4) unstable; urgency=low
 
   * Drop libmpeg3-dev build-dependency/dependency. (Closes: #507527)
@@ -6,6 +13,15 @@
 
  -- Fathi Boudra <fabo@debian.org>  Wed, 30 Jun 2010 20:50:02 +0300
 
+directfb (1.2.10.0-3ubuntu1) maverick; urgency=low
+
+  * Resync on Debian
+  * debian/control:
+    - build using libjpeg62-dev rather than libjpeg-dev
+    - don't use libmpeg
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Tue, 25 May 2010 12:16:22 +0200
+
 directfb (1.2.10.0-3) unstable; urgency=low
 
   * Add missing Conflicts against libdirectfb-1.2-0 on armel architecture.
+
diff -Nru directfb-1.2.10.0/debian/control directfb-1.2.10.0/debian/control
--- directfb-1.2.10.0/debian/control	2010-06-30 23:40:37.000000000 +0530
+++ directfb-1.2.10.0/debian/control	2010-07-03 12:41:13.000000000 +0530
@@ -1,9 +1,10 @@
 Source: directfb
 Priority: optional
-Maintainer: Debian DirectFB Team <pkg-directfb-devel@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian DirectFB Team <pkg-directfb-devel@lists.alioth.debian.org>
 Uploaders: Fathi Boudra <fabo@debian.org>, Otavio Salvador <otavio@debian.org>, Luis Mondesi <lemsx1@gmail.com>
 Build-Depends: debhelper (>= 7.4.15), autoconf, automake,
- libtool, pkg-config, libfreetype6-dev, libjpeg-dev, libpng12-dev,
+ libtool, pkg-config, libfreetype6-dev, libjpeg62-dev, libpng12-dev,
  libts-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
  zlib1g-dev, x11proto-core-dev, libx11-dev, libxext-dev,
  libsysfs-dev [alpha amd64 arm armel avr32 hppa i386 ia64 m68k mips mipsel powerpc ppc64 s390 sh4]
@@ -82,7 +83,7 @@
 Architecture: any
 Depends: libdirectfb-1.2-9 (= ${binary:Version}),
  ${shlibs:Depends}, ${misc:Depends},
- libdirectfb-extra, libfreetype6-dev, libjpeg-dev, libpng12-dev,
+ libdirectfb-extra, libfreetype6-dev, libjpeg62-dev, libpng12-dev,
  zlib1g-dev (>= 1:1.1.3), x11proto-core-dev, libx11-dev, libxext-dev,
  libsysfs-dev
 Description: direct frame buffer graphics library - development files