[Python-modules-commits] [pyqt5] 01/01: Drop disabled_features.diff, applied upstream.

[Dmitry Shachnev]

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

mitya57 pushed a commit to branch debian/master
in repository pyqt5.

commit 7041884250008d0c7665b99e55821b012c215105
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Thu Nov 9 16:07:38 2017 +0300

    Drop disabled_features.diff, applied upstream.
---
 debian/changelog                      |  1 +
 debian/patches/disabled_features.diff | 26 --------------------------
 debian/patches/series                 |  1 -
 3 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 607aeab..350f538 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ pyqt5 (5.9.1+dfsg-1) UNRELEASED; urgency=medium
   * New upstream release.
   * Bump sip build-dependencies to 4.19.4, following configure.py.
   * Update pyrcc5 manpage for -name option removal.
+  * Drop disabled_features.diff, applied upstream.
 
  -- Dmitry Shachnev <mitya57 at debian.org>  Thu, 09 Nov 2017 15:59:38 +0300
 
diff --git a/debian/patches/disabled_features.diff b/debian/patches/disabled_features.diff
deleted file mode 100644
index f835e32..0000000
--- a/debian/patches/disabled_features.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Dmitry Shachnev <mitya57 at debian.org>
-Date: Wed, 16 Aug 2017 11:29:33 +0300
-Subject: Fixed the configuration tests' handling of disabled features.
-
-Origin: upstream, changeset 1a7f9ba28fed
----
- configure.py | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/configure.py b/configure.py
-index b24866d..8bfdd1a 100644
---- a/configure.py
-+++ b/configure.py
-@@ -2168,10 +2168,8 @@ int main(int, char **)
-     if source is None:
-         for disabled in run_test_program(mname, test, verbose):
-             if disabled:
--                inform("Disabled %s features: %s" % (mname,
--                        ', '.join(disabled)))
--
--            target_config.pyqt_disabled_features.extend(disabled)
-+                inform("Disabled %s feature: %s" % (mname, disabled))
-+                target_config.pyqt_disabled_features.append(disabled)
- 
-     # Include the module in the build.
-     target_config.pyqt_modules.append(mname)
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index bb6042b..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-disabled_features.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/pyqt5.git