[Python-apps-commits] r8069 - in packages/pyspread/trunk/debian/patches (4 files)
anoteng-guest at users.alioth.debian.org
anoteng-guest at users.alioth.debian.org
Sat Jan 14 16:40:57 UTC 2012
Date: Saturday, January 14, 2012 @ 16:40:56
Author: anoteng-guest
Revision: 8069
Refresh patches
Modified:
packages/pyspread/trunk/debian/patches/about_dialog_license.patch
packages/pyspread/trunk/debian/patches/series
Deleted:
packages/pyspread/trunk/debian/patches/disable_psyco.patch
packages/pyspread/trunk/debian/patches/remove_extra_COPYING.patch
Modified: packages/pyspread/trunk/debian/patches/about_dialog_license.patch
===================================================================
--- packages/pyspread/trunk/debian/patches/about_dialog_license.patch 2012-01-13 11:45:35 UTC (rev 8068)
+++ packages/pyspread/trunk/debian/patches/about_dialog_license.patch 2012-01-14 16:40:56 UTC (rev 8069)
@@ -1,19 +1,22 @@
-Description: Let the license dialog box read the GPLv3 license from
- /usr/share/common-licenses/GPL instead of the package supplied one.
-Forwarded: not-needed
-Author: Andreas Noteng <andreas at noteng.no>
-Last-Update: 2011-11-17
-
-Index: pyspread-0.1.2/_pyspread/_dialogs.py
-===================================================================
---- pyspread-0.1.2.orig/_pyspread/_dialogs.py 2010-12-12 08:35:54.848435002 +0100
-+++ pyspread-0.1.2/_pyspread/_dialogs.py 2010-12-12 08:36:49.448435001 +0100
-@@ -976,7 +976,7 @@
+--- a/pyspread/src/gui/_dialogs.py
++++ b/pyspread/src/gui/_dialogs.py
+@@ -1049,7 +1049,7 @@
info.Developers = ["Martin Manns"]
info.DocWriters = ["Martin Manns", "Bosko Markovic"]
-- license_file = open(parent.module_path + "/COPYING", "r")
-+ license_file = open("/usr/share/common-licenses/GPL", "r")
+- 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()
+--- a/setup.py
++++ b/setup.py
+@@ -27,7 +27,7 @@
+ 'pyspread/doc/help/*.html',
+ 'pyspread/doc/help/images/*.png',
+ 'pyspread/examples/*',
+- 'pyspread/COPYING', 'pyspread/thanks', 'pyspread/faq',
++ 'pyspread/thanks', 'pyspread/faq',
+ 'authors', 'pyspread.pth']},
+ classifiers=[ \
+ 'Development Status :: 4 - Beta',
Deleted: packages/pyspread/trunk/debian/patches/disable_psyco.patch
===================================================================
--- packages/pyspread/trunk/debian/patches/disable_psyco.patch 2012-01-13 11:45:35 UTC (rev 8068)
+++ packages/pyspread/trunk/debian/patches/disable_psyco.patch 2012-01-14 16:40:56 UTC (rev 8069)
@@ -1,21 +0,0 @@
-Description: Disable psyco to work around open upstream bug
-Forwarded: not-needed
-Bug: http://sourceforge.net/tracker/?func=detail&aid=3100224&group_id=224598&atid=1062244
-Applied-Upstream: http://pyspread.git.sourceforge.net/git/gitweb.cgi?p=pyspread/pyspread;a=commit;h=dce46dc8fc34af91547eab74d517ca368aaad2e5
-Author: Andreas Noteng <andreas at noteng.no>
-Last-Update: 2011-11-17
-
-Index: pyspread-0.1.2/_pyspread/pyspread
-===================================================================
---- pyspread-0.1.2.orig/_pyspread/pyspread 2010-11-07 22:40:24.549542002 +0100
-+++ pyspread-0.1.2/_pyspread/pyspread 2010-11-07 22:41:15.000000000 +0100
-@@ -142,9 +142,4 @@
- import cProfile
- cProfile.run('main()')
- else:
-- try:
-- import psyco
-- psyco.full()
-- except ImportError:
-- pass
- main()
Deleted: packages/pyspread/trunk/debian/patches/remove_extra_COPYING.patch
===================================================================
--- packages/pyspread/trunk/debian/patches/remove_extra_COPYING.patch 2012-01-13 11:45:35 UTC (rev 8068)
+++ packages/pyspread/trunk/debian/patches/remove_extra_COPYING.patch 2012-01-14 16:40:56 UTC (rev 8069)
@@ -1,16 +0,0 @@
-Description: Do not install extra copies of the GPL license.
-Forwarded: not-needed
-Author: Andreas Noteng <andreas at noteng.no>
-Last-Update: 2011-11-17
-
-Index: pyspread-0.1.2/setup.py
-===================================================================
---- pyspread-0.1.2.orig/setup.py 2010-10-31 11:04:41.169915042 +0100
-+++ pyspread-0.1.2/setup.py 2010-10-31 11:04:55.000000000 +0100
-@@ -29,5 +29,5 @@
- package_data={'_pyspread': ['icons/*.png', 'icons/actions/*.png',
- 'icons/toggles/*.png', 'icons/toggles/*.xpm',
- 'examples/*', 'doc/*.html',
-- 'doc/images/*.png', 'README', 'COPYING']},
-+ 'doc/images/*.png', 'README']},
- )
Modified: packages/pyspread/trunk/debian/patches/series
===================================================================
--- packages/pyspread/trunk/debian/patches/series 2012-01-13 11:45:35 UTC (rev 8068)
+++ packages/pyspread/trunk/debian/patches/series 2012-01-14 16:40:56 UTC (rev 8069)
@@ -1,3 +1 @@
-disable_psyco.patch
-remove_extra_COPYING.patch
about_dialog_license.patch
More information about the Python-apps-commits
mailing list