Hello community,
here is the log from the commit of package BitTorrent
checked in at Fri Apr 4 01:25:40 CEST 2008.
--------
--- BitTorrent/BitTorrent.changes 2007-06-21 15:41:56.000000000 +0200
+++ /mounts/work_src_done/STABLE/BitTorrent/BitTorrent.changes 2008-04-03 17:03:03.000000000 +0200
@@ -1,0 +2,8 @@
+Thu Apr 3 16:59:01 CEST 2008 - matejcik@suse.cz
+
+- update to version 4.0.4
+ !! this version does NOT contain khashmir (DHT) technology !!
+ * minor bugfixes
+- fixed pygtk deprecation warnings (bnc#360593)
+
+-------------------------------------------------------------------
Old:
----
BitTorrent-4.0.3.tar.bz2
New:
----
BitTorrent-4.0.4-gtk-deprecated.patch
BitTorrent-4.0.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ BitTorrent.spec ++++++
--- /var/tmp/diff_new_pack.d25777/_old 2008-04-04 01:25:14.000000000 +0200
+++ /var/tmp/diff_new_pack.d25777/_new 2008-04-04 01:25:14.000000000 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package BitTorrent (Version 4.0.3)
+# spec file for package BitTorrent (Version 4.0.4)
#
-# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -10,23 +10,25 @@
# norootforbuild
+
Name: BitTorrent
BuildRequires: python-curses python-devel python-gtk-devel
Summary: Scatter-Gather Network File Transfer
-Version: 4.0.3
-Release: 85
+Version: 4.0.4
+Release: 1
# ===========================================================================
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-# WARNING: do not upgrade to BitTorrent 4.2.x or newer versions
+# WARNING: do not upgrade to BitTorrent 4.1.x or newer versions
# because it contains kashmir support (a p2p trackerless protocol)
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
# ===========================================================================
Source0: %{name}-%{version}.tar.bz2
Patch0: %{name}-4.0.3_docdir.patch
+Patch1: %{name}-4.0.4-gtk-deprecated.patch
License: X11/MIT
-Group: Productivity/Networking/Other
+Group: Productivity/Networking/File-Sharing
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-URL: http://bittorrent.com/
+Url: http://bittorrent.com/
%{py_requires}
%description
@@ -45,8 +47,9 @@
Bram Cohen
%package gtk
+License: X11/MIT
Summary: Scatter-Gather Network File Transfer - GTK based UI
-Group: Productivity/Networking/Other
+Group: Productivity/Networking/File-Sharing
Requires: python-gtk
Requires: %name = %version
Provides: BitTorrent:/usr/bin/btdownloadgui
@@ -67,8 +70,9 @@
Bram Cohen
%package curses
+License: X11/MIT
Summary: Scatter-Gather Network File Transfer - Curses based UI
-Group: Productivity/Networking/Other
+Group: Productivity/Networking/File-Sharing
Requires: python-curses
Requires: %name = %version
Provides: BitTorrent:/usr/bin/btdownloadcurses
@@ -90,7 +94,8 @@
%prep
%setup
-%patch
+%patch0
+%patch1
%build
export CFLAGS="$RPM_OPT_FLAGS"
@@ -128,50 +133,55 @@
%defattr(-,root,root,-)
%changelog
-* Thu Jun 21 2007 - adrian@suse.de
+* Thu Apr 03 2008 matejcik@suse.cz
+- update to version 4.0.4
+ !! this version does NOT contain khashmir (DHT) technology !!
+ * minor bugfixes
+- fixed pygtk deprecation warnings (bnc#360593)
+* Thu Jun 21 2007 adrian@suse.de
- fix changelog entry order
-* Mon Feb 05 2007 - matejcik@suse.cz
+* Mon Feb 05 2007 matejcik@suse.cz
- added split provides to correctly upgrade from 10.0 and older
-* Wed Aug 16 2006 - cthiel@suse.de
+* Wed Aug 16 2006 cthiel@suse.de
- buildrequire python-gtk-devel instead of python-gtk
-* Tue Feb 28 2006 - jmatejek@suse.cz
+* Tue Feb 28 2006 jmatejek@suse.cz
- updated to reflect python changes due to #149809
-* Wed Jan 25 2006 - mls@suse.de
+* Wed Jan 25 2006 mls@suse.de
- converted neededforbuild to BuildRequires
-* Tue Jan 17 2006 - dmueller@suse.de
+* Tue Jan 17 2006 dmueller@suse.de
- add comment in spec file
-* Mon Oct 17 2005 - dmueller@suse.de
+* Mon Oct 17 2005 dmueller@suse.de
- fix permissions of installed files
-* Tue Aug 30 2005 - mrueckert@suse.de
+* Tue Aug 30 2005 mrueckert@suse.de
- added desktop file and icon. (bug #113687)
-* Sun Aug 14 2005 - dmueller@suse.de
+* Sun Aug 14 2005 dmueller@suse.de
- update 4.0.3
- split package in a -gtk and -curses package to reduce
dependencies for tracker-only installations
-* Fri Aug 05 2005 - mrueckert@suse.de
+* Fri Aug 05 2005 mrueckert@suse.de
- We use %%_libdir -> platform specific
-* Mon Jul 25 2005 - mrueckert@suse.de
+* Mon Jul 25 2005 mrueckert@suse.de
- dont build as root
- remove %%_docdir from the package list
- build as noarch
-* Mon Jul 25 2005 - mrueckert@suse.de
+* Mon Jul 25 2005 mrueckert@suse.de
- downgrade to 4.0.2 (no trackerless support)
- fixed installation of the documentation
-* Mon Jun 06 2005 - cthiel@suse.de
+* Mon Jun 06 2005 cthiel@suse.de
- update to 4.1.1
-* Mon Apr 11 2005 - mcihar@suse.cz
+* Mon Apr 11 2005 mcihar@suse.cz
- update to 4.0.1
-* Wed Apr 06 2005 - mcihar@suse.cz
+* Wed Apr 06 2005 mcihar@suse.cz
- fix dependencies (bug #75904)
-* Wed Mar 16 2005 - mcihar@suse.cz
+* Wed Mar 16 2005 mcihar@suse.cz
- fix permissions
-* Thu Mar 10 2005 - mcihar@suse.cz
+* Thu Mar 10 2005 mcihar@suse.cz
- fix filelist
-* Wed Mar 09 2005 - mcihar@suse.cz
+* Wed Mar 09 2005 mcihar@suse.cz
- update to 4.0.0 (bug #71846)
-* Tue Feb 08 2005 - mcihar@suse.cz
+* Tue Feb 08 2005 mcihar@suse.cz
- use better permissions, remove unused files
-* Wed Aug 04 2004 - mcihar@suse.cz
+* Wed Aug 04 2004 mcihar@suse.cz
- rename programs not to contain py extension
-* Fri May 21 2004 - mcihar@suse.cz
+* Fri May 21 2004 mcihar@suse.cz
- initial packaging
++++++ BitTorrent-4.0.4-gtk-deprecated.patch ++++++
--- BitTorrent/GUI.py
+++ BitTorrent/GUI.py
@@ -299,12 +299,12 @@
type, buttons, message)
self.set_size_request(-1, -1)
- self.set_resizable(gtk.FALSE)
+ self.set_resizable(False)
self.set_title(title)
if default is not None:
self.set_default_response(default)
- self.label.set_line_wrap(gtk.TRUE)
+ self.label.set_line_wrap(True)
self.connect('response', self.callback)
@@ -342,8 +342,8 @@
except:
fullname = fullname.decode(self.fsenc)
self.main = main
- self.set_modal(gtk.TRUE)
- self.set_destroy_with_parent(gtk.TRUE)
+ self.set_modal(True)
+ self.set_destroy_with_parent(True)
self.set_title(title)
if (got_location_func is None and
got_multiple_location_func is not None):
@@ -444,8 +444,8 @@
self.set_filter(self.torrent_filter)
self.main = main
- self.set_modal(gtk.TRUE)
- self.set_destroy_with_parent(gtk.TRUE)
+ self.set_modal(True)
+ self.set_destroy_with_parent(True)
if fullname:
if action == gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER:
if gtk.gtk_version < (2,6):
--- btdownloadgui.py
+++ btdownloadgui.py
@@ -341,7 +341,7 @@
Window.__init__(self)
self.set_title('New %s version available'%app_name)
self.set_border_width(SPACING)
- self.set_resizable(gtk.FALSE)
+ self.set_resizable(False)
self.main = main
self.newversion = newversion
self.download_url = download_url
@@ -369,14 +369,14 @@
self.newversionbutton = gtk.Button('Download _now')
self.newversionbutton.connect('clicked', self.get_newversion)
- self.bbox.pack_end(self.newversionbutton, expand=gtk.FALSE, fill=gtk.FALSE)
- self.bbox.pack_end(self.closebutton , expand=gtk.FALSE, fill=gtk.FALSE)
+ self.bbox.pack_end(self.newversionbutton, expand=False, fill=False)
+ self.bbox.pack_end(self.closebutton , expand=False, fill=False)
self.checkbox = gtk.CheckButton('_Remind me later')
self.checkbox.set_active(True)
self.checkbox.connect('toggled', self.remind_toggle)
- self.bbox.pack_start(self.checkbox, expand=gtk.FALSE, fill=gtk.FALSE)
+ self.bbox.pack_start(self.checkbox, expand=False, fill=False)
self.vbox.pack_start(self.bbox)
@@ -426,7 +426,7 @@
l = credits_f.read()
credits_f.close()
label = gtk.Label(l.strip())
- label.set_line_wrap(gtk.TRUE)
+ label.set_line_wrap(True)
label.set_selectable(True)
label.set_justify(gtk.JUSTIFY_CENTER)
label.set_size_request(250,-1)
@@ -1571,8 +1571,8 @@
def show_menu(self, widget, event):
if event.type == gtk.gdk.BUTTON_PRESS and event.button == 3:
widget.popup(None, None, None, event.button, event.time)
- return gtk.TRUE
- return gtk.FALSE
+ return True
+ return False
def _short_path(self, dlpath):
path_length = 40
@@ -1676,7 +1676,7 @@
self.parent.highlight_before_index(self.index)
else:
self.parent.highlight_after_index(self.index)
- return gtk.FALSE
+ return False
def drag_end(self, *args):
self.parent.highlight_child()
@@ -1989,7 +1989,7 @@
def drag_motion(self, *args):
self.drag_highlight()
- return gtk.FALSE
+ return False
class DroppableBox(HSeparatedBox):
@@ -2003,7 +2003,7 @@
self.connect('drag_motion', self.drag_motion)
def drag_motion(self, *args):
- return gtk.FALSE
+ return False
def drag_data_received(self, *args):
pass
@@ -2099,13 +2099,13 @@
self.put_infohash_first(selection.data)
else:
self.put_infohash_last(selection.data)
- return gtk.TRUE
+ return True
else:
print 'got external type'
- return gtk.FALSE
+ return False
def drag_motion(self, *args):
- return gtk.FALSE
+ return False
def drag_highlight(self):
final = self.get_children()[-1]
@@ -2245,7 +2245,7 @@
self.lists = {}
self.update_handle = None
self.unhighlight_handle = None
- gtk.threads_enter()
+ gtk.gdk.threads_enter()
self.mainwindow = Window(gtk.WINDOW_TOPLEVEL)
self.mainwindow.set_border_width(0)
@@ -2318,7 +2318,7 @@
self.helpmenu.set_submenu(build_menu(help_menu_items, self.accel_group))
self.helpmenu.show()
- self.helpmenu.set_right_justified(gtk.TRUE)
+ self.helpmenu.set_right_justified(True)
self.menubar.append(self.filemenu)
self.menubar.append(self.viewmenu)
@@ -2357,7 +2357,7 @@
self.knownbox.set_border_width(SPACING)
self.knownscroll.add_with_viewport(self.knownbox)
- self.paned.pack1(self.knownscroll, resize=gtk.FALSE, shrink=gtk.TRUE)
+ self.paned.pack1(self.knownscroll, resize=False, shrink=True)
self.mainscroll = AutoScrollingWindow()
@@ -2380,7 +2380,7 @@
self.mainscroll.add_with_viewport(self.scrollbox)
- self.paned.pack2(self.mainscroll, resize=gtk.TRUE, shrink=gtk.FALSE)
+ self.paned.pack2(self.mainscroll, resize=True, shrink=False)
self.box1.pack_start(self.paned)
@@ -2397,11 +2397,11 @@
self.set_size()
self.mainwindow.show()
self.paned.set_position(0)
- gtk.threads_leave()
+ gtk.gdk.threads_leave()
def main(self):
- gtk.threads_enter()
+ gtk.gdk.threads_enter()
self.ssbutton.set_paused(self.config['pause'])
self.rate_slider_box.start()
@@ -2737,7 +2737,7 @@
self.drag_highlight()
gobject.source_remove(self.unhighlight_handle)
self.unhighlight_handle = None
- return gtk.FALSE
+ return False
def init_updates(self):
if self.update_handle is not None:
@@ -2799,7 +2799,7 @@
t.widget = KnownTorrentBox(infohash, t.metainfo, t.dlpath,
t.completion, self)
box = self.knownbox
- box.pack_start(t.widget, expand=gtk.FALSE, fill=gtk.FALSE)
+ box.pack_start(t.widget, expand=False, fill=False)
if queuepos is not None:
box.reorder_child(t.widget, queuepos)
@@ -3064,21 +3064,21 @@
controlsocket.send_command('show_error', '%s already running'%app_name)
sys.exit(1)
- gtk.threads_init()
+ gtk.gdk.threads_init()
torrentqueue = TorrentQueue.TorrentQueue(config, ui_options, controlsocket)
d = DownloadInfoFrame(config,TorrentQueue.ThreadWrappedQueue(torrentqueue))
def lock_wrap(function, *args):
- gtk.threads_enter()
+ gtk.gdk.threads_enter()
function(*args)
gtk.gdk.flush()
- gtk.threads_leave()
+ gtk.gdk.threads_leave()
def gtk_wrap(function, *args):
- gtk.threads_enter()
+ gtk.gdk.threads_enter()
gobject.idle_add(lock_wrap, function, *args)
- gtk.threads_leave()
+ gtk.gdk.threads_leave()
startflag = threading.Event()
dlthread = threading.Thread(target = torrentqueue.run,
args = (d, gtk_wrap, startflag))
--- btmaketorrentgui.py
+++ btmaketorrentgui.py
@@ -251,7 +251,7 @@
self.flag = Event() # ???
self.label = gtk.Label('Checking file sizes...')
- self.label.set_line_wrap(gtk.TRUE)
+ self.label.set_line_wrap(True)
self.vbox.set_spacing(SPACING)
self.vbox.pack_start(lalign(self.label), expand=False, fill=False)
++++++ BitTorrent-4.0.3.tar.bz2 -> BitTorrent-4.0.4.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/BitTorrent-4.0.3/BitTorrent/ConvertedMetainfo.py new/BitTorrent-4.0.4/BitTorrent/ConvertedMetainfo.py
--- old/BitTorrent-4.0.3/BitTorrent/ConvertedMetainfo.py 2005-07-11 00:44:38.000000000 +0200
+++ new/BitTorrent-4.0.4/BitTorrent/ConvertedMetainfo.py 2005-08-17 20:24:39.000000000 +0200
@@ -118,9 +118,16 @@
self.bad_path = True
break
else:
- path = [(self._enforce_utf8(x), x) for x in path]
+ p = []
+ for x in path:
+ p.append((self._enforce_utf8(x), x))
+ path = p
self.orig_files.append('/'.join([x[0] for x in path]))
- r.append(([(self._to_fs_2(u), u, o) for u, o in path], i))
+ k = []
+ for u,o in path:
+ tf2 = self._to_fs_2(u)
+ k.append((tf2, u, o))
+ r.append((k,i))
i += 1
# If two or more file/subdirectory names in the same directory
# would map to the same name after encoding conversions + Windows
@@ -230,8 +237,11 @@
self.bad_conversion = True
bad = True
r = name.encode(filesystem_encoding, 'replace')
- # 'replace' could possibly make the name unsupported by windows
- # again, but I think this shouldn't happen with the 'mbcs'
- # encoding. Could happen under Python 2.2 or if someone explicitly
- # specifies a stupid encoding...
+
+ if sys.platform == 'win32':
+ # encoding to mbcs with or without 'replace' will make the
+ # name unsupported by windows again because it adds random
+ # '?' characters which are invalid windows filesystem
+ # character
+ r, bad = self._fix_windows(r)
return (bad, r)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/BitTorrent-4.0.3/BitTorrent/GUI.py new/BitTorrent-4.0.4/BitTorrent/GUI.py
--- old/BitTorrent-4.0.3/BitTorrent/GUI.py 2005-07-11 00:44:38.000000000 +0200
+++ new/BitTorrent-4.0.4/BitTorrent/GUI.py 2005-08-17 20:24:39.000000000 +0200
@@ -335,6 +335,12 @@
def __init__(self, main, title='', fullname='', got_location_func=None, no_location_func=None, got_multiple_location_func=None, show=True):
gtk.FileSelection.__init__(self)
+ from BitTorrent.ConvertedMetainfo import filesystem_encoding
+ self.fsenc = filesystem_encoding
+ try:
+ fullname.decode('utf8')
+ except:
+ fullname = fullname.decode(self.fsenc)
self.main = main
self.set_modal(gtk.TRUE)
self.set_destroy_with_parent(gtk.TRUE)
@@ -408,6 +414,13 @@
gtk.FileChooserDialog.__init__(self, action=action, title=title,
buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL,
gtk.STOCK_OK, gtk.RESPONSE_OK))
+
+ from BitTorrent.ConvertedMetainfo import filesystem_encoding
+ self.fsenc = filesystem_encoding
+ try:
+ fullname.decode('utf8')
+ except:
+ fullname = fullname.decode(self.fsenc)
self.set_default_response(gtk.RESPONSE_OK)
if action == gtk.FILE_CHOOSER_ACTION_CREATE_FOLDER:
self.convert_button_box = gtk.HBox()
@@ -435,16 +448,22 @@
self.set_destroy_with_parent(gtk.TRUE)
if fullname:
if action == gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER:
+ if gtk.gtk_version < (2,6):
+ fullname = fullname.encode(self.fsenc)
self.set_filename(fullname)
elif action == gtk.FILE_CHOOSER_ACTION_OPEN:
if fullname[-1] != os.sep:
fullname = fullname + os.sep
path, filename = os.path.split(fullname)
+ if gtk.gtk_version < (2,6):
+ path = path.encode(self.fsenc)
self.set_current_folder(path)
else:
if fullname[-1] == os.sep:
fullname = fullname[:-1]
path, filename = os.path.split(fullname)
+ if gtk.gtk_version < (2,8):
+ path = path.encode(self.fsenc)
self.set_current_folder(path)
self.set_current_name(filename)
if got_multiple_location_func is not None:
@@ -472,7 +491,11 @@
if self.got_multiple_location_func is not None:
self.got_multiple_location_func(self.get_filenames())
elif self.got_location_func is not None:
- self.got_location_func(self.get_filename())
+ fn = self.get_filename()
+ if fn:
+ self.got_location_func(fn)
+ else:
+ self.no_location_func()
else:
if self.no_location_func is not None:
self.no_location_func()
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/BitTorrent-4.0.3/BitTorrent/__init__.py new/BitTorrent-4.0.4/BitTorrent/__init__.py
--- old/BitTorrent-4.0.3/BitTorrent/__init__.py 2005-07-11 00:44:39.000000000 +0200
+++ new/BitTorrent-4.0.4/BitTorrent/__init__.py 2005-08-17 20:24:40.000000000 +0200
@@ -9,7 +9,7 @@
# License.
app_name = "BitTorrent"
-version = '4.0.3'
+version = '4.0.4'
URL = 'http://www.bittorrent.com/'
DONATE_URL = URL + 'donate.html'
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/BitTorrent-4.0.3/BitTorrent/RawServer.py new/BitTorrent-4.0.4/BitTorrent/RawServer.py
--- old/BitTorrent-4.0.3/BitTorrent/RawServer.py 2005-07-11 00:44:38.000000000 +0200
+++ new/BitTorrent-4.0.4/BitTorrent/RawServer.py 2005-08-17 20:24:39.000000000 +0200
@@ -314,7 +314,7 @@
try:
code, msg = e
except:
- code = ENOBUFS
+ code = e
if code == ENOBUFS:
self.errorfunc(CRITICAL, "Have to exit due to the TCP "
"stack flaking out. "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/BitTorrent-4.0.3/bittorrent.nsi new/BitTorrent-4.0.4/bittorrent.nsi
--- old/BitTorrent-4.0.3/bittorrent.nsi 2005-07-11 00:44:40.000000000 +0200
+++ new/BitTorrent-4.0.4/bittorrent.nsi 2005-08-17 21:39:29.000000000 +0200
@@ -10,7 +10,7 @@
# Written by Bram Cohen and Matt Chisholm
-!define VERSION "4.0.3"
+!define VERSION "4.0.4"
!define APPNAME "BitTorrent"
Outfile ${APPNAME}-${VERSION}.exe
Name "${APPNAME}"
@@ -129,33 +129,42 @@
; It is partly copied from:
; http://nsis.sourceforge.net/archive/viewpage.php?pageid=326
Function .onInit
- Call QuitIt
- ClearErrors
+ Call QuitIt
+ ClearErrors
- ReadRegStr $R0 HKLM \
- "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" \
- "UninstallString"
- StrCmp $R0 "" done
-
- MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION \
- "Another version of ${APPNAME} is already installed. $\n$\nClick `OK` to \
- remove the already installed version and continue installing this version. \
- $\n$\nClick `Cancel` to cancel this installation." \
- IDOK uninst
- Abort
+ ReadRegStr $R0 HKLM \
+ "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" \
+ "UninstallString"
+ StrCmp $R0 "" endofuninst
+
+ MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION "${APPNAME} is already \
+ installed. $\n$\nClick `OK` to upgrade to ${APPNAME} ${VERSION}." \
+ IDOK uninst
+ Abort
-;Run the uninstaller
-uninst:
- ExecWait '$R0 _?=$INSTDIR /S' ;Do not copy the uninstaller to a temp file
-
- IfErrors no_remove_uninstaller
-
- Goto endofuninst
- no_remove_uninstaller:
- MessageBox MB_OK "Uninstallation failed. Aborting."
- Abort
- endofuninst:
-done:
+ ;Run the uninstaller
+ uninst:
+ ;Do not copy the uninstaller to a temp file
+ ExecWait '$R0 _?=$INSTDIR /S'
+ IfErrors no_remove_uninstaller
+ Goto endofuninst
+ no_remove_uninstaller:
+ MessageBox MB_OK "Uninstallation failed. Aborting."
+ Abort
+ endofuninst:
+
+ MessageBox MB_OKCANCEL "${APPNAME} is 100% FREE, and it always will be. $\n$\n\
+ Some malicious websites are charging money for ${APPNAME}, committing credit card$\n\
+ fraud, and infecting computers with malicious software. If you did not download$\n\
+ this copy of ${APPNAME} from http://www.bittorrent.com/, PROTECT YOURSELF NOW!$\n\
+ * Check your computer for malicious software.$\n\
+ * Check your credit card bill for unauthorized charges.$\n\
+ * Cancel the installation NOW and download ${APPNAME} for free from $\n\
+ http://www.bittorrent.com/\
+ " IDOK done
+
+ Abort
+ done:
FunctionEnd
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/BitTorrent-4.0.3/btdownloadgui.py new/BitTorrent-4.0.4/btdownloadgui.py
--- old/BitTorrent-4.0.3/btdownloadgui.py 2005-07-11 00:44:41.000000000 +0200
+++ new/BitTorrent-4.0.4/btdownloadgui.py 2005-08-17 20:24:41.000000000 +0200
@@ -1305,7 +1305,7 @@
y+=1
if not self.torrent_box.is_batch:
- add_item('File name:', filename, y)
+ add_item('File name:', path_wrap(filename), y)
y+=1
self.vbox.pack_start(self.table)
@@ -2690,7 +2690,7 @@
if os.access(fullname, os.F_OK):
message = MessageDialog(self.mainwindow, 'File exists!',
'"%s" already exists.'\
- ' Do you want to choose a different file name?.'%name,
+ ' Do you want to choose a different file name?.'%path_wrap(name),
buttons=gtk.BUTTONS_YES_NO,
nofunc= lambda : self.got_location(infohash, fullname),
yesfunc=lambda : self.get_save_location(infohash, metainfo, fullname),)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/BitTorrent-4.0.3/btmaketorrentgui.py new/BitTorrent-4.0.4/btmaketorrentgui.py
--- old/BitTorrent-4.0.3/btmaketorrentgui.py 2005-07-11 00:44:41.000000000 +0200
+++ new/BitTorrent-4.0.4/btmaketorrentgui.py 2005-08-17 20:24:41.000000000 +0200
@@ -31,11 +31,15 @@
from BitTorrent.defaultargs import get_defaults
from BitTorrent.makemetafile import make_meta_files
from BitTorrent.parseargs import makeHelp
+from BitTorrent.ConvertedMetainfo import set_filesystem_encoding
defaults = get_defaults('btmaketorrentgui')
defconfig = dict([(name, value) for (name, value, doc) in defaults])
del name, value, doc
+def sfe_ef(e,s):
+ print s
+set_filesystem_encoding(defconfig['filesystem_encoding'], sfe_ef)
class MainWindow(Window):
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/BitTorrent-4.0.3/btreannounce.py new/BitTorrent-4.0.4/btreannounce.py
--- old/BitTorrent-4.0.3/btreannounce.py 2005-07-11 00:44:41.000000000 +0200
+++ new/BitTorrent-4.0.4/btreannounce.py 2005-08-17 20:24:41.000000000 +0200
@@ -12,11 +12,12 @@
# Written by Henry 'Pi' James and Bram Cohen
-from sys import argv
+from os.path import basename
+from sys import argv, exit
from BitTorrent.bencode import bencode, bdecode
if len(argv) < 3:
- print '%s http://new.uri:port/announce file1.torrent file2.torrent' % argv[0]
+ print '%s http://new.uri:port/announce file1.torrent file2.torrent' % basename(argv[0])
print
exit(2) # common exit code for syntax error
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/BitTorrent-4.0.3/btshowmetainfo.py new/BitTorrent-4.0.4/btshowmetainfo.py
--- old/BitTorrent-4.0.3/btshowmetainfo.py 2005-07-11 00:44:41.000000000 +0200
+++ new/BitTorrent-4.0.4/btshowmetainfo.py 2005-08-17 20:24:41.000000000 +0200
@@ -16,15 +16,15 @@
from os.path import *
from sha import *
from BitTorrent.bencode import *
+from BitTorrent import app_name, version
NAME, EXT = splitext(basename(argv[0]))
-VERSION = '20021207'
-print '%s %s - decode BitTorrent metainfo files' % (NAME, VERSION)
+print '%s %s - decode %s metainfo files' % (NAME, version, app_name)
print
if len(argv) == 1:
- print '%s file1.torrent file2.torrent file3.torrent ...' % argv[0]
+ print '%s file1.torrent file2.torrent file3.torrent ...' % basename(argv[0])
print
exit(2) # common exit code for syntax error
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/BitTorrent-4.0.3/MANIFEST.in new/BitTorrent-4.0.4/MANIFEST.in
--- old/BitTorrent-4.0.3/MANIFEST.in 1970-01-01 01:00:00.000000000 +0100
+++ new/BitTorrent-4.0.4/MANIFEST.in 2005-08-17 20:24:40.000000000 +0200
@@ -0,0 +1,26 @@
+# include anything in here that is not automatically picked up by distutils
+include BitTorrent/__init__.py
+
+# images and icons, visual stuff
+include images/bittorrent.ico images/*.png
+include images/logo/bittorrent_[0-9]*.png
+
+# documentation stuffs
+include credits.txt LICENSE.txt README.txt redirdonate.html INSTALL.unix.txt MANIFEST.in
+
+# include windows build stuffs in the source
+include bittorrent.nsi build.bat winsetup.py BUILD.windows.txt
+
+# include all top level scripts
+include btdownloadheadless.py
+include btdownloadgui.py
+include btdownloadcurses.py
+include btmakemetafile.py
+include btmaketorrentgui.py
+include btmaketorrent.py
+include bttrack.py
+include btlaunchmany.py
+include btlaunchmanycurses.py
+include btreannounce.py
+include btrename.py
+include btshowmetainfo.py
\ No newline at end of file
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/BitTorrent-4.0.3/PKG-INFO new/BitTorrent-4.0.4/PKG-INFO
--- old/BitTorrent-4.0.3/PKG-INFO 2005-07-11 00:46:03.000000000 +0200
+++ new/BitTorrent-4.0.4/PKG-INFO 2005-08-19 19:53:52.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: BitTorrent
-Version: 4.0.3
+Version: 4.0.4
Summary: UNKNOWN
Home-page: http://bittorrent.com/
Author: Bram Cohen
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org