diff -u bittorrent-3.4.2/btcompletedirgui.py bittorrent-3.4.2/btcompletedirgui.py --- bittorrent-3.4.2/btcompletedirgui.py +++ bittorrent-3.4.2/btcompletedirgui.py @@ -9,21 +9,8 @@ from threading import Event, Thread from os.path import join, split from sys import argv -try: - import wxversion - wxversion.select('2.4') - from wxPython.wx import * -except: - print 'Could not load wxPython. In order to use this script,' - print 'you must have wxPython installed. It is available in' - print 'the package libwxgtk2.4-python.' - print - print 'I am now going to attempt to run xmessage to alert' - print 'GUI users.' - from os import system - system("xmessage -file /usr/share/bittorrent/nowxmsg") - sys.exit(-1) +from wxPython.wx import * from traceback import print_exc wxEVT_INVOKE = wxNewEventType() diff -u bittorrent-3.4.2/btdownloadgui.py bittorrent-3.4.2/btdownloadgui.py --- bittorrent-3.4.2/btdownloadgui.py +++ bittorrent-3.4.2/btdownloadgui.py @@ -10,21 +10,9 @@ from threading import Event, Thread from os.path import join, split, exists from os import getcwd -try: - import wxversion - wxversion.select('2.4') - from wxPython.wx import * - wxEVT_INVOKE = wxNewEventType() -except: - print 'Could not load wxPython. In order to use this script,' - print 'you must have wxPython installed. It is available in' - print 'the package libwxgtk2.4-python.' - print - print 'I am now going to attempt to run xmessage to alert' - print 'GUI users.' - from os import system - system("xmessage -file /usr/share/bittorrent/nowxmsg") - sys.exit(-1) + +from wxPython.wx import * +wxEVT_INVOKE = wxNewEventType() from time import strftime, time from webbrowser import open_new diff -u bittorrent-3.4.2/debian/changelog bittorrent-3.4.2/debian/changelog --- bittorrent-3.4.2/debian/changelog +++ bittorrent-3.4.2/debian/changelog @@ -1,3 +1,10 @@ +bittorrent (3.4.2-11ubuntu3~7.10) gutsy-proposed; urgency=low + + * Revert the change that used wxversion to select the python-wxgtk + version to use. (LP: #66795) + + -- Cameron Dale Sun, 21 Oct 2007 17:28:45 -0700 + bittorrent (3.4.2-11ubuntu2) gutsy; urgency=low * Added 01_btshow-meta-info patch, now bittorrent checks