[SCM] python-pyo/master: Merging code from last NMU.

[tiago at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 26708ec4502c6c0273dd98798226626895d0c3cb
Author: Tiago Bortoletto Vaz <tiago at debian.org>
Date:   Thu Jan 29 23:01:01 2015 -0500

    Merging code from last NMU.

diff --git a/debian/changelog b/debian/changelog
index a4b0106..2daa789 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,21 @@
-python-pyo (0.7-4) experimental; urgency=medium
+python-pyo (0.7.4-1) experimental; urgency=medium
 
   * New upstream version.
 
  -- Tiago Bortoletto Vaz <tiago at debian.org>  Thu, 29 Jan 2015 22:49:12 -0500
 
+python-pyo (0.7-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Updates for wxPython 3.0 compatibility (Closes: #759092):
+    - Fix deprecation warnings with wxPython 3.0.
+    - Fix check for wxPython not to insist that 2.8 is installed before picking
+      something that's 2.8 or newer.
+    - Update uses of removed alias wx.Color to wx.Colour.
+    - Update FileDialog flags to use the non-deprecated "FD_" prefixed form.
+
+ -- Olly Betts <olly at survex.com>  Sat, 20 Sep 2014 01:34:09 +0000
+
 python-pyo (0.7-2) unstable; urgency=low
 
   * Depends on python-wxgtk3.0 instead of python-wxgtk2.8 to have the
diff --git a/debian/patches/01-epyo_paths b/debian/patches/01-epyo_paths
index b666e19..be66d53 100644
--- a/debian/patches/01-epyo_paths
+++ b/debian/patches/01-epyo_paths
@@ -1,5 +1,7 @@
---- a/utils/E-Pyo.py
-+++ b/utils/E-Pyo.py
+Index: python-pyo-0.7/utils/E-Pyo.py
+===================================================================
+--- python-pyo-0.7.orig/utils/E-Pyo.py
++++ python-pyo-0.7/utils/E-Pyo.py
 @@ -210,7 +210,7 @@
  elif WIN_APP_BUNDLED:
      EXAMPLE_PATH = os.path.join(os.getcwd(), "Resources", "examples")
diff --git a/debian/patches/series b/debian/patches/series
index add74dc..cc963e0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 01-epyo_paths
+wxpython3.0.patch

-- 
python-pyo packaging