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

Thu Apr 12 21:46:05 UTC 2012

Date: Thursday, April 12, 2012 @ 21:46:03
  Author: anoteng-guest
Revision: 8475

New upstream release

Modified:
  packages/pyspread/trunk/debian/changelog
  packages/pyspread/trunk/debian/patches/about_dialog_license.patch
  packages/pyspread/trunk/debian/patches/change_default_paths.patch
Deleted:
  packages/pyspread/trunk/debian/patches/dont_load_local_modules.patch

Modified: packages/pyspread/trunk/debian/changelog
===================================================================

--- packages/pyspread/trunk/debian/changelog	2012-04-11 20:34:47 UTC (rev 8474)
+++ packages/pyspread/trunk/debian/changelog	2012-04-12 21:46:03 UTC (rev 8475)
@@ -1,5 +1,5 @@
-pyspread (0.2.1-1) unstable; urgency=low
+pyspread (0.2.2-1) unstable; urgency=low
 
   * Initial release. (Closes: #601950)
 
- -- Andreas Noteng <andreas at noteng.no>  Wed, 15 Feb 2012 08:32:20 +0100
+ -- Andreas Noteng <andreas at noteng.no>  Thu, 12 Apr 2012 23:45:45 +0200

Modified: packages/pyspread/trunk/debian/patches/about_dialog_license.patch
===================================================================
--- packages/pyspread/trunk/debian/patches/about_dialog_license.patch	2012-04-11 20:34:47 UTC (rev 8474)
+++ packages/pyspread/trunk/debian/patches/about_dialog_license.patch	2012-04-12 21:46:03 UTC (rev 8475)
@@ -5,7 +5,7 @@
 
 --- a/pyspread/src/gui/_dialogs.py
 +++ b/pyspread/src/gui/_dialogs.py
-@@ -1051,7 +1051,7 @@
+@@ -1069,7 +1069,7 @@
          info.Developers = ["Martin Manns"]
          info.DocWriters = ["Martin Manns", "Bosko Markovic"]
  
@@ -14,7 +14,7 @@
          license_text = license_file.read()
          license_file.close()
  
-@@ -1211,4 +1211,4 @@
+@@ -1290,4 +1290,4 @@
          sizer.Add(cancel_button)
  
          self.SetSizer(sizer)

Modified: packages/pyspread/trunk/debian/patches/change_default_paths.patch
===================================================================
--- packages/pyspread/trunk/debian/patches/change_default_paths.patch	2012-04-11 20:34:47 UTC (rev 8474)
+++ packages/pyspread/trunk/debian/patches/change_default_paths.patch	2012-04-12 21:46:03 UTC (rev 8475)
@@ -1,69 +1,81 @@
 Description: Install documentation and examples to /usr/share/doc/pyspread
 Forwarded: not-needed
 Author: Andreas Noteng <andreas at noteng.no>
-Last-Update: 2012-01-28
-Index: pyspread-0.2.1/pyspread/src/sysvars.py
-===================================================================
---- pyspread-0.2.1.orig/pyspread/src/sysvars.py	2012-02-19 22:10:23.988485063 +0100
-+++ pyspread-0.2.1/pyspread/src/sysvars.py	2012-02-19 22:13:30.320491105 +0100
-@@ -42,7 +42,7 @@
+Last-Update: 2012-04-09
+--- a/pyspread/src/sysvars.py
++++ b/pyspread/src/sysvars.py
+@@ -38,13 +38,13 @@
+ def get_program_path():
+     """Returns the path in which pyspread is installed"""
+ 
+-    return os.path.dirname(__file__) + '/../'
++    return "/usr/share/pyspread/pyspread/"
+ 
+ 
  def get_help_path():
      """Returns the pyspread help path"""
-     
+ 
 -    return get_program_path() + "doc/help/"
 +    return "/usr/share/doc/pyspread/"
-     
+ 
  # System settings
  
-Index: pyspread-0.2.1/setup.py
-===================================================================
---- pyspread-0.2.1.orig/setup.py	2012-02-19 22:10:24.016485063 +0100
-+++ pyspread-0.2.1/setup.py	2012-02-19 22:17:54.020499657 +0100
-@@ -35,18 +35,12 @@
-       package_data={'':
-         ['pyspread/*.py',
-          'pyspread/src/*.py',
--         'pyspread/src/pyspread',
-          'pyspread/src/*/*.py',
--         'pyspread/src/*/test/*',
-          'pyspread/share/icons/*.png',
+@@ -84,4 +84,4 @@
+     font_list = font_enum.GetFacenames()
+     font_list.sort()
+ 
+-    return font_list
+\ No newline at end of file
++    return font_list
+--- a/setup.py
++++ b/setup.py
+@@ -47,12 +47,8 @@
           'pyspread/share/icons/Tango/24x24/actions/*.png',
           'pyspread/share/icons/Tango/24x24/toggles/*.png',
           'pyspread/share/icons/Tango/24x24/toggles/*.xpm',
 -         'pyspread/doc/help/*.html',
 -         'pyspread/doc/help/images/*.png',
+          'pyspread/po/*',
 -         'pyspread/examples/*',
 -         'pyspread/COPYING', 'pyspread/thanks', 'pyspread/faq',
--         'authors', 'pyspread.pth']},
+-         'pyspread/authors', 'pyspread.pth', 'README', 'changelog']},
 +         'pyspread.pth']},
        classifiers=[ \
          'Development Status :: 4 - Beta',
          'Environment :: X11 Applications :: GTK',
-@@ -57,4 +51,4 @@
+@@ -63,4 +59,4 @@
          'Programming Language :: Python',
          'Topic :: Office/Business :: Financial :: Spreadsheet',
        ],
 -)
 \ No newline at end of file
 +)
