r176 - in /debtorrent/trunk: ./ DebTorrent/ DebTorrent/BT1/ debian/ docs/ docs/man/ docs/pstat/ downloads/ dtorrents/ test/tracker/ thosts/

camrdale-guest at users.alioth.debian.org camrdale-guest at users.alioth.debian.org
Mon Jul 16 17:00:14 UTC 2007


Author: camrdale-guest
Date: Mon Jul 16 17:00:14 2007
New Revision: 176

URL: http://svn.debian.org/wsvn/debtorrent/?sc=1&rev=176
Log:
Cleanup the debian package.
Remove lots of unnecessary files.
Cleanup the documentation.

Added:
    debtorrent/trunk/docs/pstat/debtorrent-client.pstat   (with props)
Removed:
    debtorrent/trunk/CHANGELOG
    debtorrent/trunk/docs/INSTALL.unix.txt
    debtorrent/trunk/docs/credits.txt
    debtorrent/trunk/docs/man/
    debtorrent/trunk/docs/pstat/btdownloadheadless.pstat
    debtorrent/trunk/docs/pstat/btlaunchmany.pstat
    debtorrent/trunk/docs/pstat/bttrack.pstat
    debtorrent/trunk/docs/webseed-spec.txt
    debtorrent/trunk/downloads/
    debtorrent/trunk/dtorrents/
    debtorrent/trunk/ipranges.portugal.txt
    debtorrent/trunk/test/tracker/
    debtorrent/trunk/thosts/
Modified:
    debtorrent/trunk/DebTorrent/BT1/DownloaderFeedback.py
    debtorrent/trunk/DebTorrent/ConfigDir.py
    debtorrent/trunk/DebTorrent/launchmanycore.py
    debtorrent/trunk/debian/changelog
    debtorrent/trunk/debian/copyright
    debtorrent/trunk/debian/debtorrent-client.sgml
    debtorrent/trunk/debian/debtorrent-tracker.sgml
    debtorrent/trunk/debian/dirs
    debtorrent/trunk/debian/docs
    debtorrent/trunk/debian/rules
    debtorrent/trunk/docs/FAQ.txt
    debtorrent/trunk/docs/epydoc.config

Modified: debtorrent/trunk/DebTorrent/BT1/DownloaderFeedback.py
URL: http://svn.debian.org/wsvn/debtorrent/debtorrent/trunk/DebTorrent/BT1/DownloaderFeedback.py?rev=176&op=diff
==============================================================================
--- debtorrent/trunk/DebTorrent/BT1/DownloaderFeedback.py (original)
+++ debtorrent/trunk/DebTorrent/BT1/DownloaderFeedback.py Mon Jul 16 17:00:14 2007
@@ -83,8 +83,6 @@
         @param file_length: the total length of the download
         @type finflag: C{threading.Event}
         @param finflag: flag to indicate when the download is complete
-        @type sp: C{threading.Event}
-        @param sp: unknown
         @type statistics: L{Statistics.Statistics}
         @param statistics: the statistics gatherer for the download
         @type statusfunc: C{method}

Modified: debtorrent/trunk/DebTorrent/ConfigDir.py
URL: http://svn.debian.org/wsvn/debtorrent/debtorrent/trunk/DebTorrent/ConfigDir.py?rev=176&op=diff
==============================================================================
--- debtorrent/trunk/DebTorrent/ConfigDir.py (original)
+++ debtorrent/trunk/DebTorrent/ConfigDir.py Mon Jul 16 17:00:14 2007
@@ -113,8 +113,6 @@
     @ivar config_type: the extension to include in the saved files' names
     @type home_dir: C{string}
     @ivar home_dir: the user's home directory
-    @type configfile: C{string}
-    @ivar configfile: the config file
     @type cache_dir: C{string}
     @ivar cache_dir: the directory to save cache files in
     @type dir_torrentcache: C{string}

Modified: debtorrent/trunk/DebTorrent/launchmanycore.py
URL: http://svn.debian.org/wsvn/debtorrent/debtorrent/trunk/DebTorrent/launchmanycore.py?rev=176&op=diff
==============================================================================
--- debtorrent/trunk/DebTorrent/launchmanycore.py (original)
+++ debtorrent/trunk/DebTorrent/launchmanycore.py Mon Jul 16 17:00:14 2007
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-#
 # Written by John Hoffman
 # Modified by Cameron Dale
 # see LICENSE.txt for license information

Modified: debtorrent/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debtorrent/debtorrent/trunk/debian/changelog?rev=176&op=diff
==============================================================================
--- debtorrent/trunk/debian/changelog (original)
+++ debtorrent/trunk/debian/changelog Mon Jul 16 17:00:14 2007
@@ -1,6 +1,11 @@
 debtorrent (0.1.3) unstable; urgency=low
 
