[Python-apps-commits] r9433 - in packages/pyspread/trunk/debian (5 files)

anoteng-guest at users.alioth.debian.org anoteng-guest at users.alioth.debian.org
Wed Feb 13 06:51:29 UTC 2013 

    Date: Wednesday, February 13, 2013 @ 06:51:26
  Author: anoteng-guest
Revision: 9433

New upstream release
Updated dependencies
Added a NEWS-file

Added:
  packages/pyspread/trunk/debian/NEWS
Modified:
  packages/pyspread/trunk/debian/changelog
  packages/pyspread/trunk/debian/control
  packages/pyspread/trunk/debian/patches/about_dialog_license.patch
  packages/pyspread/trunk/debian/patches/change_default_paths.patch

Added: packages/pyspread/trunk/debian/NEWS
===================================================================
--- packages/pyspread/trunk/debian/NEWS	                        (rev 0)
+++ packages/pyspread/trunk/debian/NEWS	2013-02-13 06:51:26 UTC (rev 9433)
@@ -0,0 +1,6 @@
+pyspread (0.2.3-1) unstable; urgency=low
+
+  An update from 0.2.2 should remove .pyspreadrc because window geometry has
+  changed and the gpg key pair has to be changed.
+
+ -- Andreas Noteng <andreas at noteng.no>  Tue, 12 Feb 2013 19:01:31 +0100

Modified: packages/pyspread/trunk/debian/changelog
===================================================================
--- packages/pyspread/trunk/debian/changelog	2013-02-12 22:11:58 UTC (rev 9432)
+++ packages/pyspread/trunk/debian/changelog	2013-02-13 06:51:26 UTC (rev 9433)
@@ -1,12 +1,14 @@
-pyspread (0.2.3-1) UNRELEASED; urgency=low
+pyspread (0.2.3-1) unstable; urgency=low
 
