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

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

    Date: Wednesday, April 24, 2013 @ 06:33:07
  Author: anoteng-guest
Revision: 9560

Merge patches fix_i18n and change_default_paths.patch

Modified:
  packages/pyspread/trunk/debian/patches/change_default_paths.patch
  packages/pyspread/trunk/debian/patches/series
Deleted:
  packages/pyspread/trunk/debian/patches/fix_i18n.patch

Modified: packages/pyspread/trunk/debian/patches/change_default_paths.patch
===================================================================
--- packages/pyspread/trunk/debian/patches/change_default_paths.patch	2013-04-22 08:22:44 UTC (rev 9559)
+++ packages/pyspread/trunk/debian/patches/change_default_paths.patch	2013-04-24 06:33:07 UTC (rev 9560)
@@ -1,7 +1,9 @@
-Description: Install documentation and examples to /usr/share/doc/pyspread
+Description: Change some paths in the program to match the Debian policy.
+ Change program path to /usr/share/pyspread, documentation path to
+ /usr/share/doc/pyspread and localisation path to /usr/locale/
 Forwarded: not-needed
 Author: Andreas Noteng <andreas at noteng.no>
-Last-Update: 2012-04-21
+Last-Update: 2013-04-23
 --- a/pyspread/src/sysvars.py	2013-02-20 22:23:18.759624002 +0100
 +++ b/pyspread/src/sysvars.py	2013-02-25 20:04:44.651624001 +0100
 @@ -39,13 +39,13 @@
@@ -87,3 +89,13 @@
 -            main()
 \ No newline at end of file
 +            main()
+--- 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)

Deleted: packages/pyspread/trunk/debian/patches/fix_i18n.patch
===================================================================
--- packages/pyspread/trunk/debian/patches/fix_i18n.patch	2013-04-22 08:22:44 UTC (rev 9559)
+++ packages/pyspread/trunk/debian/patches/fix_i18n.patch	2013-04-24 06:33:07 UTC (rev 9560)
@@ -1,16 +0,0 @@
-Description: Fix i18n code
- 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/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-22 08:22:44 UTC (rev 9559)
+++ packages/pyspread/trunk/debian/patches/series	2013-04-24 06:33:07 UTC (rev 9560)
@@ -2,4 +2,3 @@
 change_default_paths.patch
 documentation_typos.patch
 python_tutorial.patch
-fix_i18n.patch