-  * First debian package release
+  * First debian package release (Closes: #428005)
+  * Cleanup all the configuration options
+  * Add a global config file
+  * Moved all logging to log files
+  * Stopped displaying periodic updates
+  * Added init script and default options
 
  -- Cameron Dale <camrdale at gmail.com>  Mon, 16 Jul 2007 14:03:00 -0700
 

Modified: debtorrent/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/debtorrent/debtorrent/trunk/debian/copyright?rev=176&op=diff
==============================================================================
--- debtorrent/trunk/debian/copyright (original)
+++ debtorrent/trunk/debian/copyright Mon Jul 16 17:00:14 2007
@@ -1,7 +1,7 @@
 Unless otherwise noted, all files are released under the MIT
 license, exceptions contain licensing information in them.
 
-Copyright (C) 2001-2002 Bram Cohen
+Copyright (C) 2007 Cameron Dale
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation files

Modified: debtorrent/trunk/debian/debtorrent-client.sgml
URL: http://svn.debian.org/wsvn/debtorrent/debtorrent/trunk/debian/debtorrent-client.sgml?rev=176&op=diff
==============================================================================
--- debtorrent/trunk/debian/debtorrent-client.sgml (original)
+++ debtorrent/trunk/debian/debtorrent-client.sgml Mon Jul 16 17:00:14 2007
@@ -4,7 +4,7 @@
   <!ENTITY dhfirstname "<firstname>Cameron</firstname>">
   <!ENTITY dhsurname   "<surname>Dale</surname>">
   <!-- Please adjust the date whenever revising the manpage. -->
-  <!ENTITY dhdate      "<date>April 17, 2005</date>">
+  <!ENTITY dhdate      "<date>July 16, 2007</date>">
   <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
        allowed: see man(7), man(1). -->
   <!ENTITY dhsection   "<manvolnum>1</manvolnum>">

Modified: debtorrent/trunk/debian/debtorrent-tracker.sgml
URL: http://svn.debian.org/wsvn/debtorrent/debtorrent/trunk/debian/debtorrent-tracker.sgml?rev=176&op=diff
==============================================================================
--- debtorrent/trunk/debian/debtorrent-tracker.sgml (original)
+++ debtorrent/trunk/debian/debtorrent-tracker.sgml Mon Jul 16 17:00:14 2007
@@ -4,7 +4,7 @@
   <!ENTITY dhfirstname "<firstname>Cameron</firstname>">
   <!ENTITY dhsurname   "<surname>Dale</surname>">
   <!-- Please adjust the date whenever revising the manpage. -->
-  <!ENTITY dhdate      "<date>April 17, 2005</date>">
+  <!ENTITY dhdate      "<date>July 16, 2007</date>">
   <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
        allowed: see man(7), man(1). -->
   <!ENTITY dhsection   "<manvolnum>1</manvolnum>">

Modified: debtorrent/trunk/debian/dirs
URL: http://svn.debian.org/wsvn/debtorrent/debtorrent/trunk/debian/dirs?rev=176&op=diff
==============================================================================
--- debtorrent/trunk/debian/dirs (original)
+++ debtorrent/trunk/debian/dirs Mon Jul 16 17:00:14 2007
@@ -1,5 +1,7 @@
 usr/bin
 usr/share/debtorrent
 etc/debtorrent
+etc/init.d
+etc/default
 var/log/debtorrent
 var/cache/debtorrent

Modified: debtorrent/trunk/debian/docs
URL: http://svn.debian.org/wsvn/debtorrent/debtorrent/trunk/debian/docs?rev=176&op=diff
==============================================================================
--- debtorrent/trunk/debian/docs (original)
+++ debtorrent/trunk/debian/docs Mon Jul 16 17:00:14 2007
@@ -1,8 +1,4 @@
 README.txt
-docs/credits.txt
+TODO
 docs/README-Psyco.txt
-docs/IMPORTANT-multitracker-readme.txt
 docs/FAQ.txt
-ipranges.portugal.txt
-docs/multitracker-spec.txt
-docs/webseed-spec.txt

Modified: debtorrent/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debtorrent/debtorrent/trunk/debian/rules?rev=176&op=diff
==============================================================================
--- debtorrent/trunk/debian/rules (original)
+++ debtorrent/trunk/debian/rules Mon Jul 16 17:00:14 2007
@@ -30,14 +30,8 @@
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-	dh_installinit --name=debtorrent-client
 
-	# Add here commands to install the package into debian/bittornado.
-	chmod +x ./setup.py
 	./setup.py install --prefix=$(CURDIR)/debian/debtorrent/usr --install-lib=$(CURDIR)/debian/debtorrent/usr/share/python-support/debtorrent
-
-	install -d debian/debtorrent/usr/share/debtorrent
-	chmod 755 debian/debtorrent/usr/share/python-support/debtorrent/DebTorrent/launchmanycore.py
 
 	# Remove the generated .pyc files
 	( cd debian/debtorrent/usr/share/python-support/debtorrent/DebTorrent && \
@@ -50,12 +44,13 @@
 	
 
 # Build architecture-dependent files here.
-binary-indep: build install
+binary-indep: install
 	dh_testdir
 	dh_testroot
 	dh_installdocs
 	dh_installexamples
 	dh_installman
+	dh_installinit --name=debtorrent-client
 	
 	# Remove the .py from the end of each of these and move them out of
 	# the path

Modified: debtorrent/trunk/docs/FAQ.txt
URL: http://svn.debian.org/wsvn/debtorrent/debtorrent/trunk/docs/FAQ.txt?rev=176&op=diff
==============================================================================
--- debtorrent/trunk/docs/FAQ.txt (original)
+++ debtorrent/trunk/docs/FAQ.txt Mon Jul 16 17:00:14 2007
@@ -1,51 +1,26 @@
-Frequently Asked Questions about BitTorrent
-
-Q:  I use Mozilla/Opera, how can I use BT?
-
-A:  You need to edit the mimetype associations so that the "application/x-bittorrent"
-    mime type is launched by c:\progra~1\bittorrent\btdownloadprefetched.exe
-
+Frequently Asked Questions about DebTorrent
 
 Q:  Does BitTorrent support resuming?
 
-A:  Yes, just save your download to the same location as the existing partial download.
-    BT will resume where it left off after checking the partial download.
+A:  Yes, it will resume where it left off after checking the partial download.
 
 
 Q:  How do I know the download isn't corrupted?
 
-A:  BitTorrent does cryptographic hashing (SHA1) of all data.  When you see "Download
-    Succeeded" you can be sure that BT has already verified the integrity of the data.
-    The integrity and authenticity of a BT download is as good as the original request
+A:  DebTorrent does cryptographic hashing (SHA1) of all data.  When you see "Download
+    Succeeded" you can be sure that it has already verified the integrity of the data.
+    The integrity and authenticity of a download is as good as the original request
     to the tracker.
 
 
-Q:  I'm behind a firewall/NAT, can I use BT?
+Q:  I'm behind a firewall/NAT, can I use DebTorrent?
 
 A:  Yes, but you will get better performance if other peers can connect to you.  By
-    default, BitTorrent listens on port 6881, trying incrementially higher ports if
-    it is unable to bind, giving up after 6889 (the port range is configurable.)
-    It's up to you to figure out how to poke a hole in your firewall/NAT.
+    default, DebTorrent listens on a random port, in a range specified by the minport
+    and maxport options. Change these to a range you like, then figure out how to
+    poke a hole in your firewall/NAT.
 
 
-Q:  I published a file but whenever I try to download it hangs saying "connecting to
-    peers" and/or the download just never starts.
+Q:  How do I limit the amount of bandwidth consumed by DebTorrent?
 
-A:  You need to leave a downloader running which already has the whole file.  The
-    publishing step merely registers the download information with the tracker.
-    Make sure other peers can connect to this downloader (not behind firewall or
-    NAT!)
-
-
-Q:  When is the Java implementation going to be ready?
-
-A:  Soon after the check clears.
-
-
-
-Q:  How do I limit the amount of bandwidth consumed by BT?
-
-A:  BT allows you to control how many simultaneous connections can  actively
-    download simultaneously using --max_uploads in the btdownloadheadless.py
-    script.  Other than that you'll have to limit bandwidth some other way, perhaps
-    at the OS or router level.
+A:  DebTorrent has option for max_upload_rate and max_download_rate.

Modified: debtorrent/trunk/docs/epydoc.config
URL: http://svn.debian.org/wsvn/debtorrent/debtorrent/trunk/docs/epydoc.config?rev=176&op=diff
==============================================================================
--- debtorrent/trunk/docs/epydoc.config (original)
+++ debtorrent/trunk/docs/epydoc.config Mon Jul 16 17:00:14 2007
@@ -3,7 +3,7 @@
 # The list of objects to document.  Objects can be named using
 # dotted names, module filenames, or package directory names.
 # Alases for this option include "objects" and "values".
-modules: DebTorrent btdownloadheadless.py btlaunchmany.py btcompletedir.py btcopyannounce.py btmakemetafile.py btreannounce.py btrename.py btsetdebmirrors.py btshowmetainfo.py test.py debtorrent-client.py debtorrent-tracker.py
+modules: DebTorrent btcompletedir.py btcopyannounce.py btmakemetafile.py btreannounce.py btrename.py btsetdebmirrors.py btshowmetainfo.py test.py debtorrent-client.py debtorrent-tracker.py
 
 # The type of output that should be generated.  Should be one
 # of: html, text, latex, dvi, ps, pdf.
@@ -131,7 +131,7 @@
 
 # The name of one or more pstat files (generated by the profile
 # or hotshot module).  These are used to generate call graphs.
-pstat: docs/pstat/btdownloadheadless.pstat docs/pstat/bttrack.pstat docs/pstat/btlaunchmany.pstat
+pstat: docs/pstat/debtorrent-client.pstat
 
 # Specify the font used to generate Graphviz graphs.
 # (e.g., helvetica or times).

Added: debtorrent/trunk/docs/pstat/debtorrent-client.pstat
URL: http://svn.debian.org/wsvn/debtorrent/debtorrent/trunk/docs/pstat/debtorrent-client.pstat?rev=176&op=file
==============================================================================
Binary file - no diff available.

Propchange: debtorrent/trunk/docs/pstat/debtorrent-client.pstat
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream




More information about the Debtorrent-commits mailing list