Merge lp:~lihow731/ubuntu/saucy/gnome-calculator/fix-for-1209326 into lp:ubuntu/saucy/gnome-calculator

[Leon Liao]

I propose to merge this patch for fix lp: BUG#1209326.

[Jamie Strandboge (jdstrand)]

Thanks for your patch! A few comments:
 * your merge request was made with patches applied. This includes the .pc directory and code changes. Since you are adding a patch to debian/patches, it is easier for reviewers if you 'quilt pop -a' before submitting the request. You might find when working on SRUs it is easier to provide a debdiff in the bug
 * in debian/changelog, 1:3.8.2-1ubuntu5ppa should be 1:3.8.2-1ubuntu4.1
 * in debian/changelog, saucy should be 'saucy-proposed'
 * debian/patches/fix-the-undo-ctrl-z-bug.patch has a lot of information, but it isn't quite right. It should focus on upstream commits (if appropriate) and reference the Ubuntu bug. Eg:
Origin: <upstream commit>
Description: Fix the undo/ctrl-z bug
 Due to the code structure, the undo stack do not keep the last answer.
 We use another variable to keep it.
Bug-Ubuntu: https://launchpad.net/bugs/1209326

If there is no upstream commit, you should use 'Author: Person Who <email address hidden>'. The DEP-3 comments that are in your patch were unclear, especially in light of the boiler text that was included.

review: Needs Fixing

[Leon Liao (lihow731)]

Hi Jamie,

I want to correct something in your comments.
Do I need to push the commit again with --overwrite option?
Or, how can I do?

Best regards,
Leon

2014-01-25 Jamie Strandboge <email address hidden>

> Review: Needs Fixing
>
> Thanks for your patch! A few comments:
> * your merge request was made with patches applied. This includes the .pc
> directory and code changes. Since you are adding a patch to debian/patches,
> it is easier for reviewers if you 'quilt pop -a' before submitting the
> request. You might find when working on SRUs it is easier to provide a
> debdiff in the bug
> * in debian/changelog, 1:3.8.2-1ubuntu5ppa should be 1:3.8.2-1ubuntu4.1
> * in debian/changelog, saucy should be 'saucy-proposed'
> * debian/patches/fix-the-undo-ctrl-z-bug.patch has a lot of information,
> but it isn't quite right. It should focus on upstream commits (if
> appropriate) and reference the Ubuntu bug. Eg:
> Origin: <upstream commit>
> Description: Fix the undo/ctrl-z bug
> Due to the code structure, the undo stack do not keep the last answer.
> We use another variable to keep it.
> Bug-Ubuntu: https://launchpad.net/bugs/1209326
>
> If there is no upstream commit, you should use 'Author: Person Who
> <email address hidden>'. The DEP-3 comments that are in your patch were
> unclear, especially in light of the boiler text that was included.
> --
>
> https://code.launchpad.net/~lihow731/ubuntu/saucy/gnome-calculator/fix-for-1209326/+merge/202198
> You are the owner of
> lp:~lihow731/ubuntu/saucy/gnome-calculator/fix-for-1209326.
>

[Shih-Yuan Lee (fourdollars)]

Hi Leon,

It is OK to overwrite your own Bazaar branch.

Unmerged revisions

11. By Leon Liao on 2014-01-18

Fix the undo/ctrl-z bug.
* src/math-equation.vala: fix the undo/ctrl-z bug.(lp Bug #1209326)

=== modified file '.pc/applied-patches'
--- .pc/applied-patches	2013-06-07 18:18:04 +0000
+++ .pc/applied-patches	2014-01-18 17:46:19 +0000
@@ -1,1 +1,2 @@
 unity_classic_menubar.patch
+fix-the-undo-ctrl-z-bug.patch

=== modified file 'debian/changelog'
--- debian/changelog	2013-07-15 18:41:28 +0000
+++ debian/changelog	2014-01-18 17:46:19 +0000
@@ -1,3 +1,9 @@
+gnome-calculator (1:3.8.2-1ubuntu5ppa) saucy; urgency=low
+
+  * src/math-equation.vala: fix the undo/ctrl-z bug.
+
+ -- Li-Hao Liao (Leon Liao) <[e-mail]>  Sun, 19 Jan 2014 00:49:25 +0800
+
 gnome-calculator (1:3.8.2-1ubuntu4) saucy; urgency=low
 
   * debian/patches/unity_classic_menubar.patch: use "Quit" rather than 

=== added file 'debian/patches/fix-the-undo-ctrl-z-bug.patch'
--- debian/patches/fix-the-undo-ctrl-z-bug.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix-the-undo-ctrl-z-bug.patch	2014-01-18 17:46:19 +0000
@@ -0,0 +1,45 @@
+Description: Fix the undo/ctrl-z bug
+ Due to the code structure, the undo stack do not keep the last answer.
+ We use another variable to keep it.
+ .
+ gnome-calculator (1:3.8.2-1ubuntu5) saucy; urgency=low
+ .
+   * src/math-equation.vala: fix the undo/ctrl-z bug.
+Author: Li-Hao Liao (Leon Liao) <[e-mail]>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+
+Bug-Ubuntu: https://launchpad.net/bugs/1209326
+Last-Update: <2014-01-19>
+
+--- gnome-calculator-3.8.2.orig/src/math-equation.vala
++++ gnome-calculator-3.8.2/src/math-equation.vala
+@@ -137,6 +137,8 @@ public class MathEquation : Gtk.TextBuff
+ 
+     private bool in_delete;
+ 
++    private Number last_ans;
++
+     private bool _in_solve;
+     public bool in_solve
+     {
+@@ -489,6 +491,7 @@ public class MathEquation : Gtk.TextBuff
+         }
+ 
+         state = undo_stack.nth_data (0);
++	    state.ans = last_ans;
+         undo_stack.remove (state);
+         redo_stack.prepend (get_current_state ());
+ 
+@@ -986,6 +989,7 @@ public class MathEquation : Gtk.TextBuff
+             return;
+         }
+ 
++        last_ans = state.ans;
+         _in_solve = true;
+ 
+         number_mode = NumberMode.NORMAL;

=== modified file 'debian/patches/series'
--- debian/patches/series	2013-06-07 18:18:04 +0000
+++ debian/patches/series	2014-01-18 17:46:19 +0000
@@ -1,1 +1,2 @@
 unity_classic_menubar.patch
+fix-the-undo-ctrl-z-bug.patch

=== modified file 'src/math-equation.vala'
--- src/math-equation.vala	2013-02-19 11:14:23 +0000
+++ src/math-equation.vala	2014-01-18 17:46:19 +0000
@@ -137,6 +137,8 @@
 
     private bool in_delete;
 
+    private Number last_ans;
+
     private bool _in_solve;
     public bool in_solve
     {
@@ -489,6 +491,7 @@
         }
 
         state = undo_stack.nth_data (0);
+	    state.ans = last_ans;
         undo_stack.remove (state);
         redo_stack.prepend (get_current_state ());
 
@@ -986,6 +989,7 @@
             return;
         }
 
+        last_ans = state.ans;
         _in_solve = true;
 
         number_mode = NumberMode.NORMAL;