Control: tag -1 +patch
Control: severity -1 serious
# Justification: blocks the on-going wxpython3.0 transition
I've rebuilt python-avc with the attached patch and checked that all
the examples matching examples/wx_*.py work.
I'm happy to NMU this change - just let me know if you'd like me to.
Cheers,
Olly
diff -Nru python-avc-0.8.3/debian/changelog python-avc-0.8.3/debian/changelog
--- python-avc-0.8.3/debian/changelog 2011-04-21 07:53:08.000000000 +1200
+++ python-avc-0.8.3/debian/changelog 2014-09-18 23:57:18.000000000 +1200
@@ -1,3 +1,13 @@
+python-avc (0.8.3-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Update for wxPython 3.0 (Closes: #759091):
+ + New patch: wxpython3.0.patch
+ + Drop alternative dependency on long-obsolete python-wxgtk2.6.
+ (Closes: #645890)
+
+ -- Olly Betts <[email protected]> Thu, 18 Sep 2014 11:57:16 +0000
+
python-avc (0.8.3-1) unstable; urgency=low
[ Fabrizio Pollastri ]
diff -Nru python-avc-0.8.3/debian/control python-avc-0.8.3/debian/control
--- python-avc-0.8.3/debian/control 2011-04-21 07:51:49.000000000 +1200
+++ python-avc-0.8.3/debian/control 2014-09-18 23:22:27.000000000 +1200
@@ -14,7 +14,7 @@
Architecture: all
Depends: ${python:Depends}, ${misc:Depends}
Suggests: python-gtk2 (>=2.0), python-qt3 (>=3.0), python-qt4 (>=4.0),
- python-tk (>=2.0), python-wxgtk2.6 | python-wxgtk2.8, jython (>=2.5)
+ python-tk (>=2.0), python-wxgtk3.0, jython (>=2.5)
Description: live connection among widgets and application variables
AVC, the Application View Controller is a multiplatform, fully automatic,
live connection among the values displayed by graphical interface widgets and
diff -Nru python-avc-0.8.3/debian/patches/series python-avc-0.8.3/debian/patches/series
--- python-avc-0.8.3/debian/patches/series 1970-01-01 12:00:00.000000000 +1200
+++ python-avc-0.8.3/debian/patches/series 2014-09-18 23:33:34.000000000 +1200
@@ -0,0 +1 @@
+wxpython3.0.patch
diff -Nru python-avc-0.8.3/debian/patches/wxpython3.0.patch python-avc-0.8.3/debian/patches/wxpython3.0.patch
--- python-avc-0.8.3/debian/patches/wxpython3.0.patch 1970-01-01 12:00:00.000000000 +1200
+++ python-avc-0.8.3/debian/patches/wxpython3.0.patch 2014-09-19 00:02:27.000000000 +1200
@@ -0,0 +1,210 @@
+Description: Update for wxPython 3.0
+ These changes should remain compatible with wxPython 2.8.
+Author: Olly Betts <[email protected]>
+Bug-Debian: https://bugs.debian.org/759091
+Forwarded: no
+Last-Update: 2014-09-18
+
+Index: python-avc-0.8.3/examples/wx_countdown.py
+===================================================================
+--- python-avc-0.8.3.orig/examples/wx_countdown.py
++++ python-avc-0.8.3/examples/wx_countdown.py
+@@ -76,7 +76,7 @@ class Countdown(AVC):
+ self.root.Close()
+
+
+-class Example(wx.PySimpleApp,AVC):
++class Example(wx.App,AVC):
+ """
+ Continuously create at random intervals windows with a countdown from 10 to 0.
+ When a countdown reaches zero, its window is destroyed. Also create a main
+@@ -86,7 +86,7 @@ class Example(wx.PySimpleApp,AVC):
+ def __init__(self):
+
+ # init wx application base class
+- wx.PySimpleApp.__init__(self)
++ wx.App.__init__(self)
+
+ # create GUI
+ xml_resource = xrc.XmlResource(WXGLADE_MAIN)
+Index: python-avc-0.8.3/examples/wx_counter.py
+===================================================================
+--- python-avc-0.8.3.orig/examples/wx_counter.py
++++ python-avc-0.8.3/examples/wx_counter.py
+@@ -39,13 +39,13 @@ LOW_SPEED = 0.5 #--
+ HIGH_SPEED = 0.1 #- low and high speed period (ms)
+
+
+-class ExampleGUI(wx.PySimpleApp):
++class ExampleGUI(wx.App):
+ "Counter GUI creation"
+
+ def __init__(self):
+
+ # init wx application base class
+- wx.PySimpleApp.__init__(self)
++ wx.App.__init__(self)
+
+ # create GUI
+ xml_resource = xrc.XmlResource(WXGLADE_XML)
+Index: python-avc-0.8.3/examples/wx_counter_progui.py
+===================================================================
+--- python-avc-0.8.3.orig/examples/wx_counter_progui.py
++++ python-avc-0.8.3/examples/wx_counter_progui.py
+@@ -37,7 +37,7 @@ LOW_SPEED = 500 #--
+ HIGH_SPEED = 100 #- low and high speed period (ms)
+
+
+-class Example(wx.PySimpleApp,AVC):
++class Example(wx.App,AVC):
+ """
+ A counter displayed in a static text widget whose count speed can be
+ accelerated by checking a check box.
+@@ -48,7 +48,7 @@ class Example(wx.PySimpleApp,AVC):
+ ## create GUI
+
+ # init wx application base class
+- wx.PySimpleApp.__init__(self)
++ wx.App.__init__(self)
+
+ # create widgets: a top level window, a label and a spin control.
+ self.root = wx.Frame(None,title='AVC wx counter example',size=(320,60))
+Index: python-avc-0.8.3/examples/wx_label.py
+===================================================================
+--- python-avc-0.8.3.orig/examples/wx_label.py
++++ python-avc-0.8.3/examples/wx_label.py
+@@ -37,7 +37,7 @@ from avc import * # AVC for wx
+ WXGLADE_XML = 'wx_label.xrc' # GUI wxGlade descriptor
+
+
+-class Example(wx.PySimpleApp,AVC):
++class Example(wx.App,AVC):
+ """
+ Showcase of formatting capabilities for the label widget
+ """
+@@ -45,7 +45,7 @@ class Example(wx.PySimpleApp,AVC):
+ def __init__(self):
+
+ # init wx application base class
+- wx.PySimpleApp.__init__(self)
++ wx.App.__init__(self)
+
+ # create GUI
+ xml_resource = xrc.XmlResource(WXGLADE_XML)
+Index: python-avc-0.8.3/examples/wx_listtreectrl.py
+===================================================================
+--- python-avc-0.8.3.orig/examples/wx_listtreectrl.py
++++ python-avc-0.8.3/examples/wx_listtreectrl.py
+@@ -41,7 +41,7 @@ WXGLADE_XML = 'wx_listtreectrl.xrc' # GU
+ UPDATE_PERIOD = 2000 # ms
+
+
+-class Example(wx.PySimpleApp,AVC):
++class Example(wx.App,AVC):
+ """
+ Showcase of display capabilities for the list control and tree control widgets
+ """
+@@ -49,7 +49,7 @@ class Example(wx.PySimpleApp,AVC):
+ def __init__(self):
+
+ # init wx application base class
+- wx.PySimpleApp.__init__(self)
++ wx.App.__init__(self)
+
+ # create GUI
+ xml_resource = xrc.XmlResource(WXGLADE_XML)
+Index: python-avc-0.8.3/examples/wx_showcase.py
+===================================================================
+--- python-avc-0.8.3.orig/examples/wx_showcase.py
++++ python-avc-0.8.3/examples/wx_showcase.py
+@@ -38,7 +38,7 @@ WXGLADE_XML = 'wx_showcase.xrc' # GUI w
+ INCREMENTER_PERIOD = 333 # ms
+
+
+-class Example(wx.PySimpleApp,AVC):
++class Example(wx.App,AVC):
+ """
+ A table of all supported widget/control type combinations
+ """
+@@ -46,7 +46,7 @@ class Example(wx.PySimpleApp,AVC):
+ def __init__(self):
+
+ # init wx application base class
+- wx.PySimpleApp.__init__(self)
++ wx.App.__init__(self)
+
+ # create GUI
+ xml_resource = xrc.XmlResource(WXGLADE_XML)
+Index: python-avc-0.8.3/examples/wx_spinctrl.py
+===================================================================
+--- python-avc-0.8.3.orig/examples/wx_spinctrl.py
++++ python-avc-0.8.3/examples/wx_spinctrl.py
+@@ -37,7 +37,7 @@ from avc import * # AVC
+ WXGLADE_XML = 'wx_spinctrl.xrc' # GUI wxGlade descriptor
+
+
+-class Example(wx.PySimpleApp,AVC):
++class Example(wx.App,AVC):
+ """
+ A spin control whose value is replicated into a static text
+ """
+@@ -45,7 +45,7 @@ class Example(wx.PySimpleApp,AVC):
+ def __init__(self):
+
+ # init wx application base class
+- wx.PySimpleApp.__init__(self)
++ wx.App.__init__(self)
+
+ # create GUI
+ xml_resource = xrc.XmlResource(WXGLADE_XML)
+Index: python-avc-0.8.3/examples/wx_spinctrl_progui.py
+===================================================================
+--- python-avc-0.8.3.orig/examples/wx_spinctrl_progui.py
++++ python-avc-0.8.3/examples/wx_spinctrl_progui.py
+@@ -34,7 +34,7 @@ import wx # wx tool kit bindings
+ from avc import * # AVC
+
+
+-class Example(wx.PySimpleApp,AVC):
++class Example(wx.App,AVC):
+ """
+ A spin control whose value is replicated into a static text
+ """
+@@ -44,7 +44,7 @@ class Example(wx.PySimpleApp,AVC):
+ ## create GUI
+
+ # init wx application base class
+- wx.PySimpleApp.__init__(self)
++ wx.App.__init__(self)
+
+ # create widgets: a top level window, a static text and a spin control.
+ root = wx.Frame(None,title='AVC wx spin control example',size=(320,60))
+Index: python-avc-0.8.3/examples/wx_showcase.xrc
+===================================================================
+--- python-avc-0.8.3.orig/examples/wx_showcase.xrc
++++ python-avc-0.8.3/examples/wx_showcase.xrc
+@@ -30,7 +30,6 @@
+ </object>
+ </object>
+ <object class="sizeritem">
+- <option>1</option>
+ <flag>wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxSHAPED</flag>
+ <object class="wxStaticText" name="label_5">
+ <style>wxALIGN_CENTRE</style>
+@@ -68,7 +67,7 @@
+ <border>5</border>
+ <object class="wxBitmapButton" name="boolean1__bitmapbutton">
+ <size>40, 25</size>
+- <bitmap>../doc/favicon.ico</bitmap>
++ <!-- file missing: <bitmap>../doc/favicon.ico</bitmap> -->
+ </object>
+ </object>
+ </object>
+@@ -96,7 +95,6 @@
+ </object>
+ </object>
+ <object class="sizeritem">
+- <option>1</option>
+ <flag>wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxSHAPED</flag>
+ <object class="wxBoxSizer">
+ <orient>wxVERTICAL</orient>
