[Pkg-bitcoin-commits] [electrum] 05/08: Add Suggests: python-zbar and update the installation hint to suggest apt-get instead of pip.

[Tristan Seligmann]

This is an automated email from the git hooks/post-receive script.

mithrandi pushed a commit to branch master
in repository electrum.

commit 005dc74fc46f672c828e91712d5d9a692d5e2139
Author: Tristan Seligmann <mithrandi at debian.org>
Date:   Mon Apr 4 03:11:49 2016 +0200

    Add Suggests: python-zbar and update the installation hint to suggest apt-get instead of pip.
---
 debian/changelog                                    |  2 ++
 debian/control                                      |  2 +-
 debian/patches/series                               |  1 +
 debian/patches/zbar-installation-instructions.patch | 18 ++++++++++++++++++
 lib/qrscanner.py                                    |  2 +-
 5 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5eba722..309f43f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ electrum (2.6.3-1) unstable; urgency=medium
 
   * New upstream release.
     - Drop backported install-wizard-connect.patch.
+  * Add Suggests: python-zbar and update the installation hint to suggest
+    apt-get instead of pip (closes: #819517).
 
  -- Tristan Seligmann <mithrandi at debian.org>  Mon, 04 Apr 2016 03:02:39 +0200
 
diff --git a/debian/control b/debian/control
index 7e541a4..306965f 100644
--- a/debian/control
+++ b/debian/control
@@ -41,7 +41,7 @@ Depends:
  ${misc:Depends},
  ${python:Depends},
 Recommends: python-qt4
-Suggests: python-btchip, python-trezor
+Suggests: python-btchip, python-trezor, python-zbar
 Description: Easy to use Bitcoin client
  This package provides a lightweight Bitcoin client which protects
  you from losing your bitcoins in a backup mistake or computer
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..64a99dc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+zbar-installation-instructions.patch
diff --git a/debian/patches/zbar-installation-instructions.patch b/debian/patches/zbar-installation-instructions.patch
new file mode 100644
index 0000000..b3e9313
--- /dev/null
+++ b/debian/patches/zbar-installation-instructions.patch
@@ -0,0 +1,18 @@
+Description: Suggest apt-get for installing zbar, instead of pip
+Author: Tristan Seligmann <mithrandi at debian.org>
+Forwarded: not-needed
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: b/lib/qrscanner.py
+===================================================================
+--- a/lib/qrscanner.py	2016-04-04 03:02:27.006432905 +0200
++++ b/lib/qrscanner.py	2016-04-04 03:10:06.058131453 +0200
+@@ -37,7 +37,7 @@
+ def scan_qr(config):
+     global proc
+     if not zbar:
+-        raise RuntimeError("\n".join([_("Cannot start QR scanner."),_("The zbar package is not available."),_("On Linux, try 'sudo pip install zbar'")]))
++        raise RuntimeError("\n".join([_("Cannot start QR scanner."),_("The zbar package is not available."),_("Try 'sudo apt-get install python-zbar'")]))
+     if proc is None:
+         device = config.get("video_device", "default")
+         if device == 'default':
diff --git a/lib/qrscanner.py b/lib/qrscanner.py
index 127eec5..ea6facd 100644
--- a/lib/qrscanner.py
+++ b/lib/qrscanner.py
@@ -37,7 +37,7 @@ proc = None
 def scan_qr(config):
     global proc
     if not zbar:
-        raise RuntimeError("\n".join([_("Cannot start QR scanner."),_("The zbar package is not available."),_("On Linux, try 'sudo pip install zbar'")]))
+        raise RuntimeError("\n".join([_("Cannot start QR scanner."),_("The zbar package is not available."),_("Try 'sudo apt-get install python-zbar'")]))
     if proc is None:
         device = config.get("video_device", "default")
         if device == 'default':

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-bitcoin/electrum.git