diff -ruN gparted-0.3.9/debian/changelog gparted-0.4.2/debian/changelog
--- gparted-0.3.9/debian/changelog
+++ gparted-0.4.2/debian/changelog
@@ -1,3 +1,29 @@
+gparted (0.4.2-0ubuntu1) jaunty; urgency=low
+
+  * New upstream release (LP: #305280)
+    + Added support for ext4 file system (LP: #137872)
+      - Support for ext4 is built into version 2.6.28 of the Linux kernel
+      - e2fsprogs version 1.41.0 or higher required
+    + Fixed bug in german translation (LP: #45449)
+    + Fixed 'fails to recognize newly created swap partition' (LP: #137700)(LP: #114713)
+    + Reduced file system information disk reads to improve performance (LP: #311470)
+
+  * debian/patches
+    + dropped 05_GParted_Core.cc.diff, merged upstream
+    + refreshed 10_dev_mapper.patch to be applied correctly
+    + refreshed 01_fix-desktop.patch to be applied correctly
+
+  * debian/control
+    + Added intltool to Build-Depends        
+
+  * debian/rules
+    + Added --with-help-dir= to build help manual in /usr/share/gnome/help
+
+  * debian/watch
+    + Fixed debian-watch-file-should-use-sf-redirector lintian warning.
+
+ -- Surfaz Gemon Meme <surfaz28@gmail.com>  Fri, 07 Feb 2009 15:40:03 +0100
+
 gparted (0.3.9-3ubuntu1) jaunty; urgency=low
 
   [ Pedro Fragoso ]
diff -ruN gparted-0.3.9/debian/control gparted-0.4.2/debian/control
--- gparted-0.3.9/debian/control
+++ gparted-0.4.2/debian/control
@@ -13,7 +13,8 @@
                gnome-doc-utils,
                rarian-compat,
                libgtkmm-2.4-dev,
-               libparted1.8-dev
+               libparted1.8-dev,
+               intltool
 Standards-Version: 3.8.0
 Homepage: http://gparted.sourceforge.net
 
diff -ruN gparted-0.3.9/debian/patches/01_fix-desktop.patch gparted-0.4.2/debian/patches/01_fix-desktop.patch
--- gparted-0.3.9/debian/patches/01_fix-desktop.patch
+++ gparted-0.4.2/debian/patches/01_fix-desktop.patch
@@ -1,17 +1,16 @@
-diff -urN gparted-0.3.9/gparted.desktop.in.in gparted-0.3.9/gparted.desktop.in.in
---- gparted-0.3.9/gparted.desktop.in.in
-+++ gparted-0.3.9/gparted.desktop.in.in
+--- a/gparted.desktop.in.in
++++ b/gparted.desktop.in.in
 @@ -1,9 +1,10 @@
  [Desktop Entry]
 -_Name=GParted Partition Editor
 +_Name=Partition Editor
  _Comment=Create, reorganize, and delete partitions
--Exec=@gksuprog@ @installdir@/gparted
+-Exec=@gksuprog@ @installdir@/gparted %f
 +Exec=gksu /usr/sbin/gparted
  Icon=gparted
  Terminal=false
  Type=Application
--Categories=GNOME;System;
+-Categories=GNOME;System;Filesystem;
 +Categories=GNOME;System;Settings;
  StartupNotify=true
 +X-Ubuntu-Gettext-Domain=gparted
diff -ruN gparted-0.3.9/debian/patches/05_GParted_Core.cc.diff gparted-0.4.2/debian/patches/05_GParted_Core.cc.diff
--- gparted-0.3.9/debian/patches/05_GParted_Core.cc.diff
+++ gparted-0.4.2/debian/patches/05_GParted_Core.cc.diff
@@ -1,72 +0,0 @@
---- gparted-0.3.9/src/GParted_Core.cc	2008-09-13 08:13:54.000000000 +1000
-+++ gparted-0.3.9/src/GParted_Core.cc	2008-09-16 20:42:31.000000000 +1000
-@@ -1750,7 +1750,7 @@ bool GParted_Core::copy_filesystem( cons
- 
- 	//Benchmark copy times using different block sizes to determine optimal size
- 	while ( succes &&
--		std::llabs( done ) + N <= length && 
-+		llabs( done ) + N <= length &&
- 		benchmark_blocksize <= N )
- 	{
- 		timer .reset() ;
-@@ -1792,7 +1792,7 @@ bool GParted_Core::copy_filesystem( cons
- 		      	    	    dst_device,
- 		      	    	    src_start + ( dst_start > src_start ? 0 : done ),
- 		      	    	    dst_start + ( dst_start > src_start ? 0 : done ),
--		      	    	    length - std::llabs( done ), 
-+		      	    	    length - ::llabs( done ), 
- 		      	    	    optimal_blocksize,
- 		      	    	    operationdetail,
- 			    	    readonly,
-@@ -1966,7 +1966,7 @@ bool GParted_Core::copy_blocks( const Gl
- 	if ( lp_device_src && lp_device_dst && ped_device_open( lp_device_src ) && ped_device_open( lp_device_dst ) )
- 	{
- 		Glib::ustring error_message ;
--		buf = static_cast<char *>( malloc( std::llabs( blocksize ) * 512 ) ) ;
-+		buf = static_cast<char *>( malloc( ::llabs( blocksize ) * 512 ) ) ;
- 		if ( buf )
- 		{
- 			ped_device_sync( lp_device_dst ) ;
-@@ -1987,7 +1987,7 @@ bool GParted_Core::copy_blocks( const Gl
- 			operationdetail .get_last_child() .add_child( OperationDetail( "", STATUS_NONE ) ) ;
- 			
- 			Glib::Timer timer_progress_timeout, timer_total ;
--			while( succes && std::llabs( done ) < length )
-+			while( succes && ::llabs( done ) < length )
- 			{
- 				succes = copy_block( lp_device_src,
- 						     lp_device_dst,
-@@ -2002,7 +2002,7 @@ bool GParted_Core::copy_blocks( const Gl
- 				if ( timer_progress_timeout .elapsed() >= 0.5 )
- 				{
- 					set_progress_info( length,
--							   std::llabs( done + blocksize ),
-+							   ::llabs( done + blocksize ),
- 							   timer_total,
- 							   operationdetail .get_last_child() .get_last_child(),
- 							   readonly ) ;
-@@ -2021,13 +2021,13 @@ bool GParted_Core::copy_blocks( const Gl
- 
- 		//final description
- 		operationdetail .get_last_child() .get_last_child() .set_description( 
--			String::ucompose( readonly ? _("%1 of %2 read") : _("%1 of %2 copied"), std::llabs( done ), length ), FONT_ITALIC ) ;
-+			String::ucompose( readonly ? _("%1 of %2 read") : _("%1 of %2 copied"), ::llabs( done ), length ), FONT_ITALIC ) ;
- 		
- 		if ( ! succes && ! error_message .empty() )
- 			operationdetail .get_last_child() .add_child( 
- 				OperationDetail( error_message, STATUS_NONE, FONT_ITALIC ) ) ;
- 		
--		total_done += std::llabs( done ) ;
-+		total_done += ::llabs( done ) ;
- 	
- 		//close and destroy the devices..
- 		ped_device_close( lp_device_src ) ;
-@@ -2054,7 +2054,7 @@ bool GParted_Core::copy_block( PedDevice
- {
- 	if ( blocksize < 0 )
- 	{
--		blocksize = std::llabs( blocksize ) ;
-+		blocksize = ::llabs( blocksize ) ;
- 		offset_src -= ( blocksize -1 ) ;
- 		offset_dst -= ( blocksize -1 ) ;
- 	}
diff -ruN gparted-0.3.9/debian/patches/10_dev_mapper.patch gparted-0.4.2/debian/patches/10_dev_mapper.patch
--- gparted-0.3.9/debian/patches/10_dev_mapper.patch
+++ gparted-0.4.2/debian/patches/10_dev_mapper.patch
@@ -7,22 +7,7 @@
 ===================================================================
 --- a/src/GParted_Core.cc
 +++ b/src/GParted_Core.cc
-@@ -38,8 +38,14 @@
- #include "../include/reiser4.h"
- #include "../include/ufs.h"
- 
-+#include <set>
- #include <cerrno>
-+#include <cstring>
- #include <sys/statvfs.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <unistd.h>
-+#include <dirent.h>
- 
- std::vector<Glib::ustring> libparted_messages ; //see ped_exception_handler()
- 
-@@ -156,6 +162,51 @@
+@@ -187,6 +187,52 @@
      			}
      		}
      		proc_partitions .close() ;
@@ -71,6 +56,7 @@
 +    			}
 +    			closedir( mapper_dir ) ;
 +    		}
++
      	}
      	else
      	{
diff -ruN gparted-0.3.9/debian/patches/series gparted-0.4.2/debian/patches/series
--- gparted-0.3.9/debian/patches/series
+++ gparted-0.4.2/debian/patches/series
@@ -1,3 +1,2 @@
 01_fix-desktop.patch
-05_GParted_Core.cc.diff
-10_dev_mapper.patch 
+10_dev_mapper.patch
diff -ruN gparted-0.3.9/debian/rules gparted-0.4.2/debian/rules
--- gparted-0.3.9/debian/rules
+++ gparted-0.4.2/debian/rules
@@ -15,7 +15,7 @@
 config.status: configure
 	dh_testdir
 	rm -rf .pc
-	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
+	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --with-help-dir=\$${prefix}/share/gnome/help
 
 build: patch build-stamp
 
diff -ruN gparted-0.3.9/debian/watch gparted-0.4.2/debian/watch
--- gparted-0.3.9/debian/watch
+++ gparted-0.4.2/debian/watch
@@ -1,3 +1,3 @@
 version=3
-http://heanet.dl.sourceforge.net/sourceforge/gparted/gparted-(.*)\.tar\.bz2
+http://sf.net/gparted/gparted-(.+)\.tar\.gz