Changeset 4201

Timestamp:

10/07/08 20:35:04 (5 years ago)

Author:

alanbach-guest

Message:

• New upstream bugfix release
  • Refreshed 01_fix-desktop.patch and 05_GParted_Core.cc.diff to be applied correctly.

Location:

pkg/viola/main/gparted/trunk/debian

Files:

• changelog (modified) (1 diff)
• patches/01_fix-desktop.patch (modified) (2 diffs)
• patches/05_GParted_Core.cc.diff (modified) (6 diffs)

pkg/viola/main/gparted/trunk/debian/changelog

@@ +1 @@
+gparted (0.3.9-parsix1) unstable; urgency=low
+
+  * New upstream bugfix release
+  * Refreshed 01_fix-desktop.patch and 05_GParted_Core.cc.diff
+    to be applied correctly.
+
+ -- Alan Baghumian <alan@technotux.org>  Tue, 07 Oct 2008 11:32:32 -0700
+
 gparted (0.3.8-parsix1) unstable; urgency=low
 

pkg/viola/main/gparted/trunk/debian/patches/01_fix-desktop.patch

@@ -1 @@
-diff -urN gparted-0.3.7/gparted.desktop.in.in gparted-0.3.7.new/gparted.desktop.in.in
---- gparted-0.3.7/gparted.desktop.in.in 2008-04-29 16:17:29.000000000 +0200
-+++ gparted-0.3.7.new/gparted.desktop.in.in     2008-05-09 12:16:29.000000000 +0200
+diff -urN gparted-0.3.9/gparted.desktop.in.in gparted-0.3.9.new/gparted.desktop.in.in
+--- gparted-0.3.9/gparted.desktop.in.in 2008-09-12 15:13:55.000000000 -0700
++++ gparted-0.3.9.new/gparted.desktop.in.in     2008-10-07 11:28:50.000000000 -0700
 @@ -1,9 +1,10 @@
  [Desktop Entry]
@@ -7 +7 @@
 +_Name=Partition Editor
  _Comment=Create, reorganize, and delete partitions
--Exec=@installdir@/gparted
+-Exec=@gksuprog@ @installdir@/gparted
 +Exec=su-to-root -X -c /usr/sbin/gparted
  Icon=gparted

pkg/viola/main/gparted/trunk/debian/patches/05_GParted_Core.cc.diff

@@ -1 @@
-diff -urN gparted-0.3.8/src/GParted_Core.cc gparted-0.3.8.new/src/GParted_Core.cc
---- gparted-0.3.8/src/GParted_Core.cc   2008-07-10 20:58:50.000000000 +0200
-+++ gparted-0.3.8.new/src/GParted_Core.cc       2008-07-14 09:42:52.000000000 +0200
-@@ -1741,7 +1741,7 @@
+diff -urN gparted-0.3.9/src/GParted_Core.cc gparted-0.3.9.new/src/GParted_Core.cc
+--- gparted-0.3.9/src/GParted_Core.cc   2008-09-12 15:13:54.000000000 -0700
++++ gparted-0.3.9.new/src/GParted_Core.cc       2008-10-07 11:31:43.000000000 -0700
+@@ -1750,7 +1750,7 @@
  
+        //Benchmark copy times using different block sizes to determine optimal size
         while ( succes &&
-                timer .elapsed() <= smallest_time && 
 -               std::llabs( done ) + N <= length && 
 +               ::llabs( done ) + N <= length && 
-                optimal_blocksize * 2 < N )
+                benchmark_blocksize <= N )
         {
-                if ( done != 0 ) 
-@@ -1785,7 +1785,7 @@
+                timer .reset() ;
+@@ -1792,7 +1792,7 @@
                                     dst_device,
                                     src_start + ( dst_start > src_start ? 0 : done ),
@@ -20 +20 @@
                                     operationdetail,
                                     readonly,
-@@ -1959,7 +1959,7 @@
+@@ -1966,7 +1966,7 @@
         if ( lp_device_src && lp_device_dst && ped_device_open( lp_device_src ) && ped_device_open( lp_device_dst ) )
         {
@@ -29 +29 @@
                 {
                         ped_device_sync( lp_device_dst ) ;
-@@ -1980,7 +1980,7 @@
+@@ -1987,7 +1987,7 @@
                         operationdetail .get_last_child() .add_child( OperationDetail( "", STATUS_NONE ) ) ;
                         
@@ -38 +38 @@
                                 succes = copy_block( lp_device_src,
                                                      lp_device_dst,
-@@ -1995,7 +1995,7 @@
+@@ -2002,7 +2002,7 @@
                                 if ( timer_progress_timeout .elapsed() >= 0.5 )
                                 {
@@ -47 +47 @@
                                                            operationdetail .get_last_child() .get_last_child(),
                                                            readonly ) ;
-@@ -2014,13 +2014,13 @@
+@@ -2021,13 +2021,13 @@
  
                 //final description
@@ -63 +63 @@
                 //close and destroy the devices..
                 ped_device_close( lp_device_src ) ;
-@@ -2047,7 +2047,7 @@
+@@ -2054,7 +2054,7 @@
  {
         if ( blocksize < 0 )