Luk Claes writes:
Attached the patch for the version I intend to upload. Please respond if
you don't want this NMU to happen, if you are working yourself on a
patch or if you think that the attached patch won't work.
I ran into a problem subtle problem with this. There is also a
python-wxgtk2.6 package in unstable and it does NOT conflict with the 2.4
version. When both are installed, 2.6 takes precedence by default
(update-alternatives --list wx.pth) and bittorrent-gui has a syntax error
which was "legal" in 2.4 but not acceptable in 2.6.
The problem is that tuples are required to be enclosed in parentheses and
they are not so in the calls to Sizers.
One solution would be to make bittorrent-gui conflict with python-wxgtk2.6
but since the cause is python syntax sloppiness, I suggest that the
program be corrected to work with either 2.4 or 2.6. Once this is done,
the correct dependency for bittorrent-gui should be
python-wxgtk2.4 | python-wxgtk2.6
I also suggest that the patch be submitted upstream.
diff -ur bittorrent-3.4.2.orig/btcompletedirgui.py
bittorrent-3.4.2/btcompletedirgui.py
--- bittorrent-3.4.2.orig/btcompletedirgui.py 2005-10-21 14:21:20.000000000
-0500
+++ bittorrent-3.4.2/btcompletedirgui.py 2005-10-21 13:44:12.000000000
-0500
@@ -40,11 +40,11 @@
b = wxBoxSizer(wxHORIZONTAL)
b.Add(self.dirCtl, 1, wxEXPAND)
- b.Add(10, 10, 0, wxEXPAND)
+ b.Add((10, 10), 0, wxEXPAND)
button = wxButton(panel, -1, 'add file')
b.Add(button, 0, wxEXPAND)
EVT_BUTTON(frame, button.GetId(), self.select)
- b.Add(5, 5, 0, wxEXPAND)
+ b.Add((5, 5), 0, wxEXPAND)
c = wxButton(panel, -1, 'add dir')
b.Add(c, 0, wxEXPAND)
EVT_BUTTON(frame, c.GetId(), self.selectdir)
@@ -66,7 +66,7 @@
border = wxBoxSizer(wxVERTICAL)
border.Add(gridSizer, 0, wxEXPAND | wxNORTH | wxEAST | wxWEST, 25)
b2 = wxButton(panel, -1, 'make')
- border.Add(10, 10, 1, wxEXPAND)
+ border.Add((10, 10), 1, wxEXPAND)
border.Add(b2, 0, wxALIGN_CENTER | wxSOUTH, 20)
EVT_BUTTON(frame, b2.GetId(), self.complete)
panel.SetSizer(border)
@@ -119,7 +119,7 @@
gridSizer.Add(self.currentLabel, 0, wxEXPAND)
self.gauge = wxGauge(panel, -1, range = 1000, style = wxGA_SMOOTH)
gridSizer.Add(self.gauge, 0, wxEXPAND)
- gridSizer.Add(10, 10, 1, wxEXPAND)
+ gridSizer.Add((10, 10), 1, wxEXPAND)
self.button = wxButton(panel, -1, 'cancel')
gridSizer.Add(self.button, 0, wxALIGN_CENTER)
gridSizer.AddGrowableRow(2)
diff -ur bittorrent-3.4.2.orig/btdownloadgui.py
bittorrent-3.4.2/btdownloadgui.py
--- bittorrent-3.4.2.orig/btdownloadgui.py 2005-10-21 14:21:20.000000000
-0500
+++ bittorrent-3.4.2/btdownloadgui.py 2005-10-21 13:44:42.000000000 -0500
@@ -118,7 +118,7 @@
colSizer.Add(gridSizer, 0, wxEXPAND)
colSizer.Add(rategridSizer, 0, wxEXPAND)
- colSizer.Add(50, 50, 0, wxEXPAND)
+ colSizer.Add((50, 50), 0, wxEXPAND)
self.cancelButton = wxButton(panel, -1, 'Cancel')
colSizer.Add(self.cancelButton, 0, wxALIGN_CENTER)
colSizer.AddGrowableCol(0)
diff -ur bittorrent-3.4.2.orig/debian/control bittorrent-3.4.2/debian/control
--- bittorrent-3.4.2.orig/debian/control 2005-10-21 14:21:20.000000000
-0500
+++ bittorrent-3.4.2/debian/control 2005-10-21 13:16:39.000000000 -0500
@@ -28,7 +28,7 @@
Package: bittorrent-gui
Architecture: all
-Depends: ${python:Depends}, bittorrent (>= 3.4.2-1), libwxgtk2.4-python
+Depends: ${python:Depends}, bittorrent (>= 3.4.2-1), python-wxgtk2.4 |
python-wxgtk2.6
Description: Scatter-gather network file transfer (GUI files)
BitTorrent is a tool for distributing files. It's extremely
easy to use - downloads are started by clicking on hyperlinks.
--
Carlo U. Segre -- Professor of Physics
Associate Dean for Special Projects, Graduate College
Illinois Institute of Technology
Voice: 312.567.3498 Fax: 312.567.3494
[EMAIL PROTECTED] http://www.iit.edu/~segre
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
