[Python-apps-commits] r9538 - in packages/pyspread/trunk/debian (2 files)

[anoteng-guest at users.alioth.debian.org]

    Date: Thursday, April 11, 2013 @ 19:31:07
  Author: anoteng-guest
Revision: 9538

Fix bugs #704929 and #704928

Modified:
  packages/pyspread/trunk/debian/changelog
  packages/pyspread/trunk/debian/patches/documentation_typos.patch

Modified: packages/pyspread/trunk/debian/changelog
===================================================================
--- packages/pyspread/trunk/debian/changelog	2013-04-11 07:03:43 UTC (rev 9537)
+++ packages/pyspread/trunk/debian/changelog	2013-04-11 19:31:07 UTC (rev 9538)
@@ -14,6 +14,8 @@
   * Updated manpage
   * Refreshed patches
   * PySpread no longer saves sensitive data in ~/.pyspreadrc (Closes: #701650)
+  * Use local version of Python tutorial if it is available (Closes: #704928)
+  * Update path to online Python tutorial (Closes: #704929)
 
  -- Andreas Noteng <andreas at noteng.no>  Tue, 12 Feb 2013 19:11:49 +0100
 

Modified: packages/pyspread/trunk/debian/patches/documentation_typos.patch
===================================================================
--- packages/pyspread/trunk/debian/patches/documentation_typos.patch	2013-04-11 07:03:43 UTC (rev 9537)
+++ packages/pyspread/trunk/debian/patches/documentation_typos.patch	2013-04-11 19:31:07 UTC (rev 9538)
@@ -1,5 +1,40 @@
---- a/pyspread/doc/help/First steps in pyspread.html	2013-01-13 21:52:35.000000000 +0100
-+++ b/pyspread/doc/help/First steps in pyspread.html	2013-02-25 22:52:16.819624002 +0100
+--- a/pyspread/doc/help/tutorial.html	2013-04-11 20:58:21.126909367 +0200
++++ b/pyspread/doc/help/tutorial.html	2013-04-11 20:58:24.842909205 +0200
+@@ -82,7 +82,7 @@
+       is returned. </p>
+     <h2>Filling cells</h2>
+     <p>The easiest method for filling cells with sequences is setting up
+-      an initial value and a funtion that calculates the next value.<br>
++      an initial value and a function that calculates the next value.<br>
+     </p>
+     <p>Write into cell (1, 1, 2):<br>
+     </p>
+--- a/pyspread/src/gui/_main_window.py	2013-04-11 20:58:21.126909367 +0200
++++ b/pyspread/src/gui/_main_window.py	2013-04-11 21:16:08.246862700 +0200
+@@ -1104,12 +1104,17 @@
+     def OnPythonTutorial(self, event):
+         """Python tutorial launch event handler"""
+ 
+-        self.main_window.actions.launch_help("Python tutorial",
+-            "http://docs.python.org/tutorial/")
++	if os.path.isfile("/usr/share/doc/python-doc/html/tutorial/index.html"):
++	        self.main_window.actions.launch_help("Python tutorial",
++			"/usr/share/doc/python-doc/html/tutorial/index.html")
++	else:
++        	self.main_window.actions.launch_help("Python tutorial",
++            		"http://docs.python.org/2/tutorial/")
++
+ 
+     def OnAbout(self, event):
+         """About dialog event handler"""
+ 
+         self.main_window.interfaces.display_about(self.main_window)
+ 
+-# End of class MainWindowEventHandlers
+\ No newline at end of file
++# End of class MainWindowEventHandlers
+--- a/pyspread/doc/help/First steps in pyspread.html	2013-04-11 20:58:21.126909367 +0200
++++ b/pyspread/doc/help/First steps in pyspread.html	2013-04-11 20:58:24.842909205 +0200
 @@ -227,7 +227,7 @@
        which makes re-approval necessary.</p>
      <p class="western" lang="en-US">Technically, signing is done with
@@ -36,14 +71,3 @@
        concept because exchanged private keys may spread.</p>
      <p class="western" lang="en-US">The signature concept would fail if
        gpg signatures were broken.</p>
---- a/pyspread/doc/help/tutorial.html	2013-01-13 21:52:35.000000000 +0100
-+++ b/pyspread/doc/help/tutorial.html	2013-02-25 20:09:14.979624001 +0100
-@@ -82,7 +82,7 @@
-       is returned. </p>
-     <h2>Filling cells</h2>
-     <p>The easiest method for filling cells with sequences is setting up
--      an initial value and a funtion that calculates the next value.<br>
-+      an initial value and a function that calculates the next value.<br>
-     </p>
-     <p>Write into cell (1, 1, 2):<br>
-     </p>