[Pkg-bitcoin-commits] [electrum] 09/11: Remove 1002_qt_compatibility.patch: merged upstream.

[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 5b1ddfbe572f826b4af509dfb277634962cf6317
Author: Tristan Seligmann <mithrandi at debian.org>
Date:   Fri May 1 22:17:49 2015 +0200

    Remove 1002_qt_compatibility.patch: merged upstream.
---
 debian/changelog                           |  1 +
 debian/patches/1002_qt_compatibility.patch | 24 ------------------------
 debian/patches/series                      |  1 -
 3 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2e09fab..be676a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ electrum (2.1.1-1) UNRELEASED; urgency=medium
     - Remove 2001_add_tailing_semicolon.patch: merged upstream.
     - Remove 2002_dont_use_local_share.patch: obsolete.
     - Remove 1001_use_sslv23_method.patch: merged upstream.
+    - Remove 1002_qt_compatibility.patch: merged upstream.
 
  -- Vasudev Kamath <kamathvasudev at gmail.com>  Sun, 23 Nov 2014 20:07:00 +0530
 
diff --git a/debian/patches/1002_qt_compatibility.patch b/debian/patches/1002_qt_compatibility.patch
deleted file mode 100644
index 15eb487..0000000
--- a/debian/patches/1002_qt_compatibility.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Description: Fix Qt usage
- Fix an issue where the wallet creation / restoration wizard would not work
- properly on Qt 4.11 or higher.
-Author: ThomasV
-Origin: upstream, https://github.com/spesmilo/electrum/commit/fde5dd577a221aa3c5c159b885caa3aa653b7d9c
-Bug: https://github.com/spesmilo/electrum/issues/849
-Bug-Debian: https://bugs.debian.org/764138
-Applied-Upstream: fde5dd577a221aa3c5c159b885caa3aa653b7d9c
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: electrum/gui/qt/installwizard.py
-===================================================================
---- electrum.orig/gui/qt/installwizard.py	2014-05-04 10:38:01.524676062 +0200
-+++ electrum/gui/qt/installwizard.py	2015-01-13 13:22:57.566593548 +0200
-@@ -31,7 +31,8 @@
-     def set_layout(self, layout):
-         w = QWidget()
-         w.setLayout(layout)
--        self.stack.setCurrentIndex(self.stack.addWidget(w))
-+        self.stack.addWidget(w)
-+        self.stack.setCurrentWidget(w)
- 
- 
-     def restore_or_create(self):
diff --git a/debian/patches/series b/debian/patches/series
index bd27469..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-1002_qt_compatibility.patch

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