-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Dear maintainer,

Since it's been a few days that this issue has been reassigned to your
package, and that there's no sign of activity, I have pushed the
attached fix into collab-maint, and uploaded the NMU to DELAYED/2.

If you do not agree with the fix, please let me know soon enough so that
I can dcut the upload.

I hope this helps,
Cheers,

Thomas Goirand (zigo)

-----BEGIN PGP SIGNATURE-----

iQIzBAEBCAAdFiEEtKCq/KhshgVdBnYUq1PlA1hod6YFAlpy2C4ACgkQq1PlA1ho
d6YBbBAAvC3GfuJi8SANDaw02WaoAkVWltEW18koJpHCMAeufAbRnn/c3y2LHDao
2kMnnifI1jQKheib6a0VnujYAo0PbsjZJdF40XeaV2/3cGZVAJhE/lyMF9qVyS1z
cegs6VUbYMJfktPLik2So/ugHgF1yloHUOYW5AtpLsQSrCgsjaIDO4SZBpB6Lz6G
5lc6/6tisJq9Wwqr1HZfJXJZ6iMhAym4fnCE3hi8iHAzFk8zmsvybtC+34XB4Yth
l6ZhkEvnROIRBRbW8IVkZOJDCfWM36+lFeqcYtlh+rdo9WYriG6/TOhXaagxxmSS
Hg+6cs23JTyc1SsJ8GqPuzOLzlQv6OPuoJWaqvY0YEKQB1wYnutf3u0B2D4SlaN9
DOOy7A6p9VZ9YU+JImj0EllHq0q4K1iagdnGPhIj2QIn5lpoM/nDsMcnl6m6Qz7r
Q8K0Sa7Jwf1B+M2p586lOCqTWlTng6Rhseirp5nKdIJ2P7Sy4MhX19tq4vm3XJJO
0tKTxShLMhTG55UxO7XQ4eKDjzk8q3P6PXVXzb7F5GB2Lt3jJSy1dnQ+QXLh6KD4
GOTEXIvFS5kGbjG4lnfsjMft+45NbG+nnn2yHGLcpYH3OadSaAL2DglfCLG6x6HJ
dfhBkk/4XxXO42yec/Ikav2P5ScLReblsAcbv8ast4TFBrmdZPo=
=PYpp
-----END PGP SIGNATURE-----
diff -Nru cmd2-0.7.7/debian/changelog cmd2-0.7.7/debian/changelog
--- cmd2-0.7.7/debian/changelog 2017-08-27 12:30:40.000000000 +0000
+++ cmd2-0.7.7/debian/changelog 2018-02-01 08:57:32.000000000 +0000
@@ -1,3 +1,10 @@
+cmd2 (0.7.7-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Added patch to make cmd2 work with newer pyperclip (Closes: #888080).
+
+ -- Thomas Goirand <z...@debian.org>  Thu, 01 Feb 2018 08:57:32 +0000
+
 cmd2 (0.7.7-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru 
cmd2-0.7.7/debian/patches/fix-cmd2-not-working-with-newer-pyperclip.patch 
cmd2-0.7.7/debian/patches/fix-cmd2-not-working-with-newer-pyperclip.patch
--- cmd2-0.7.7/debian/patches/fix-cmd2-not-working-with-newer-pyperclip.patch   
1970-01-01 00:00:00.000000000 +0000
+++ cmd2-0.7.7/debian/patches/fix-cmd2-not-working-with-newer-pyperclip.patch   
2018-02-01 08:57:32.000000000 +0000
@@ -0,0 +1,35 @@
+Description: Fix cmd2 not working with newer pyperclip
+ Fixed bug due to pyperclip dependency radically changing its project structure
+ in latest version. This was cherry-picked form an upstream commit (ie: a patch
+ that was merged) on Github:
+  
https://github.com/python-cmd2/cmd2/pull/231/commits/5027f7cbcf2575dfc5a0c67068951c9ea4b9d7dd
+Author: Thomas Goirand <z...@debian.org>
+Bug-Debian: https://bugs.debian.org/888080
+Forwarded: not-needed
+Last-Update: 2018-02-01
+
+--- cmd2-0.7.7.orig/cmd2.py
++++ cmd2-0.7.7/cmd2.py
+@@ -46,6 +46,13 @@ from optparse import make_option
+ import pyparsing
+ import pyperclip
+ 
++# Newer versions of pyperclip are released as a single file, but older 
versions had a more complicated structure
++try:
++    from pyperclip.exceptions import PyperclipException
++except ImportError:
++    # noinspection PyUnresolvedReferences
++    from pyperclip import PyperclipException
++
+ # On some systems, pyperclip will import gtk for its clipboard functionality.
+ # The following code is a workaround for gtk interfering with printing from a 
background
+ # thread while the CLI thread is blocking in raw_input() in Python 2 on Linux.
+@@ -330,7 +337,7 @@ try:
+     else:
+         # Try getting the contents of the clipboard
+         _ = pyperclip.paste()
+-except pyperclip.exceptions.PyperclipException:
++except PyperclipException:
+     can_clip = False
+ else:
+     can_clip = True
diff -Nru cmd2-0.7.7/debian/patches/series cmd2-0.7.7/debian/patches/series
--- cmd2-0.7.7/debian/patches/series    2017-08-27 12:30:40.000000000 +0000
+++ cmd2-0.7.7/debian/patches/series    2018-02-01 08:57:32.000000000 +0000
@@ -0,0 +1 @@
+fix-cmd2-not-working-with-newer-pyperclip.patch

Reply via email to