[SCM] UNNAMED PROJECT branch, master, updated. 4e677d81e3dcc1139389390389e46084b1d64ea0

D Haley mycae at yahoo.com
Wed Dec 12 00:41:59 UTC 2012


The following commit has been merged in the master branch:
commit 4e677d81e3dcc1139389390389e46084b1d64ea0
Author: D Haley <mycae at yahoo.com>
Date:   Tue Dec 11 23:46:12 2012 +0100

    * Add upstream patches for 0.0.12 release bugs

diff --git a/debian/patches/series b/debian/patches/series
index 828a202..2325bf0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ debian-desktop-naming.patch
 font-path-changed.patch
 lowercase-textdomain.patch
 FTGL-lowercase.patch
+upstream-post-0.0.12-fixes.patch
diff --git a/debian/patches/upstream-post-0.0.12-fixes.patch b/debian/patches/upstream-post-0.0.12-fixes.patch
new file mode 100644
index 0000000..d8e40d3
--- /dev/null
+++ b/debian/patches/upstream-post-0.0.12-fixes.patch
@@ -0,0 +1,34 @@
+diff -r ab68a990a52f -r c844e00b9a6c src/3Depict.cpp
+--- a/src/3Depict.cpp	Tue Dec 11 19:44:29 2012 +0100
++++ b/src/3Depict.cpp	Tue Dec 11 19:49:33 2012 +0100
+@@ -1772,7 +1772,7 @@
+ 
+ 			
+ 
+-			panelSpectra->limitInteraction(!locking);
++			panelSpectra->limitInteraction(locking);
+ 			break;
+ 		}
+ 		default:
+@@ -2071,6 +2071,9 @@
+ 	setLockUI(false);
+ 	panelTop->Enable(true);
+ 
++	//Re-run the scene update for the original case,
++	// this allow sfor things like the selection bindings to be reinitialised.
++	doSceneUpdate();
+ }
+ 
+ void MainWindowFrame::OnFileExportPackage(wxCommandEvent &event)
+diff -r ab68a990a52f -r c844e00b9a6c src/mathglPane.cpp
+--- a/src/mathglPane.cpp	Tue Dec 11 19:44:29 2012 +0100
++++ b/src/mathglPane.cpp	Tue Dec 11 19:49:33 2012 +0100
+@@ -611,7 +611,7 @@
+ 
+ void MathGLPane::leftMouseDown(wxMouseEvent& event)
+ {
+-	if(!gr || !thePlot->getNumVisible() || !thePlot->isInteractionLocked())
++	if(!gr || !thePlot->getNumVisible() || thePlot->isInteractionLocked())
+ 		return;
+ 
+ 	int w,h;

-- 
UNNAMED PROJECT



More information about the debian-science-commits mailing list