[Python-modules-commits] [pyqwt5] 05/05: merge patched into master

[Gudjon I. Gudjonsson]

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

gudjon-guest pushed a commit to branch master
in repository pyqwt5.

commit 8ed7f80595091f97dcd1089597901d4798981d57
Merge: 75dea1b e22e7e1
Author: Gudjon I. Gudjonsson <gudjon at gudjon.org>
Date:   Thu Aug 18 11:51:52 2016 +0200

    merge patched into master

 debian/.git-dpm                                    |  4 +--
 ...4-Remove-numpy-and-numarray-from-anynumpy.patch | 41 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 qt4lib/PyQt4/Qwt5/anynumpy.py                      | 19 +++-------
 4 files changed, 49 insertions(+), 16 deletions(-)

diff --cc debian/.git-dpm
index 54b77ff,0000000..2e0e737
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- b9557a4802c2ec2e36cf8fbbf53abcbceeedd2cc
- b9557a4802c2ec2e36cf8fbbf53abcbceeedd2cc
++e22e7e1ce7b78ef83edd438d91e137aa4ce17807
++e22e7e1ce7b78ef83edd438d91e137aa4ce17807
 +2725fc5cb7cb957a1686214a4b5d79bed432a9a4
 +2725fc5cb7cb957a1686214a4b5d79bed432a9a4
 +pyqwt5_5.2.1~cvs20091107+dfsg.orig.tar.gz
 +1656db3dd45c84afe0d538cba43cc97d114508d9
 +223726
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0004-Remove-numpy-and-numarray-from-anynumpy.patch
index 0000000,0000000..248cc56
new file mode 100644
--- /dev/null
+++ b/debian/patches/0004-Remove-numpy-and-numarray-from-anynumpy.patch
@@@ -1,0 -1,0 +1,41 @@@
++From e22e7e1ce7b78ef83edd438d91e137aa4ce17807 Mon Sep 17 00:00:00 2001
++From: "Gudjon I. Gudjonsson" <gudjon at gudjon.org>
++Date: Thu, 18 Aug 2016 11:51:45 +0200
++Subject: Remove numpy and numarray from anynumpy
++
++---
++ qt4lib/PyQt4/Qwt5/anynumpy.py | 19 +++++--------------
++ 1 file changed, 5 insertions(+), 14 deletions(-)
++
++diff --git a/qt4lib/PyQt4/Qwt5/anynumpy.py b/qt4lib/PyQt4/Qwt5/anynumpy.py
++index 6c1248e..d1b1a84 100644
++--- a/qt4lib/PyQt4/Qwt5/anynumpy.py
+++++ b/qt4lib/PyQt4/Qwt5/anynumpy.py
++@@ -1,18 +1,8 @@
++-# import either NumPy, or numarray, or Numeric
+++# import NumPy but not numarray, or Numeric anymore
++ 
++-for name in ('numpy', 'numarray', 'Numeric'):
++-    failed = False
++-    try:
++-         eval(compile('from %s import *' % name, 'eval', 'exec'))
++-         if name == 'numpy':
++-             from numpy.oldnumeric.compat import *
++-             Float = float
++-             UInt8 = uint8
++-    except ImportError:
++-        failed = True
++-    if not failed:
++-        break
++-else:
+++try:
+++     eval(compile('from numpy import *', 'eval', 'exec'))
+++except ImportError:
++     import PyQt4.Qt as Qt
++     if not Qt.QCoreApplication.instance():
++         a = Qt.QApplication([])
++@@ -31,3 +21,4 @@ else:
++ # Local Variables: ***
++ # mode: python ***
++ # End: ***
+++
diff --cc debian/patches/series
index cd08fd2,0000000..a79feb7
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,3 -1,0 +1,4 @@@
 +01_confiure.patch
 +02_examples.patch
 +0003-Change-Float-to-float-to-fix-for-non-obsolete-numpy-.patch
++0004-Remove-numpy-and-numarray-from-anynumpy.patch

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