[Python-apps-commits] r10031 - in packages/pyspread/trunk/debian (9 files)
anoteng-guest at users.alioth.debian.org
anoteng-guest at users.alioth.debian.org
Sun Sep 22 14:28:53 UTC 2013
Date: Sunday, September 22, 2013 @ 14:28:51
Author: anoteng-guest
Revision: 10031
Refresh patches
Add DEP-8 tests
New upstream release
Added:
packages/pyspread/trunk/debian/tests/
packages/pyspread/trunk/debian/tests/control
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
packages/pyspread/trunk/debian/patches/python_tutorial.patch
packages/pyspread/trunk/debian/patches/series
Deleted:
packages/pyspread/trunk/debian/patches/documentation_typos.patch
Modified: packages/pyspread/trunk/debian/changelog
===================================================================
--- packages/pyspread/trunk/debian/changelog 2013-09-18 03:25:04 UTC (rev 10030)
+++ packages/pyspread/trunk/debian/changelog 2013-09-22 14:28:51 UTC (rev 10031)
@@ -1,3 +1,12 @@
+pyspread (0.2.5-1) unstable; urgency=low
+
+ * New upstream release
+ * Refresh patches
+ * Delete documentation_typos.patch, fixed upstream
+ * Add DEP-8 tests
+
+ -- Andreas Noteng <andreas at noteng.no> Sun, 22 Sep 2013 08:03:48 +0200
+
pyspread (0.2.3-2) unstable; urgency=low
[ Andreas Noteng ]
Modified: packages/pyspread/trunk/debian/control
===================================================================
--- packages/pyspread/trunk/debian/control 2013-09-18 03:25:04 UTC (rev 10030)
+++ packages/pyspread/trunk/debian/control 2013-09-22 14:28:51 UTC (rev 10031)
@@ -6,6 +6,7 @@
Build-Depends: debhelper (>= 8.1.0), python (>= 2.7)
X-Python-Version: >= 2.7
Standards-Version: 3.9.4
+XS-Testsuite: autopkgtest
Homepage: http://pyspread.sourceforge.net/
Vcs-Svn: svn://anonscm.debian.org/python-apps/packages/pyspread/trunk/
Vcs-Browser: http://anonscm.debian.org/viewvc/python-apps/packages/pyspread/trunk/
Modified: packages/pyspread/trunk/debian/patches/about_dialog_license.patch
===================================================================
--- packages/pyspread/trunk/debian/patches/about_dialog_license.patch 2013-09-18 03:25:04 UTC (rev 10030)
+++ packages/pyspread/trunk/debian/patches/about_dialog_license.patch 2013-09-22 14:28:51 UTC (rev 10031)
@@ -3,21 +3,14 @@
Author: Andreas Noteng <andreas at noteng.no>
Last-Update: 2012-01-28
---- a/pyspread/src/gui/_dialogs.py 2013-01-13 21:52:35.000000000 +0100
-+++ b/pyspread/src/gui/_dialogs.py 2013-02-20 22:22:31.047624001 +0100
-@@ -1070,7 +1070,7 @@
- info.Translators = ["Joe Hansen", "Mark Haanen", "Yuri Chornoivan",
- "Mario Blättermann"]
+--- a/pyspread/src/gui/_dialogs.py 2013-09-22 08:11:38.107901082 +0200
++++ b/pyspread/src/gui/_dialogs.py 2013-09-22 08:11:38.103901082 +0200
+@@ -1104,7 +1104,7 @@
+ "Martin Manns", "Andreas Noteng",
+ "Enrico Nicoletto"]
- 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()
-@@ -1268,4 +1268,4 @@
- sizer.Add(cancel_button)
-
- self.SetSizer(sizer)
-- sizer.Fit(self)
-\ No newline at end of file
-+ sizer.Fit(self)
Modified: packages/pyspread/trunk/debian/patches/change_default_paths.patch
===================================================================
--- packages/pyspread/trunk/debian/patches/change_default_paths.patch 2013-09-18 03:25:04 UTC (rev 10030)
+++ packages/pyspread/trunk/debian/patches/change_default_paths.patch 2013-09-22 14:28:51 UTC (rev 10031)
@@ -4,9 +4,9 @@
Forwarded: not-needed
Author: Andreas Noteng <andreas at noteng.no>
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 @@
+--- a/pyspread/src/sysvars.py 2013-08-25 08:58:02.882134810 +0200
++++ b/pyspread/src/sysvars.py 2013-08-25 08:58:02.874134810 +0200
+@@ -43,13 +43,13 @@
def get_program_path():
"""Returns the path in which pyspread is installed"""
@@ -20,61 +20,26 @@
- return get_program_path() + "doc/help/"
+ return "/usr/share/doc/pyspread/"
- # System settings
-@@ -85,4 +85,4 @@
- font_list = font_enum.GetFacenames()
- font_list.sort()
+ def get_python_tutorial_path():
+--- a/pyspread/src/pyspread.py 2013-08-25 08:58:02.882134810 +0200
++++ b/pyspread/src/pyspread.py 2013-08-25 08:58:02.874134810 +0200
+@@ -39,11 +39,12 @@
-- return font_list
-\ No newline at end of file
-+ return font_list
---- a/setup.py 2013-02-20 22:23:18.759624002 +0100
-+++ b/setup.py 2013-02-25 20:04:44.659624001 +0100
-@@ -38,7 +38,6 @@
- scripts=['pyspread/pyspread'],
- package_data={'pyspread':
- ['*.py',
-- '../pyspread.sh',
- 'src/*.py',
- 'src/pyspread',
- 'src/*/*.py',
-@@ -52,12 +51,7 @@
- 'share/icons/Tango/24x24/actions/*.png',
- 'share/icons/Tango/24x24/toggles/*.png',
- 'share/icons/Tango/24x24/toggles/*.xpm',
-- 'doc/help/*.html',
-- 'doc/help/images/*.png',
-- 'locale/*/*/*.mo',
-- 'examples/*',
-- 'COPYING', 'thanks', 'faq',
-- 'authors', '../pyspread.pth', '../README', '../changelog']},
-+ 'locale/*/*/*.mo']},
- classifiers=[
- 'Development Status :: 4 - Beta',
- 'Environment :: X11 Applications :: GTK',
-@@ -68,4 +62,4 @@
- 'Programming Language :: Python :: 2.7',
- 'Topic :: Office/Business :: Financial :: Spreadsheet',
- ],
--)
-\ No newline at end of file
-+)
---- a/pyspread/src/pyspread.py 2013-02-20 22:23:18.759624002 +0100
-+++ b/pyspread/src/pyspread.py 2013-02-25 20:04:44.659624001 +0100
-@@ -38,8 +38,10 @@
- """
-
import sys
--from sysvars import get_program_path
-+import os
import optparse
+-
++import os
+ import wx
+ __ = wx.App(False) # Windows Hack
+
+-from sysvars import get_program_path
+sys.path.insert(0, '/usr/share/pyspread/')
+sys.path.insert(0, '/usr/share/pyspread/src/')
-
import lib.i18n as i18n
-@@ -49,7 +51,6 @@
+
+@@ -51,7 +52,6 @@
_ = i18n.language.ugettext
sys.setrecursionlimit(10000)
@@ -82,20 +47,45 @@
# 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 @@
+@@ -240,4 +240,4 @@
import cProfile
- cProfile.run('main()')
+ cProfile.run('pyspread()')
else:
-- main()
+- pyspread()
\ 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 @@
++ pyspread()
+--- a/pyspread/src/lib/i18n.py 2013-08-25 08:58:02.882134810 +0200
++++ b/pyspread/src/lib/i18n.py 2013-08-25 08:58:02.874134810 +0200
+@@ -60,5 +60,4 @@
+ # gettext initialization
+ # ----------------------
- 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)
+--- a/setup.py 2013-07-20 13:46:26.000000000 +0200
++++ b/setup.py 2013-08-25 09:00:09.246136396 +0200
+@@ -61,9 +61,6 @@
+ package_data={'pyspread':
+ [
+ '*.py',
+- '../pyspread.sh',
+- '../pyspread.bat',
+- '../runtests.py',
+ 'src/*.py',
+ 'src/pyspread',
+ 'src/*/*.py',
+@@ -79,12 +76,7 @@
+ 'share/icons/Tango/24x24/toggles/*.png',
+ 'share/icons/Tango/24x24/toggles/*.xpm',
+ 'share/icons/Tango/24x24/status/*.png',
+- 'doc/help/*.html',
+- 'doc/help/images/*.png',
+ 'locale/*/*/*.mo',
+- 'examples/*',
+- 'COPYING', 'thanks', 'faq', '*.1',
+- 'authors', '../pyspread.pth', '../README', '../changelog'
+ ],
+ },
+ classifiers=[
Deleted: packages/pyspread/trunk/debian/patches/documentation_typos.patch
===================================================================
--- packages/pyspread/trunk/debian/patches/documentation_typos.patch 2013-09-18 03:25:04 UTC (rev 10030)
+++ packages/pyspread/trunk/debian/patches/documentation_typos.patch 2013-09-22 14:28:51 UTC (rev 10031)
@@ -1,54 +0,0 @@
-Description: Fix some typos in the documentation
-Author: Jakub Wilk <jwilk at debian.org>
-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
-+++ b/pyspread/doc/help/tutorial.html 2013-04-11 20:58:24.842909205 +0200
-@@ -82,7 +82,7 @@
- is returned. </p>
- <h2>Filling cells</h2>
- <p>The easiest method for filling cells with sequences is setting up
-- an initial value and a funtion that calculates the next value.<br>
-+ an initial value and a function that calculates the next value.<br>
- </p>
- <p>Write into cell (1, 1, 2):<br>
- </p>
---- 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 @@
- which makes re-approval necessary.</p>
- <p class="western" lang="en-US">Technically, signing is done with
- GPG. When starting pyspread the first time as a user, a new GPG
-- key pair (name pyspred_<user_id>) is created, which is then
-+ key pair (name pyspread_<user_id>) is created, which is then
- used for signing files.</p>
- <h1 class="western" lang="en-US">Common spreadsheet tasks</h1>
- <h2 class="western" lang="en-US">Moving in the spreadsheet</h2>
-@@ -324,7 +324,7 @@
- <p class="western" lang="en-US">When copying cells with <Ctrl>
- + C, the cell code is copied. There is a second type of copy
- <Shift> + <Ctrl> + C, which copies string
-- representation of the results. This is useful, if for exapmle the
-+ representation of the results. This is useful, if for example the
- result shall be copied into an external application.</p>
- <h2 class="western" lang="en-US">Undoing work steps</h2>
- <p class="western" lang="en-US">Pyspread features undo and redo
-@@ -378,7 +378,7 @@
- <p class="western" lang="en-US">When a file is saved, a signature is
- created in an additional file with the suffix .pys.sig. The
- signature is a PGP signature. When pyspread is started the first
-- time for a user, a pgp key pair is crreated for the user
-+ time for a user, a pgp key pair is created for the user
- pyspread_<user-id>. This key pair is used for signing
- pyspread save files. A correct signature file lets pyspread open a
- file without going into safe mode.</p>
-@@ -740,7 +740,7 @@
- <p class="western" lang="en-US">The security concept has risks apart
- from unintentionally approving malicious files. </p>
- <p class="western" lang="en-US">In order to share files, private
-- keys might be exchanged by users. This would brake the security
-+ keys might be exchanged by users. This would break the security
- 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>
Modified: packages/pyspread/trunk/debian/patches/python_tutorial.patch
===================================================================
--- packages/pyspread/trunk/debian/patches/python_tutorial.patch 2013-09-18 03:25:04 UTC (rev 10030)
+++ packages/pyspread/trunk/debian/patches/python_tutorial.patch 2013-09-22 14:28:51 UTC (rev 10031)
@@ -6,14 +6,14 @@
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 @@
+--- a/pyspread/src/gui/_main_window.py 2013-09-22 08:12:10.775899653 +0200
++++ b/pyspread/src/gui/_main_window.py 2013-09-22 08:12:10.771899653 +0200
+@@ -1220,12 +1220,17 @@
def OnPythonTutorial(self, event):
"""Python tutorial launch event handler"""
- self.main_window.actions.launch_help("Python tutorial",
-- "http://docs.python.org/tutorial/")
+- get_python_tutorial_path())
+ 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")
Modified: packages/pyspread/trunk/debian/patches/series
===================================================================
--- packages/pyspread/trunk/debian/patches/series 2013-09-18 03:25:04 UTC (rev 10030)
+++ packages/pyspread/trunk/debian/patches/series 2013-09-22 14:28:51 UTC (rev 10031)
@@ -1,4 +1,3 @@
about_dialog_license.patch
change_default_paths.patch
-documentation_typos.patch
python_tutorial.patch
Added: packages/pyspread/trunk/debian/tests/control
===================================================================
--- packages/pyspread/trunk/debian/tests/control (rev 0)
+++ packages/pyspread/trunk/debian/tests/control 2013-09-22 14:28:51 UTC (rev 10031)
@@ -0,0 +1,3 @@
+Tests: runtests.py
+Tests-directory: ./
+Depends: @
More information about the Python-apps-commits
mailing list