From a839a3f5c0091d275c64159ded0e12d36b5e2bdb Mon Sep 17 00:00:00 2001 From: Cameron Dale Date: Sun, 17 Feb 2008 20:30:06 -0800 Subject: [PATCH] Fix up some errors in the packaging. --- LICENSE | 353 +++++++++++++++++++++++++++++++++++++++++++++++ LICENSE.txt | 24 ---- README | 86 ++++++++++++ README.txt | 79 ----------- debian/changelog | 2 +- debian/compat | 2 +- debian/control | 4 +- debian/rules | 10 +- setup.py | 64 ++------- 9 files changed, 459 insertions(+), 165 deletions(-) create mode 100644 LICENSE delete mode 100644 LICENSE.txt create mode 100644 README delete mode 100644 README.txt diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..c679ef2 --- /dev/null +++ b/LICENSE @@ -0,0 +1,353 @@ +Unless otherwise noted, all files are released under the MIT +license, exceptions contain licensing information in them. + +Apt-dht is Copyright (C) 2008 Cameron Dale + +Apt-dht is licened under the terms of the GNU General Public License (GPL), +version 2.0 or later, as published by the Free Software Foundation. See +the text below, /usr/share/common-licenses/GPL, or + for the terms of the latest version +of the GNU General Public License. + +----------------------------------------------------------------------- + + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) 19yy + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) 19yy name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. diff --git a/LICENSE.txt b/LICENSE.txt deleted file mode 100644 index 1c71aeb..0000000 --- a/LICENSE.txt +++ /dev/null @@ -1,24 +0,0 @@ -Unless otherwise noted, all files are released under the MIT -license, exceptions contain licensing information in them. - -Copyright (C) 2002-2003 Andrew Loewenstern - -Permission is hereby granted, free of charge, to any person -obtaining a copy of this software and associated documentation files -(the "Software"), to deal in the Software without restriction, -including without limitation the rights to use, copy, modify, merge, -publish, distribute, sublicense, and/or sell copies of the Software, -and to permit persons to whom the Software is furnished to do so, -subject to the following conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -The Software is provided "AS IS", without warranty of any kind, -express or implied, including but not limited to the warranties of -merchantability, fitness for a particular purpose and -noninfringement. In no event shall the authors or copyright holders -be liable for any claim, damages or other liability, whether in an -action of contract, tort or otherwise, arising from, out of or in -connection with the Software or the use or other dealings in the -Software. diff --git a/README b/README new file mode 100644 index 0000000..a6b1d5f --- /dev/null +++ b/README @@ -0,0 +1,86 @@ +Apt-DHT: a peer-to-peer proxy for apt downloads + +### Goal + +Similar to DebTorrent[1], Apt-DHT will act as a proxy between apt +requests and a debian repository server, downloading any requested +files from peers (if possible), but falling back to a direct HTTP +download. Unlike DebTorrent, Apt-DHT will be simple, efficient, and +fast. + +[1]: http://debtorrent.alioth.debian.org/ + +### Features + +* Downloads from peers, increasing the available bandwidth to the + user +* Reduces the bandwidth requirements needed to setup a repository + of packages +* Seamlessly integrates with the current APT tool +* Automatically falls back to downloading from an HTTP mirror when + peers are not available +* Builds on other already existing tools where possible +* Fast and requires limited CPU and memory +* Will try to download any file it can find a hash for from peers + (including Packages.bz2, Sources.gz, ...) + +This software is open-source and is released at no charge under the +terms of the GPL v2 license[2]. + +[2]: http://www.opensource.org/licenses/gpl-license.php + +### Requirements + +To run the full program (e.g. to actually download something): + +* Python 2.4 or higher +* Twisted[3] 2.4 or higher + - including Twisted Web2[4] 0.2 or higher +* python-apt[5] 0.6.20 or higher +* An APT-based package management system (such as Debian distributions + have) + +If you just want to run the DHT part of the program (e.g. to provide a +bootstrap node), then you only need: + +* Python 2.4 or higher +* Twisted[3] 2.4 or higher + +[3]: http://twistedmatrix.com/trac/ +[4]: http://twistedmatrix.com/trac/wiki/TwistedWeb2 +[5]: http://packages.debian.org/unstable/python/python-apt + +### Development Status + +This project is still undergoing massive code and protocol changes +and hasn't yet seen a release. The code has worked, and is +occasionally working, and will definitely be working soon in the +future. + +### Installing + +There are detailed instructions on the web site[6] showing how to +install the Apt-DHT program. If you have any trouble using the +program, you can email me[7], or come and find me in the +DebTorrent IRC channel (#debtorrent on OFTC[8]). If you think +you've found a bug in the program, please let me know. + +[6]: http://www.camrdale.org/apt-dht.html +[7]: mailto:camrdale@gmail.com +[8]: http://irc.oftc.net + +### The Code + +The latest code for the project is currently hosted in a Git +repository[9]. It is publicly readable, and there are instructions +there for downloading the code. It is originally based on the +khashmir[10] implementation of the kademlia DHT[11]. All of the +networking is handled by the Twisted and Twisted Web2 +libraries. Dealing with apt's repository files is handled by +python-apt, the code for which is based on that of the +apt-proxy[12] program. + +[9]: http://git.camrdale.org/?p=apt-dht.git;a=summary +[10]: http://khashmir.sourceforge.net/ +[11]: http://en.wikipedia.org/wiki/Kademlia +[12]: http://apt-proxy.sourceforge.net/ diff --git a/README.txt b/README.txt deleted file mode 100644 index 42f9a82..0000000 --- a/README.txt +++ /dev/null @@ -1,79 +0,0 @@ -[Note: I have no idea how up to date the code examples are -- icepick ] - -Khashmir is a distributed hash table that uses an XOR distance metric and a -routing table similar to Kademlia [1]. Use Khashmir to build distributed -applications. Note that Khashmir currently isn't very attack resistant. - - 1 - http://kademlia.scs.cs.nyu.edu/ - -Khashmir is implemented in Python using the Twisted [2] asynchronous networking -framework. Network deliver is done using UDP. PySQLite is used for each -peer's backing store of keys and values. The backing store is currently -held in memory but it could easily be placed on disk. Values expire after -24 hours, by default. Each peer stores multiple values for a key and -currently returns all available values when requested. - - 2 - http://twistedmatrix.com - -If you just want to watch it build a test network of peers, run "python -khashmir.py " This script will create the specified number of -peers, give each one three random contacts, tell each one to find the -closest nodes, then pick a random peer and have it find another random peer -(ten times), then pick a random peer to insert a key/value and have three -random peers try to find it (ten times.) - -quick example: - ->>> k = khashmir.test_one('', 4444) # choose any port - -- which is the same thing as - - ->>> import thread, khashmir ->>> k = khashmir.Khashmir('', ) # choose any port ->>> thread.start_new_thread(k.app.run, ()) - - -If you want to make another peer in the same session, use - ->>> peer = khashmir.Khashmir(host, port) - -then do - ->>> peer.app.run() - -to register with the already running thread. - - -Now you need some contacts. Add as some contacts and try to find close -nodes in the network. - ->>> k.addContact('127.0.0.1', 8080) # locate another peer ->>> k.findCloseNodes() # query the network to bootstrap our table - -Keys are always 20-character strings (sha1 hashes) currently there is no -limit to value sizes, something will go in ASAP - -Now try storing and retrieving values. - -# callback returns node info dictionaries and actual connection information -# for peers that accepted the value. Currently finds the K closest nodes and -# makes one attempt to store them ->>> k.storeValueForKey(key, value, callback=None) - -# callback returns lists of values, will fire multiple times, last time will -# be an empty list ->>> k.valueForKey(key, callback) - - - -TWEAKABLE SETTINGS: - -ktable.py: - K - the size of routing table buckets, how many nodes to return - in response to find-node/value request, and how many nodes to issue - storeValue to; default is 8, which should work for hundreds of - nodes, you might want to bump it if you think your network is going - to be large - -A bunch of other tweakables are in const.py - diff --git a/debian/changelog b/debian/changelog index 689ea1a..9475677 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -apt-dht (0.0.0) sid; urgency=low +apt-dht (0.0.0) unstable; urgency=low * Initial release. diff --git a/debian/compat b/debian/compat index 1e8b314..7ed6ff8 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -6 +5 diff --git a/debian/control b/debian/control index 22feb84..8f97946 100644 --- a/debian/control +++ b/debian/control @@ -6,15 +6,13 @@ Homepage: http://www.camrdale.org/apt-dht.html Standards-Version: 3.7.3 Build-Depends: debhelper (>= 5.0.37.2) Build-Depends-Indep: python-dev, python-support (>= 0.5.4), docbook-to-man -Build-Depends-Indep: python-twisted-web (>= 0.6), python (>= 2.3.5-1), python-apt, python-central (>= 0.5) Vcs-Git: git://git.camrdale.org/git/apt-dht.git Vcs-Browser: http://git.camrdale.org/?p=apt-dht.git;a=summary XS-Dm-Upload-Allowed: yes Package: apt-dht Architecture: all -Depends: ${python:Depends}, python-twisted-web (>= 0.6), python-apt (>= 0.5.8) -Depends: ${python:Depends}, adduser, python-debian (>= 0.1.4), python-apt +Depends: ${python:Depends}, python-twisted-web2 (>= 0.2), adduser, python-debian (>= 0.1.4), python-apt (>= 0.6.20), python-pysqlite2 (>= 2.1) Provides: python-apt-dht, python-apt-dht-khashmir Description: apt helper for peer-to-peer downloads of Debian packages Apt-DHT is a helper for downloading Debian packages files with APT. diff --git a/debian/rules b/debian/rules index 3701079..d9b1943 100755 --- a/debian/rules +++ b/debian/rules @@ -12,7 +12,7 @@ build-stamp: apt-dht.8 apt-dht.conf.5 dh_testdir touch build-stamp -%.1: debian/%.sgml +%.5 %.8: debian/%.sgml /usr/bin/docbook-to-man $< > debian/$@ clean: @@ -31,7 +31,9 @@ install: build-stamp dh_clean -k dh_installdirs - ./setup.py install --prefix=$(CURDIR)/debian/apt-dht/usr --install-lib=$(CURDIR)/debian/apt-dht/usr/share/python-support/apt-dht + ./setup.py install --prefix=$(CURDIR)/debian/apt-dht/usr \ + --install-lib=$(CURDIR)/debian/apt-dht/usr/share/python-support/apt-dht \ + --install-scripts=$(CURDIR)/debian/apt-dht/usr/sbin # Remove the generated .pyc files ( cd debian/apt-dht/usr/share/python-support/apt-dht/apt_dht_Khashmir && \ @@ -44,12 +46,10 @@ binary-indep: install dh_testdir dh_testroot dh_installdocs - dh_installexamples dh_installman - dh_installlogrotate # Remove the .py from the end of each of these - mv debian/apt-dht/usr/sbin/apt-dht.py debian/apt-dht/usr/sbin/apt-dht || exit 1; done + mv debian/apt-dht/usr/sbin/apt-dht.py debian/apt-dht/usr/sbin/apt-dht dh_installchangelogs dh_install diff --git a/setup.py b/setup.py index 7e75b63..362d38e 100755 --- a/setup.py +++ b/setup.py @@ -1,57 +1,17 @@ #!/usr/bin/env python -try: - import distutils.core - import distutils.command.build_ext -except ImportError: - raise SystemExit, """\ -You don't have the python development modules installed. +import sys +from distutils.core import setup -If you have Debian you can install it by running - apt-get install python-dev +setup( + name = "apt-dht", + version = "0.0.0", + author = "Cameron Dale", + author_email = "", + url = "http://www.camrdale.org/apt-dht.html", + license = "GPL", -If you have RedHat and know how to install this from an RPM please -email us so we can put instructions here. -""" + packages = ["apt_dht", "apt_dht_Khashmir"], -try: - import twisted -except ImportError: - raise SystemExit, """\ -You don't have Twisted installed. - -Twisted can be downloaded from - http://twistedmatrix.com/products/download - -Anything later that version 1.0.3 should work -""" - -try: - import pysqlite2 -except ImportError: - raise SystemExit, """\ -You don't have PySQLite installed. - -PySQLite can be downloaded from - http://sourceforge.net/project/showfiles.php?group_id=54058&release_id=139482 -""" - -setup_args = { - 'name': 'khashmir', - 'author': 'Andrew Loewenstern', - 'author_email': 'burris@users.sourceforge.net', - 'licence': 'MIT', - 'package_dir': {'khashmir': '.'}, - 'packages': [ - 'khashmir', - ], -} - -if hasattr(distutils.dist.DistributionMetadata, 'get_keywords'): - setup_args['keywords'] = "internet tcp p2p" - -if hasattr(distutils.dist.DistributionMetadata, 'get_platforms'): - setup_args['platforms'] = "win32 posix" - -if __name__ == '__main__': - apply(distutils.core.setup, (), setup_args) + scripts = ['apt-dht.py'] + ) -- 2.39.2