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

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

    Date: Tuesday, April 16, 2013 @ 17:56:51
  Author: anoteng-guest
Revision: 9547

i18n fixes in separate patch
add DEP3 headers
update changelog

Added:
  packages/pyspread/trunk/debian/patches/fix_i18n.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-14 21:22:48 UTC (rev 9546)
+++ packages/pyspread/trunk/debian/changelog	2013-04-16 17:56:51 UTC (rev 9547)
@@ -2,6 +2,9 @@
 
   * New upstream release
   * Move the translations to /usr/share/locale
+    - fix_i18n.patch
+  * Fix typos in upstream documentation
+    - documentation_typos.patch
   * After upgrade ~/.pyspreadrc needs to be deleted
   * Update Python dependencies to >= 2.7
   * Change menu category from development to office (Closes: #674463)

Modified: packages/pyspread/trunk/debian/patches/documentation_typos.patch
===================================================================
--- packages/pyspread/trunk/debian/patches/documentation_typos.patch	2013-04-14 21:22:48 UTC (rev 9546)
+++ packages/pyspread/trunk/debian/patches/documentation_typos.patch	2013-04-16 17:56:51 UTC (rev 9547)
@@ -1,3 +1,8 @@
+Description: Fix some typos in the documentation
+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/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 @@
@@ -9,30 +14,6 @@
      </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 @@

Added: packages/pyspread/trunk/debian/patches/fix_i18n.patch
===================================================================
--- packages/pyspread/trunk/debian/patches/fix_i18n.patch	                        (rev 0)
+++ packages/pyspread/trunk/debian/patches/fix_i18n.patch	2013-04-16 17:56:51 UTC (rev 9547)
@@ -0,0 +1,40 @@
+Description: Fix i18n code
+ Move .mo-files to /usr/share/locale and update i18n-code to use them
+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 @@
+ 
+ gettext.bind_textdomain_codeset(APP_NAME, "UTF-8")
+ 
+-language = gettext.translation(APP_NAME, mo_location, languages=languages,
+-                               fallback=True)
+\ No newline at end of file
++language = gettext.translation(APP_NAME, languages=languages, fallback=True)

Modified: packages/pyspread/trunk/debian/patches/series
===================================================================
--- packages/pyspread/trunk/debian/patches/series	2013-04-14 21:22:48 UTC (rev 9546)
+++ packages/pyspread/trunk/debian/patches/series	2013-04-16 17:56:51 UTC (rev 9547)
@@ -1,3 +1,4 @@
 about_dialog_license.patch
 change_default_paths.patch
 documentation_typos.patch
+fix_i18n.patch