[Python-apps-commits] r11071 - in packages/pyspread/trunk/debian (7 files)
anoteng-guest at users.alioth.debian.org
anoteng-guest at users.alioth.debian.org
Sat Jul 19 06:38:42 UTC 2014
Date: Saturday, July 19, 2014 @ 06:38:41
Author: anoteng-guest
Revision: 11071
New upstream release
Delete patches added upstream
Refresh patches
Modified:
packages/pyspread/trunk/debian/changelog
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/gpg_uid_to_key_id.patch
packages/pyspread/trunk/debian/patches/tests_font_check.patch
Modified: packages/pyspread/trunk/debian/changelog
===================================================================
--- packages/pyspread/trunk/debian/changelog 2014-07-19 00:28:31 UTC (rev 11070)
+++ packages/pyspread/trunk/debian/changelog 2014-07-19 06:38:41 UTC (rev 11071)
@@ -1,3 +1,12 @@
+pyspread (0.3.1-1) UNRELEASED; urgency=medium
+
+ * New upstream release
+ * Refresh patches
+ * Delete tests_font_check.patch, fixed upstream
+ * Delete gpg_uid_to_key_id.patch, fixed upstream
+
+ -- Andreas Noteng <andreas at noteng.no> Fri, 18 Jul 2014 22:54:42 +0200
+
pyspread (0.2.6-1) unstable; urgency=low
* New upstream release
Modified: packages/pyspread/trunk/debian/patches/about_dialog_license.patch
===================================================================
--- packages/pyspread/trunk/debian/patches/about_dialog_license.patch 2014-07-19 00:28:31 UTC (rev 11070)
+++ packages/pyspread/trunk/debian/patches/about_dialog_license.patch 2014-07-19 06:38:41 UTC (rev 11071)
@@ -3,11 +3,9 @@
Author: Andreas Noteng <andreas at noteng.no>
Last-Update: 2012-01-28
-Index: pyspread-0.2.6/pyspread/src/gui/_dialogs.py
-===================================================================
---- pyspread-0.2.6.orig/pyspread/src/gui/_dialogs.py 2014-01-01 17:01:43.717128431 +0100
-+++ pyspread-0.2.6/pyspread/src/gui/_dialogs.py 2014-01-01 17:01:43.713128343 +0100
-@@ -1171,7 +1171,7 @@
+--- a/pyspread/src/gui/_dialogs.py
++++ b/pyspread/src/gui/_dialogs.py
+@@ -1174,7 +1174,7 @@
"Martin Manns", "Andreas Noteng",
"Enrico Nicoletto"]
Modified: packages/pyspread/trunk/debian/patches/change_default_paths.patch
===================================================================
--- packages/pyspread/trunk/debian/patches/change_default_paths.patch 2014-07-19 00:28:31 UTC (rev 11070)
+++ packages/pyspread/trunk/debian/patches/change_default_paths.patch 2014-07-19 06:38:41 UTC (rev 11071)
@@ -59,26 +59,32 @@
+language = gettext.translation(APP_NAME, languages=languages, fallback=True)
--- a/setup.py
+++ b/setup.py
-@@ -61,9 +61,6 @@
+@@ -60,9 +60,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'
- ],
+ [
+ '*.py',
+- '../pyspread.sh',
+- '../pyspread.bat',
+- '../runtests.py',
+ 'src/*.py',
+ 'src/pyspread',
+ 'src/*/*.py',
+@@ -79,18 +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/gpg_uid_to_key_id.patch
===================================================================
--- packages/pyspread/trunk/debian/patches/gpg_uid_to_key_id.patch 2014-07-19 00:28:31 UTC (rev 11070)
+++ packages/pyspread/trunk/debian/patches/gpg_uid_to_key_id.patch 2014-07-19 06:38:41 UTC (rev 11071)
@@ -1,113 +0,0 @@
-From: Martin Manns <mmanns at gmx.net>
-Last-Update: Thu, 27 Feb 2014 20:59:00 +0100
-Subject: gpg now uses key ids instead of uids to cope with Debian bug
-Origin: https://github.com/manns/pyspread/commit/0c18d269283ac5be4dd6079ddaaada119dae20df
-Bug-Debian: http://bugs.debian.org/739907
-
---- a/pyspread/src/config.py
-+++ b/pyspread/src/config.py
-@@ -104,7 +104,8 @@
- # GPG parameters
- # --------------
-
-- self.gpg_key_uid = repr('')
-+ #self.gpg_key_uid = repr('') # Deprecated
-+ self.gpg_key_fingerprint = repr('')
-
- # CSV parameters for import and export
- # ------------------------------------
-@@ -181,12 +182,13 @@
- setattr(self.data, key, getattr(DefaultConfig(), key))
- self.data.config_version = self.version
-
-- # Reset GPG key if version prior 0.2.4
-- # because of pyme -> gnupg migration
-+ # Delete gpg_key_uid and insert fingerprint key
-
-- if old_config:
-- key = "gpg_key_uid"
-- setattr(self.data, key, getattr(DefaultConfig(), key))
-+ if hasattr(self.data, "gpg_key_uid"):
-+ oldkey = "gpg_key_uid"
-+ delattr(self.data, oldkey)
-+ newkey = "gpg_key_fingerprint"
-+ setattr(self.data, newkey, getattr(DefaultConfig(), newkey))
-
- def save(self):
- """Saves configuration file"""
---- a/pyspread/src/gui/_dialogs.py
-+++ b/pyspread/src/gui/_dialogs.py
-@@ -1277,9 +1277,9 @@
- "widget_params": {"min": 0, "allow_long": True},
- "prepocessor": int,
- }),
-- ("gpg_key_uid", {
-- "label": _(u"GPG key name"),
-- "tooltip": _(u"Name of the GPG key for signing files"),
-+ ("gpg_key_fingerprint", {
-+ "label": _(u"GPG key id"),
-+ "tooltip": _(u"Fingerprint of the GPG key for signing files"),
- "widget": wx.TextCtrl,
- "widget_params": {},
- "prepocessor": unicode,
---- a/pyspread/src/lib/gpg.py
-+++ b/pyspread/src/lib/gpg.py
-@@ -94,22 +94,26 @@
-
- # Check if standard key is already present
-
-- pyspread_key_uid = str(config["gpg_key_uid"])
-- gpg_private_keylist = gpg.list_keys(True)
-+ pyspread_key_fingerprint = str(config["gpg_key_fingerprint"])
-+ gpg_private_keys = gpg.list_keys(True)
-+ gpg_private_fingerprints = gpg.list_keys(True).fingerprints
-
- pyspread_key = None
-
-- for private_key in gpg_private_keylist:
-- if pyspread_key_uid in private_key["uids"]:
-+ for private_key, fingerprint in zip(gpg_private_keys,
-+ gpg_private_fingerprints):
-+ if pyspread_key_fingerprint == fingerprint:
- pyspread_key = private_key
-
- if pyspread_key is None:
- # If no GPG key is set in config, choose one
-- pyspread_key_uid, pyspread_key = choose_uid_key(gpg_private_keylist)
-+ pyspread_key_uid, pyspread_key = choose_uid_key(gpg_private_keys)
-
- if pyspread_key:
- # A key has been chosen
-- config["gpg_key_uid"] = repr(pyspread_key_uid)
-+ fingerprint = \
-+ gpg_private_fingerprints[gpg_private_keys.index(pyspread_key)]
-+ config["gpg_key_fingerprint"] = repr(fingerprint)
-
- else:
- # No key has been chosen --> Create new one
-@@ -138,7 +142,8 @@
-
- for private_key in gpg.list_keys(True):
- if str(fingerprint) == private_key['fingerprint']:
-- config["gpg_key_uid"] = repr(private_key['uids'][0])
-+ config["gpg_key_fingerprint"] = repr(
-+ private_key.fingerprint)
-
- else:
- dlg.Destroy()
-@@ -152,7 +157,7 @@
-
- signfile = open(filename, "rb")
-
-- signed_data = gpg.sign_file(signfile, keyid=config["gpg_key_uid"],
-+ signed_data = gpg.sign_file(signfile, keyid=config["gpg_key_fingerprint"],
- detach=True)
- signfile.close()
-
-@@ -170,4 +175,4 @@
-
- sigfile.close()
-
-- return verified
-\ No newline at end of file
-+ return verified
Modified: packages/pyspread/trunk/debian/patches/python_tutorial.patch
===================================================================
--- packages/pyspread/trunk/debian/patches/python_tutorial.patch 2014-07-19 00:28:31 UTC (rev 11070)
+++ packages/pyspread/trunk/debian/patches/python_tutorial.patch 2014-07-19 06:38:41 UTC (rev 11071)
@@ -8,10 +8,10 @@
Last-Update: 2013-04-21
--- a/pyspread/src/gui/_main_window.py
+++ b/pyspread/src/gui/_main_window.py
-@@ -1256,12 +1256,17 @@
- def OnPythonTutorial(self, event):
- """Python tutorial launch event handler"""
+@@ -1297,12 +1297,17 @@
+ # Doas not work any more
+
- self.main_window.actions.launch_help("Python tutorial",
- get_python_tutorial_path())
+ if os.path.isfile("/usr/share/doc/python-doc/html/tutorial/index.html"):
Modified: packages/pyspread/trunk/debian/patches/series
===================================================================
--- packages/pyspread/trunk/debian/patches/series 2014-07-19 00:28:31 UTC (rev 11070)
+++ packages/pyspread/trunk/debian/patches/series 2014-07-19 06:38:41 UTC (rev 11071)
@@ -1,5 +1,3 @@
about_dialog_license.patch
change_default_paths.patch
python_tutorial.patch
-tests_font_check.patch
-gpg_uid_to_key_id.patch
Deleted: packages/pyspread/trunk/debian/patches/tests_font_check.patch
===================================================================
--- packages/pyspread/trunk/debian/patches/tests_font_check.patch 2014-07-19 00:28:31 UTC (rev 11070)
+++ packages/pyspread/trunk/debian/patches/tests_font_check.patch 2014-07-19 06:38:41 UTC (rev 11071)
@@ -1,25 +0,0 @@
-Description: Ensure tests don't fail if msttcorefonts is not installed
-Author: Martin Manns <mmanns at gmx.net>
-Last-Update: 2014-02-23
---- a/pyspread/src/lib/test/test_parsers.py
-+++ b/pyspread/src/lib/test/test_parsers.py
-@@ -57,7 +57,11 @@
- def test_get_font_from_data(fontdata, face, size):
- """Unit test for get_font_from_data"""
-
-- font = get_font_from_data(fontdata)
-+ try:
-+ font = get_font_from_data(fontdata)
-+ except:
-+ # msttcorefonts is missing
-+ return
-
- assert font.GetFaceName() == face
- assert font.GetPointSize() == size
-@@ -79,4 +83,4 @@
- pen = get_pen_from_data(pendata)
-
- assert pen.GetColour() == color
-- assert pen.GetWidth() == width
-\ No newline at end of file
-+ assert pen.GetWidth() == width
More information about the Python-apps-commits
mailing list