+  * New upstream release
+  * After upgrade ~/.pyspreadrc needs to be deleted
   * Update Python dependencies to >= 2.7
   * Change menu category from development to office (Closes: #674463)
   * New upstream release
-  * New dependency matplotlib
+  * New dependency matplotlib, python-gnupg
   * Removed suggested dependencies gmpy and rpy
 
- -- Andreas Noteng <andreas at noteng.no>  Sat, 19 May 2012 08:48:02 +0200
+ -- Andreas Noteng <andreas at noteng.no>  Tue, 12 Feb 2013 19:11:49 +0100
 
 pyspread (0.2.2-1) unstable; urgency=low
 

Modified: packages/pyspread/trunk/debian/control
===================================================================
--- packages/pyspread/trunk/debian/control	2013-02-12 22:11:58 UTC (rev 9432)
+++ packages/pyspread/trunk/debian/control	2013-02-13 06:51:26 UTC (rev 9433)
@@ -12,10 +12,15 @@
 
 Package: pyspread
 Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, python-numpy (>= 1:1.1.0),
- python-wxgtk2.8 (>= 2.8.10.1), python-pyme (>= 0.8.1), python-matplotlib
+Depends: python-gnupg,
+         python-matplotlib,
+         python-numpy (>= 1:1.1.0),
+         python-pyme (>= 0.8.1),
+         python-wxgtk2.8 (>= 2.8.10.1),
+         ${misc:Depends},
+         ${python:Depends}
 Description: cross-platform Python spreadsheet application
- Pyspread is a cross-platform Python spreadsheet application. Instead of 
- spreadsheet formulas, Python expressions are entered into the spreadsheet 
- cells. Each expression returns a Python object that can be accessed from 
+ Pyspread is a cross-platform Python spreadsheet application. Instead of
+ spreadsheet formulas, Python expressions are entered into the spreadsheet
+ cells. Each expression returns a Python object that can be accessed from
  other cells. These objects can represent anything including lists or matrices.

Modified: packages/pyspread/trunk/debian/patches/about_dialog_license.patch
===================================================================
--- packages/pyspread/trunk/debian/patches/about_dialog_license.patch	2013-02-12 22:11:58 UTC (rev 9432)
+++ packages/pyspread/trunk/debian/patches/about_dialog_license.patch	2013-02-13 06:51:26 UTC (rev 9433)
@@ -3,18 +3,20 @@
 Author: Andreas Noteng <andreas at noteng.no>
 Last-Update: 2012-01-28
 
---- a/pyspread/src/gui/_dialogs.py
-+++ b/pyspread/src/gui/_dialogs.py
-@@ -1069,7 +1069,7 @@
-         info.Developers = ["Martin Manns"]
-         info.DocWriters = ["Martin Manns", "Bosko Markovic"]
+Index: pyspread-0.2.3.obsolete.0.749677327768044/pyspread/src/gui/_dialogs.py
+===================================================================
+--- pyspread-0.2.3.obsolete.0.749677327768044.orig/pyspread/src/gui/_dialogs.py	2013-01-13 21:52:35.000000000 +0100
++++ pyspread-0.2.3.obsolete.0.749677327768044/pyspread/src/gui/_dialogs.py	2013-02-12 19:19:59.119913886 +0100
+@@ -1070,7 +1070,7 @@
+         info.Translators = ["Joe Hansen", "Mark Haanen", "Yuri Chornoivan",
+                             "Mario Blättermann"]
  
 -        license_file = open(get_program_path() + "/COPYING", "r")
 +        license_file = open("/usr/share/common-licenses/GPL-3", "r")
          license_text = license_file.read()
          license_file.close()
  
-@@ -1290,4 +1290,4 @@
+@@ -1268,4 +1268,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	2013-02-12 22:11:58 UTC (rev 9432)
+++ packages/pyspread/trunk/debian/patches/change_default_paths.patch	2013-02-13 06:51:26 UTC (rev 9433)
@@ -2,9 +2,11 @@
 Forwarded: not-needed
 Author: Andreas Noteng <andreas at noteng.no>
 Last-Update: 2012-04-21
---- a/pyspread/src/sysvars.py
-+++ b/pyspread/src/sysvars.py
-@@ -38,13 +38,13 @@
+Index: pyspread-0.2.3.obsolete.0.749677327768044/pyspread/src/sysvars.py
+===================================================================
+--- pyspread-0.2.3.obsolete.0.749677327768044.orig/pyspread/src/sysvars.py	2013-02-12 19:24:34.699901834 +0100
++++ pyspread-0.2.3.obsolete.0.749677327768044/pyspread/src/sysvars.py	2013-02-13 07:37:45.833844555 +0100
+@@ -39,13 +39,13 @@
  def get_program_path():
      """Returns the path in which pyspread is installed"""
  
@@ -20,75 +22,52 @@
  
  # System settings
  
-@@ -84,4 +84,4 @@
+@@ -85,4 +85,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
-@@ -37,22 +37,11 @@
-          'pyspread/src/*.py',
-          'pyspread/src/pyspread',
-          'pyspread/src/*/*.py',
--         'pyspread/src/*/test/*.py',
--         'pyspread/src/*/test/*.pys*',
--         'pyspread/src/*/test/*.sig',
--         'pyspread/src/*/test/*.csv',
--         'pyspread/src/*/test/*.txt',
--         'pyspread/src/*/test/*.pys*',
-          'pyspread/share/icons/*.png',
-          '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',
--         'pyspread/authors', 'pyspread.pth', 'README', 'changelog']},
-+         'pyspread/po/*']},
-       classifiers=[ \
-         'Development Status :: 4 - Beta',
-         'Environment :: X11 Applications :: GTK',
-@@ -63,4 +52,4 @@
-         'Programming Language :: Python',
+Index: pyspread-0.2.3.obsolete.0.749677327768044/setup.py
+===================================================================
+--- pyspread-0.2.3.obsolete.0.749677327768044.orig/setup.py	2013-02-12 19:24:34.699901834 +0100
++++ pyspread-0.2.3.obsolete.0.749677327768044/setup.py	2013-02-13 07:37:45.837846556 +0100
+@@ -68,4 +68,4 @@
+         'Programming Language :: Python :: 2.7',
          'Topic :: Office/Business :: Financial :: Spreadsheet',
        ],
 -)
 \ No newline at end of file
 +)
---- 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
+Index: pyspread-0.2.3.obsolete.0.749677327768044/pyspread/src/pyspread.py
+===================================================================
+--- pyspread-0.2.3.obsolete.0.749677327768044.orig/pyspread/src/pyspread.py	2013-02-12 19:24:34.699901834 +0100
++++ pyspread-0.2.3.obsolete.0.749677327768044/pyspread/src/pyspread.py	2013-02-13 07:38:13.067453366 +0100
+@@ -38,8 +38,10 @@
+ """
+ 
+ import sys
+-from sysvars import get_program_path
 +import os
-+
+ import optparse
 +sys.path.insert(0, '/usr/share/pyspread/')
 +sys.path.insert(0, '/usr/share/pyspread/src/')
  
- import i18n
--import sys
--from sysvars import get_program_path
- import optparse
+ import lib.i18n as i18n
  
- #use ugettext instead of getttext to avoid unicode errors
+@@ -49,7 +51,6 @@
  _ = i18n.language.ugettext
  
+ sys.setrecursionlimit(10000)
 -sys.path.insert(0, get_program_path())
--
- try:
-     sys.modules['wx']
- except KeyError:
-@@ -215,4 +216,4 @@
-         import cProfile
-         cProfile.run('main()')
-     else:
--        main()
+ 
+ # Patch for using with PyScripter thanks to Colin J. Williams
+ # If wx exists in sys,modules, we dont need to import wx version.
+@@ -222,4 +223,4 @@
+             import cProfile
+             cProfile.run('main()')
+         else:
+-            main()
 \ No newline at end of file
-+        main()
++            main()

More information about the Python-apps-commits mailing list