[Python-apps-commits] r9555 - in packages/pyspread/trunk/debian (4 files)

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

    Date: Sunday, April 21, 2013 @ 19:52:13
  Author: anoteng-guest
Revision: 9555

Move python tutorial patch to separate patch

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

Modified: packages/pyspread/trunk/debian/changelog
===================================================================
--- packages/pyspread/trunk/debian/changelog	2013-04-20 17:25:17 UTC (rev 9554)
+++ packages/pyspread/trunk/debian/changelog	2013-04-21 19:52:13 UTC (rev 9555)
@@ -1,9 +1,10 @@
 pyspread (0.2.3-1) experimental; urgency=low
 
   * New upstream release
-  * Move the translations to /usr/share/locale
+  * Move the translations to /usr/share/locale, thanks to Jakub Wilk for the
+    patch
     - fix_i18n.patch
-  * Fix typos in upstream documentation
+  * Fix typos in upstream documentation, thanks to Jakub Wilk for the patch
     - documentation_typos.patch
   * After upgrade ~/.pyspreadrc needs to be deleted
   * Update Python dependencies to >= 2.7
@@ -18,7 +19,9 @@
   * Refreshed patches
   * PySpread no longer saves sensitive data in ~/.pyspreadrc (Closes: #701650)
   * Use local version of Python tutorial if it is available (Closes: #704928)
+    - python_tutorial.patch
   * Update path to online Python tutorial (Closes: #704929)
+    - python_tutorial.patch
 
  -- 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-20 17:25:17 UTC (rev 9554)
+++ packages/pyspread/trunk/debian/patches/documentation_typos.patch	2013-04-21 19:52:13 UTC (rev 9555)
@@ -1,11 +1,6 @@
-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.
+Description: Fix some typos in the documentation
 Author: Jakub Wilk <jwilk at debian.org>
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=704928
-Last-Update: 2013-04-20
+Last-Update: 2013-04-21
 ---
 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
@@ -57,27 +52,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/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

Added: packages/pyspread/trunk/debian/patches/python_tutorial.patch
===================================================================
--- packages/pyspread/trunk/debian/patches/python_tutorial.patch	                        (rev 0)
+++ packages/pyspread/trunk/debian/patches/python_tutorial.patch	2013-04-21 19:52:13 UTC (rev 9555)
@@ -0,0 +1,32 @@
+Description: Use offline tutorial, and fix link to online tutorial
+ 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>
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=704928
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=704929
+Last-Update: 2013-04-21
+--- 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/series
===================================================================
--- packages/pyspread/trunk/debian/patches/series	2013-04-20 17:25:17 UTC (rev 9554)
+++ packages/pyspread/trunk/debian/patches/series	2013-04-21 19:52:13 UTC (rev 9555)
@@ -1,4 +1,5 @@
 about_dialog_license.patch
 change_default_paths.patch
 documentation_typos.patch
+python_tutorial.patch
 fix_i18n.patch