[Python-apps-commits] r10254 - in packages/kupfer/trunk/debian (4 files)

[dktrkranz at users.alioth.debian.org]

    Date: Thursday, December 12, 2013 @ 12:37:30
  Author: dktrkranz
Revision: 10254

Include changes for 0+v208-2.1 NMU

Added:
  packages/kupfer/trunk/debian/patches/keyring-3.patch
Modified:
  packages/kupfer/trunk/debian/changelog
  packages/kupfer/trunk/debian/control
  packages/kupfer/trunk/debian/patches/series

Modified: packages/kupfer/trunk/debian/changelog
===================================================================
--- packages/kupfer/trunk/debian/changelog	2013-12-12 11:37:47 UTC (rev 10253)
+++ packages/kupfer/trunk/debian/changelog	2013-12-12 12:37:30 UTC (rev 10254)
@@ -1,8 +1,11 @@
-kupfer (0+v208-3) UNRELEASED; urgency=low
+kupfer (0+v208-2.1) unstable; urgency=low
 
-  * Use canonical URIs for Vcs-* fields.
+  * Non-maintainer upload with maintainer approval.
+  * debian/patches/keyring-3.patch: python-keyring dropped support for
+    deprecated keyring.backend. Make kupfer compatible with the new backend
+    location. (Closes: #728468)
 
- -- Jakub Wilk <jwilk at debian.org>  Sun, 05 May 2013 18:05:14 +0200
+ -- Sebastian Ramacher <sramacher at debian.org>  Thu, 05 Dec 2013 21:04:54 +0100
 
 kupfer (0+v208-2) unstable; urgency=low
 

Modified: packages/kupfer/trunk/debian/control
===================================================================
--- packages/kupfer/trunk/debian/control	2013-12-12 11:37:47 UTC (rev 10253)
+++ packages/kupfer/trunk/debian/control	2013-12-12 12:37:30 UTC (rev 10254)
@@ -8,8 +8,8 @@
 Standards-Version: 3.9.3
 X-Python-Version: >= 2.6
 Homepage: http://kaizer.se/wiki/kupfer/
-Vcs-Svn: svn://anonscm.debian.org/python-apps/packages/kupfer/trunk/
-Vcs-Browser: http://anonscm.debian.org/viewvc/python-apps/packages/kupfer/trunk/
+Vcs-Svn: svn://svn.debian.org/python-apps/packages/kupfer/trunk/
+Vcs-Browser: http://svn.debian.org/viewsvn/python-apps/packages/kupfer/trunk/
 
 Package: kupfer
 Architecture: all

Added: packages/kupfer/trunk/debian/patches/keyring-3.patch
===================================================================
--- packages/kupfer/trunk/debian/patches/keyring-3.patch	                        (rev 0)
+++ packages/kupfer/trunk/debian/patches/keyring-3.patch	2013-12-12 12:37:30 UTC (rev 10254)
@@ -0,0 +1,50 @@
+Description: Adopt to new keyring backend locations
+ keyring.backend is deprecated since python-keyring 1.1 and has been replaced by
+ keyring.backends. The compatibility module has been dropped in python-keyring
+ 3.0 and thus kupfer needs to use keyring.backends. This is done by checking the
+ new location first and falling back to the old location on ImportError.
+Author: Sebastian Ramacher <sramacher at debian.org>
+Bug-Debian: http://bugs.debian.org/728468
+Last-Update: 2013-12-05
+
+--- a/kupfer/plugin_support.py
++++ b/kupfer/plugin_support.py
+@@ -166,11 +166,18 @@
+ 	@classmethod
+ 	def get_backend_name(cls):
+ 		import keyring.core
+-		import keyring.backend
++		try:
++			from keyring.backends.Gnome import Keyring as GnomeKeyring
++			from keyring.backends.kwallet import Keyring as KDEKWallet
++			from keyring.backends.file import PlaintextKeyring as UncryptedFileKeyring
++		except ImportError:
++			from keyring.backend import GnomeKeyring
++			from keyring.backend import KDEKWallet
++			from keyring.backend import UncryptedFileKeyring
+ 		keyring_map = {
+-				keyring.backend.GnomeKeyring : _("GNOME Keyring"),
+-				keyring.backend.KDEKWallet : _("KWallet"),
+-				keyring.backend.UncryptedFileKeyring: _("Unencrypted File"),
++				GnomeKeyring : _("GNOME Keyring"),
++				KDEKWallet : _("KWallet"),
++				UncryptedFileKeyring: _("Unencrypted File"),
+ 			}
+ 		kr = keyring.get_keyring()
+ 		keyring_name = keyring_map.get(type(kr), type(kr).__name__)
+@@ -209,10 +216,13 @@
+ 		raise
+ 	else:
+ 		# Configure the fallback keyring's configuration file if used
+-		import keyring.backend
+ 		kr = keyring.get_keyring()
+ 		if hasattr(kr, "crypted_password"):
+-			keyring.set_keyring(keyring.backend.UncryptedFileKeyring())
++			try:
++				from keyring.backends.file import PlaintextKeyring as UncryptedFileKeyring
++			except ImportError:
++				from keyring.backend import UncryptedFileKeyring
++			keyring.set_keyring(UncryptedFileKeyring())
+ 			kr = keyring.get_keyring()
+ 		if hasattr(kr, "file_path"):
+ 			kr.file_path = config.save_config_file("keyring.cfg")

Modified: packages/kupfer/trunk/debian/patches/series
===================================================================
--- packages/kupfer/trunk/debian/patches/series	2013-12-12 11:37:47 UTC (rev 10253)
+++ packages/kupfer/trunk/debian/patches/series	2013-12-12 12:37:30 UTC (rev 10254)
@@ -1 +1,2 @@
 uses_fragment.patch
+keyring-3.patch