Package: taskcoach / 1.4.4-1

official_aui.diff Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
Description: Import installed aui instead of thirdparty/.
 See debian/copyright.
Author: Nicolas Boulenguez <nicolas@debian.org>
Forwarded: not-needed

--- a/taskcoachlib/gui/mainwindow.py
+++ b/taskcoachlib/gui/mainwindow.py
@@ -30,7 +30,7 @@
 from taskcoachlib.powermgt import PowerStateMixin
 from taskcoachlib.help.balloontips import BalloonTipManager
 from taskcoachlib.thirdparty.pubsub import pub
-import taskcoachlib.thirdparty.aui as aui
+import wx.lib.agw.aui as aui
 import wx, ctypes
 
 
--- a/taskcoachlib/gui/toolbar.py
+++ b/taskcoachlib/gui/toolbar.py
@@ -17,7 +17,7 @@
 '''
 
 from taskcoachlib import operating_system
-from taskcoachlib.thirdparty import aui
+from wx.lib.agw import aui
 import wx
 import uicommand
 
--- a/taskcoachlib/gui/viewer/container.py
+++ b/taskcoachlib/gui/viewer/container.py
@@ -19,7 +19,7 @@
 from taskcoachlib import operating_system
 from taskcoachlib.gui import menu
 from taskcoachlib.thirdparty.pubsub import pub
-import taskcoachlib.thirdparty.aui as aui
+import wx.lib.agw.aui as aui
 import wx
 
 
--- a/taskcoachlib/widgets/dialog.py
+++ b/taskcoachlib/widgets/dialog.py
@@ -18,7 +18,7 @@
 
 from taskcoachlib import operating_system
 from taskcoachlib.i18n import _
-from taskcoachlib.thirdparty import aui
+from wx.lib.agw import aui
 import notebook
 import wx
 import wx.html
--- a/taskcoachlib/widgets/frame.py
+++ b/taskcoachlib/widgets/frame.py
@@ -17,7 +17,7 @@
 '''
 
 import wx
-import taskcoachlib.thirdparty.aui as aui
+import wx.lib.agw.aui as aui
 from taskcoachlib import operating_system
 
 
--- a/taskcoachlib/widgets/notebook.py
+++ b/taskcoachlib/widgets/notebook.py
@@ -16,7 +16,7 @@
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 '''
 
-import taskcoachlib.thirdparty.aui as aui
+import wx.lib.agw.aui as aui
 import wx
 
 
--- a/Makefile
+++ b/Makefile
@@ -233,7 +233,6 @@
 	cd thirdparty; tar xzf SquareMap-1.0.3.tar.gz --strip-components=1 -C ../taskcoachlib/thirdparty SquareMap-1.0.3/squaremap
 	cd thirdparty; tar xzf python-ntlm-40080cff37ab32570f9bb50bad0a46b957409c18.tar.gz --strip-components=1 -C ../taskcoachlib/thirdparty python-ntlm/ntlm
 	cd thirdparty; tar xzf wxScheduler-r151.tar.gz --strip-components=1 -C ../taskcoachlib/thirdparty wxScheduler/wxScheduler
-	cd thirdparty; tar xzf aui-r72315.tar.gz -C ../taskcoachlib/thirdparty
 	cd thirdparty; tar xzf WMI-1.4.9.tar.gz --strip-components=1 -C ../taskcoachlib/thirdparty WMI-1.4.9/wmi.py
 	cd thirdparty; tar xzf pybonjour-1.1.1.tar.gz --strip-components=1 -C ../taskcoachlib/thirdparty pybonjour-1.1.1/pybonjour.py
 	cp /usr/lib/python2.7/dist-packages/wx-3.0-gtk3/wx/lib/agw/customtreectrl.py taskcoachlib/thirdparty