-Index: pyspread-0.2.1/pyspread/src/pyspread.py
-===================================================================
---- pyspread-0.2.1.orig/pyspread/src/pyspread.py	2012-02-19 22:10:24.000485063 +0100
-+++ pyspread-0.2.1/pyspread/src/pyspread.py	2012-02-19 22:13:30.320491105 +0100
-@@ -41,12 +41,9 @@
+--- a/pyspread/src/pyspread.py
++++ b/pyspread/src/pyspread.py
+@@ -40,17 +40,18 @@
+ # Patch for using with PyScripter thanks to Colin J. Williams
+ # If wx exists in sys,modules, we dont need to import wx version.
  # wx is already imported if the PyScripter wx engine is used.
++import sys
++import os
++
++sys.path.insert(0, '/usr/share/pyspread/pyspread/')
++sys.path.insert(0, '/usr/share/pyspread/pyspread/src/')
  
- from sys import path, modules
+ import i18n
+-import sys
 -from sysvars import get_program_path
- 
  import optparse
  
--path.insert(0, get_program_path())
+ #use ugettext instead of getttext to avoid unicode errors
+ _ = i18n.language.ugettext
+ 
+-sys.path.insert(0, get_program_path())
 -
  try:
-     modules['wx']
+     sys.modules['wx']
  except KeyError:
-@@ -204,4 +201,4 @@
+@@ -215,4 +216,4 @@
          import cProfile
          cProfile.run('main()')
      else:

Deleted: packages/pyspread/trunk/debian/patches/dont_load_local_modules.patch
===================================================================
--- packages/pyspread/trunk/debian/patches/dont_load_local_modules.patch	2012-04-11 20:34:47 UTC (rev 8474)
+++ packages/pyspread/trunk/debian/patches/dont_load_local_modules.patch	2012-04-12 21:46:03 UTC (rev 8475)
@@ -1,17 +0,0 @@
-Description: Don't include parent dir in path
-Forwarded: not-needed
-Author: Andreas Noteng <andreas at noteng.no>
-Last-Update: 2012-01-31
---- a/pyspread/src/pyspread.py
-+++ b/pyspread/src/pyspread.py
-@@ -62,8 +62,8 @@
- 
- # If pyspread is installed but run from a local dir
- # the local libs are preferred.
--
--path.insert(0, "..") 
-+# Disabled in the Debian package
-+# path.insert(0, "..") 
- 
- from src.gui._events import post_command_event, GridActionOpenMsg
- 


