[Python-modules-commits] [pyqwt5] 02/03: 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 636b2b5ab41a40f0d94cd48c9baee69a963e0c4e
Merge: 8ed7f80 9b72afa
Author: Gudjon I. Gudjonsson <gudjon at gudjon.org>
Date:   Thu Aug 18 12:12:50 2016 +0200

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 .../patches/0005-Disable-impageplot-example.patch  | 22 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 qt4examples/Grab.py                                |  2 +-
 4 files changed, 26 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index 2e0e737,0000000..f8da281
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
- e22e7e1ce7b78ef83edd438d91e137aa4ce17807
- e22e7e1ce7b78ef83edd438d91e137aa4ce17807
++9b72afaeb1d8ec8602826fca7889c5bd579f292c
++9b72afaeb1d8ec8602826fca7889c5bd579f292c
 +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/0005-Disable-impageplot-example.patch
index 0000000,0000000..28d27ab
new file mode 100644
--- /dev/null
+++ b/debian/patches/0005-Disable-impageplot-example.patch
@@@ -1,0 -1,0 +1,22 @@@
++From 9b72afaeb1d8ec8602826fca7889c5bd579f292c Mon Sep 17 00:00:00 2001
++From: "Gudjon I. Gudjonsson" <gudjon at gudjon.org>
++Date: Thu, 18 Aug 2016 12:10:11 +0200
++Subject: Disable impageplot example
++
++---
++ qt4examples/Grab.py | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/qt4examples/Grab.py b/qt4examples/Grab.py
++index 8658967..7aaeabd 100755
++--- a/qt4examples/Grab.py
+++++ b/qt4examples/Grab.py
++@@ -26,7 +26,7 @@ jobs = [
++     'ErrorBarDemo',
++     'EventFilterDemo',
++     'HistogramDemo',
++-    'ImagePlotDemo',
+++#    'ImagePlotDemo',
++     'MapDemo',
++     'MaskedDataDemo',
++ #    'MultiDemo',
diff --cc debian/patches/series
index a79feb7,0000000..3ced8bb
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,4 -1,0 +1,5 @@@
 +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
++0005-Disable-impageplot-example.patch

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