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

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

    Date: Saturday, April 20, 2013 @ 17:25:17
  Author: anoteng-guest
Revision: 9554

update patch headers and move some code between patches

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

Modified: packages/pyspread/trunk/debian/patches/documentation_typos.patch
===================================================================
--- packages/pyspread/trunk/debian/patches/documentation_typos.patch	2013-04-20 15:13:04 UTC (rev 9553)
+++ packages/pyspread/trunk/debian/patches/documentation_typos.patch	2013-04-20 17:25:17 UTC (rev 9554)
@@ -1,6 +1,11 @@
-Description: Fix some typos in the documentation
+Description: Fix some typos and offline tutorial
+ Fix some typos in the documentation, and add a check for installed version of
+ the Python tutorial. If installed version of the tutorial is found, PySpread
+ will use this one instead of the online one.
+ This patch also updates the link to the online Python tutorial.
 Author: Jakub Wilk <jwilk at debian.org>
-Last-Update: 2013-04-13
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=704928
+Last-Update: 2013-04-20
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/pyspread/doc/help/tutorial.html	2013-04-11 20:58:21.126909367 +0200
@@ -52,3 +57,27 @@
        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/src/gui/_main_window.py	2013-04-16 18:52:45.442923661 +0200
++++ b/pyspread/src/gui/_main_window.py	2013-04-16 18:53:14.454922393 +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

Modified: packages/pyspread/trunk/debian/patches/fix_i18n.patch
===================================================================
--- packages/pyspread/trunk/debian/patches/fix_i18n.patch	2013-04-20 15:13:04 UTC (rev 9553)
+++ packages/pyspread/trunk/debian/patches/fix_i18n.patch	2013-04-20 17:25:17 UTC (rev 9554)
@@ -1,33 +1,9 @@
 Description: Fix i18n code
- Move .mo-files to /usr/share/locale and update i18n-code to use them
+ Update i18n-code to use locales from /usr/share/locale
 Author: Jakub Wilk <jwilk at debian.org>
 Last-Update: 2013-04-13
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/pyspread/src/gui/_main_window.py	2013-04-16 18:52:45.442923661 +0200
-+++ b/pyspread/src/gui/_main_window.py	2013-04-16 18:53:14.454922393 +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/src/lib/i18n.py	2013-01-13 21:52:35.000000000 +0100
 +++ b/pyspread/src/lib/i18n.py	2013-04-16 18:58:30.118908588 +0200
 @@ -68,5 +68,4 @@