diff -Nru tahoe-lafs-1.8.2/debian/changelog tahoe-lafs-1.8.2/debian/changelog --- tahoe-lafs-1.8.2/debian/changelog 2011-02-24 06:33:00.000000000 +0000 +++ tahoe-lafs-1.8.2/debian/changelog 2011-06-16 17:36:37.000000000 +0000 @@ -1,3 +1,38 @@ +tahoe-lafs (1.8.2-3) unstable; urgency=low + + * Update debian/copyright to have complete licensing information + + -- Micah Anderson Thu, 16 Jun 2011 13:33:31 -0400 + +tahoe-lafs (1.8.2-2) unstable; urgency=low + + * Raise dependency on python-pycryptopp version, now upgraded in Debian. + + -- Bert Agaz Wed, 15 Jun 2011 00:41:24 +0200 + +tahoe-lafs (1.8.2-1) unstable; urgency=low + + [ bertagaz ] + * Initial release (Closes: #544338). + * Remove ubuntu's specific XSBC-Original-Maintainer field a in debian/control. + * Remove deprecated XB-Python-Version field in debian/control. + * Add install dependency on python-mock. + * Update homepage in debian/control. + * Ignore quilt dir. + * Remove upstream custom build dependencies. + * Include munin plugins. + * Use upstream trick to install a clean bin/tahoe. + * Bump versions of several install dependencies. + * Bump compatibility version. + * Exclude buildtest python package from the debian one. + + [ Micah Anderson] + * switch dh_clean -k to dh_prep + * add myself to Uploaders + * Update Standards-Version: no changes + + -- Bert Agaz Wed, 13 Apr 2011 21:35:26 +0200 + tahoe-lafs (1.8.2-0ubuntu1) natty; urgency=low * Update to version 1.8.2 (LP: #719092) diff -Nru tahoe-lafs-1.8.2/debian/compat tahoe-lafs-1.8.2/debian/compat --- tahoe-lafs-1.8.2/debian/compat 2011-02-23 19:55:36.000000000 +0000 +++ tahoe-lafs-1.8.2/debian/compat 2011-06-16 17:36:37.000000000 +0000 @@ -1 +1 @@ -5 +7 diff -Nru tahoe-lafs-1.8.2/debian/control tahoe-lafs-1.8.2/debian/control --- tahoe-lafs-1.8.2/debian/control 2011-02-23 21:15:23.000000000 +0000 +++ tahoe-lafs-1.8.2/debian/control 2011-06-16 17:36:37.000000000 +0000 @@ -1,21 +1,20 @@ Source: tahoe-lafs Section: utils Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Brian Warner +Maintainer: Bert Agaz +Uploaders: Micah Anderson Build-Depends: debhelper (>= 7), python-support, python-setuptools, python (>= 2.5), python-twisted XS-Python-Version: >= 2.5 -Standards-Version: 3.9.1 -Homepage: http://allmydata.org/trac/tahoe +Standards-Version: 3.9.2 +Homepage: http://tahoe-lafs.org/trac/tahoe Package: tahoe-lafs Architecture: all Depends: ${misc:Depends}, ${python:Depends}, python-twisted, - python-foolscap (>= 0.4.1), python-openssl, python-nevow, - python-simplejson (>= 1.4), python-zfec (>= 1.1), python-pycryptopp (>= 0.5.14), - python-setuptools -XB-Python-Version: >= 2.5 + python-foolscap (>= 0.6.1-3), python-openssl, python-nevow, + python-simplejson (>= 2.1.1), python-zfec (>= 1.4), python-pycryptopp (>= 0.5.29-1), + python-setuptools, python-mock Description: Secure distributed filesystem Tahoe, the Least Authority File System, is a distributed filesystem that features high reliability, strong security properties, and a fine-grained diff -Nru tahoe-lafs-1.8.2/debian/copyright tahoe-lafs-1.8.2/debian/copyright --- tahoe-lafs-1.8.2/debian/copyright 2011-02-23 19:55:36.000000000 +0000 +++ tahoe-lafs-1.8.2/debian/copyright 2011-06-16 17:36:37.000000000 +0000 @@ -8,30 +8,28 @@ Zooko Wilcox-O'Hearn and dozens of others -Copyright © 2006-2009 +Copyright © 2006-2011 AllMyData, Inc. You may use this package under the GNU General Public License, version 2 or, at -your option, any later version. +your option, any later version. You may also opt to use this package under the +terms of the Transitive Grace Period Public License, version 1 or, at your +option, any later version. On Debian GNU/Linux systems, the complete text of the GNU General Public License can be found in `/usr/share/common-licenses/GPL'. +The Transitive Grace Period Public Licence has requirements similar to the GPL +except that it allows you to wait for up to twelve months after you redistribute +a derived work before releasing the source code of your derived work. See the +file COPYING.TGPPL.html for the terms of the Transitive Grace Period Public +Licence, version 1, also included below. + This licence also comes with the added permission that you may link this program with the OpenSSL library and distribute executables, as long as you follow the requirements of this licence in regard to all of the software in the executable aside from OpenSSL. -You may use this package under the Transitive Grace Period Public Licence, -version 1 or, at your option, any later version. The Transitive Grace Period -Public Licence has requirements similar to the GPL except that it allows you to -wait for up to twelve months after you redistribute a derived work before -releasing the source code of your derived work. See the file COPYING.TGPPL.html -for the terms of the Transitive Grace Period Public Licence, version 1. - -(You may choose to use this package under the terms of either licence, at your -option.) - ------- begin TGPPL1 licence Transitive Grace Period Public Licence ("TGPPL") v. 1.0 @@ -198,31 +196,6 @@ this License. ------- end TGPPL1 licence -The files mac/fuse.py and mac/fuseparts/subbedopts.py are licensed under -the GNU Lesser General Public Licence. In addition, on 2009-09-21 Csaba -Henk granted permission for those files to be under the same terms as -Tahoe-LAFS itself. - -See /usr/share/common-licenses/GPL for a copy of the GNU General Public -License, and /usr/share/common-licenses/LGPL for the GNU Lesser General Public -License. - -The file src/allmydata/util/figleaf.py is licensed under the BSD licence. - -------- begin BSD licence -Copyright (c) , -All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of the nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------- end BSD licence - - The file src/allmydata/util/statistics.py was originally licensed under the GPL3, but on 2009-09-21 its author Shawn Willden declared: "I hereby license all patches I have contributed or will contribute to the Allmydata Tahoe-LAFS @@ -235,3 +208,349 @@ they see fit, and they reclicensed it the same terms as Tahoe-LAFS itself: you may use it under GPL version 2 or greater at your option or under TGPPL version 1 or greater at your option. + +The setuptools-0.6c16dev3.egg directory, which is not used in the debian package +(see patches), but is included in the upstream source is licensed under the PSF +or ZPL, both of which are included below: + +PSF +------------------------------------------------------------------------------ + +A. HISTORY OF THE SOFTWARE +========================== + +Python was created in the early 1990s by Guido van Rossum at Stichting +Mathematisch Centrum (CWI, see http://www.cwi.nl) in the Netherlands +as a successor of a language called ABC. Guido remains Python's +principal author, although it includes many contributions from others. + +In 1995, Guido continued his work on Python at the Corporation for +National Research Initiatives (CNRI, see http://www.cnri.reston.va.us) +in Reston, Virginia where he released several versions of the +software. + +In May 2000, Guido and the Python core development team moved to +BeOpen.com to form the BeOpen PythonLabs team. In October of the same +year, the PythonLabs team moved to Digital Creations (now Zope +Corporation, see http://www.zope.com). In 2001, the Python Software +Foundation (PSF, see http://www.python.org/psf/) was formed, a +non-profit organization created specifically to own Python-related +Intellectual Property. Zope Corporation is a sponsoring member of +the PSF. + +All Python releases are Open Source (see http://www.opensource.org for +the Open Source Definition). Historically, most, but not all, Python +releases have also been GPL-compatible; the table below summarizes +the various releases. + + Release Derived Year Owner GPL- + from compatible? (1) + + 0.9.0 thru 1.2 1991-1995 CWI yes + 1.3 thru 1.5.2 1.2 1995-1999 CNRI yes + 1.6 1.5.2 2000 CNRI no + 2.0 1.6 2000 BeOpen.com no + 1.6.1 1.6 2001 CNRI yes (2) + 2.1 2.0+1.6.1 2001 PSF no + 2.0.1 2.0+1.6.1 2001 PSF yes + 2.1.1 2.1+2.0.1 2001 PSF yes + 2.2 2.1.1 2001 PSF yes + 2.1.2 2.1.1 2002 PSF yes + 2.1.3 2.1.2 2002 PSF yes + 2.2.1 2.2 2002 PSF yes + 2.2.2 2.2.1 2002 PSF yes + 2.3 2.2.2 2002-2003 PSF yes + +Footnotes: + +(1) GPL-compatible doesn't mean that we're distributing Python under + the GPL. All Python licenses, unlike the GPL, let you distribute + a modified version without making your changes open source. The + GPL-compatible licenses make it possible to combine Python with + other software that is released under the GPL; the others don't. + +(2) According to Richard Stallman, 1.6.1 is not GPL-compatible, + because its license has a choice of law clause. According to + CNRI, however, Stallman's lawyer has told CNRI's lawyer that 1.6.1 + is "not incompatible" with the GPL. + +Thanks to the many outside volunteers who have worked under Guido's +direction to make these releases possible. + + +B. TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING PYTHON +=============================================================== + +PSF LICENSE AGREEMENT FOR PYTHON 2.3 +------------------------------------ + +1. This LICENSE AGREEMENT is between the Python Software Foundation +("PSF"), and the Individual or Organization ("Licensee") accessing and +otherwise using Python 2.3 software in source or binary form and its +associated documentation. + +2. Subject to the terms and conditions of this License Agreement, PSF +hereby grants Licensee a nonexclusive, royalty-free, world-wide +license to reproduce, analyze, test, perform and/or display publicly, +prepare derivative works, distribute, and otherwise use Python 2.3 +alone or in any derivative version, provided, however, that PSF's +License Agreement and PSF's notice of copyright, i.e., "Copyright (c) +2001, 2002 Python Software Foundation; All Rights Reserved" are +retained in Python 2.3 alone or in any derivative version prepared by +Licensee. + +3. In the event Licensee prepares a derivative work that is based on +or incorporates Python 2.3 or any part thereof, and wants to make +the derivative work available to others as provided herein, then +Licensee hereby agrees to include in any such work a brief summary of +the changes made to Python 2.3. + +4. PSF is making Python 2.3 available to Licensee on an "AS IS" +basis. PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR +IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND +DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS +FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 2.3 WILL NOT +INFRINGE ANY THIRD PARTY RIGHTS. + +5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON +2.3 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS +A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 2.3, +OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. + +6. This License Agreement will automatically terminate upon a material +breach of its terms and conditions. + +7. Nothing in this License Agreement shall be deemed to create any +relationship of agency, partnership, or joint venture between PSF and +Licensee. This License Agreement does not grant permission to use PSF +trademarks or trade name in a trademark sense to endorse or promote +products or services of Licensee, or any third party. + +8. By copying, installing or otherwise using Python 2.3, Licensee +agrees to be bound by the terms and conditions of this License +Agreement. + + +BEOPEN.COM LICENSE AGREEMENT FOR PYTHON 2.0 +------------------------------------------- + +BEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1 + +1. This LICENSE AGREEMENT is between BeOpen.com ("BeOpen"), having an +office at 160 Saratoga Avenue, Santa Clara, CA 95051, and the +Individual or Organization ("Licensee") accessing and otherwise using +this software in source or binary form and its associated +documentation ("the Software"). + +2. Subject to the terms and conditions of this BeOpen Python License +Agreement, BeOpen hereby grants Licensee a non-exclusive, +royalty-free, world-wide license to reproduce, analyze, test, perform +and/or display publicly, prepare derivative works, distribute, and +otherwise use the Software alone or in any derivative version, +provided, however, that the BeOpen Python License is retained in the +Software, alone or in any derivative version prepared by Licensee. + +3. BeOpen is making the Software available to Licensee on an "AS IS" +basis. BEOPEN MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR +IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, BEOPEN MAKES NO AND +DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS +FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE WILL NOT +INFRINGE ANY THIRD PARTY RIGHTS. + +4. BEOPEN SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF THE +SOFTWARE FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS +AS A RESULT OF USING, MODIFYING OR DISTRIBUTING THE SOFTWARE, OR ANY +DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. + +5. This License Agreement will automatically terminate upon a material +breach of its terms and conditions. + +6. This License Agreement shall be governed by and interpreted in all +respects by the law of the State of California, excluding conflict of +law provisions. Nothing in this License Agreement shall be deemed to +create any relationship of agency, partnership, or joint venture +between BeOpen and Licensee. This License Agreement does not grant +permission to use BeOpen trademarks or trade names in a trademark +sense to endorse or promote products or services of Licensee, or any +third party. As an exception, the "BeOpen Python" logos available at +http://www.pythonlabs.com/logos.html may be used according to the +permissions granted on that web page. + +7. By copying, installing or otherwise using the software, Licensee +agrees to be bound by the terms and conditions of this License +Agreement. + + +CNRI LICENSE AGREEMENT FOR PYTHON 1.6.1 +--------------------------------------- + +1. This LICENSE AGREEMENT is between the Corporation for National +Research Initiatives, having an office at 1895 Preston White Drive, +Reston, VA 20191 ("CNRI"), and the Individual or Organization +("Licensee") accessing and otherwise using Python 1.6.1 software in +source or binary form and its associated documentation. + +2. Subject to the terms and conditions of this License Agreement, CNRI +hereby grants Licensee a nonexclusive, royalty-free, world-wide +license to reproduce, analyze, test, perform and/or display publicly, +prepare derivative works, distribute, and otherwise use Python 1.6.1 +alone or in any derivative version, provided, however, that CNRI's +License Agreement and CNRI's notice of copyright, i.e., "Copyright (c) +1995-2001 Corporation for National Research Initiatives; All Rights +Reserved" are retained in Python 1.6.1 alone or in any derivative +version prepared by Licensee. Alternately, in lieu of CNRI's License +Agreement, Licensee may substitute the following text (omitting the +quotes): "Python 1.6.1 is made available subject to the terms and +conditions in CNRI's License Agreement. This Agreement together with +Python 1.6.1 may be located on the Internet using the following +unique, persistent identifier (known as a handle): 1895.22/1013. This +Agreement may also be obtained from a proxy server on the Internet +using the following URL: http://hdl.handle.net/1895.22/1013". + +3. In the event Licensee prepares a derivative work that is based on +or incorporates Python 1.6.1 or any part thereof, and wants to make +the derivative work available to others as provided herein, then +Licensee hereby agrees to include in any such work a brief summary of +the changes made to Python 1.6.1. + +4. CNRI is making Python 1.6.1 available to Licensee on an "AS IS" +basis. CNRI MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR +IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, CNRI MAKES NO AND +DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS +FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 1.6.1 WILL NOT +INFRINGE ANY THIRD PARTY RIGHTS. + +5. CNRI SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON +1.6.1 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS +A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 1.6.1, +OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. + +6. This License Agreement will automatically terminate upon a material +breach of its terms and conditions. + +7. This License Agreement shall be governed by the federal +intellectual property law of the United States, including without +limitation the federal copyright law, and, to the extent such +U.S. federal law does not apply, by the law of the Commonwealth of +Virginia, excluding Virginia's conflict of law provisions. +Notwithstanding the foregoing, with regard to derivative works based +on Python 1.6.1 that incorporate non-separable material that was +previously distributed under the GNU General Public License (GPL), the +law of the Commonwealth of Virginia shall govern this License +Agreement only as to issues arising under or with respect to +Paragraphs 4, 5, and 7 of this License Agreement. Nothing in this +License Agreement shall be deemed to create any relationship of +agency, partnership, or joint venture between CNRI and Licensee. This +License Agreement does not grant permission to use CNRI trademarks or +trade name in a trademark sense to endorse or promote products or +services of Licensee, or any third party. + +8. By clicking on the "ACCEPT" button where indicated, or by copying, +installing or otherwise using Python 1.6.1, Licensee agrees to be +bound by the terms and conditions of this License Agreement. + + ACCEPT + + +CWI LICENSE AGREEMENT FOR PYTHON 0.9.0 THROUGH 1.2 +-------------------------------------------------- + +Copyright (c) 1991 - 1995, Stichting Mathematisch Centrum Amsterdam, +The Netherlands. All rights reserved. + +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, +provided that the above copyright notice appear in all copies and that +both that copyright notice and this permission notice appear in +supporting documentation, and that the name of Stichting Mathematisch +Centrum or CWI not be used in advertising or publicity pertaining to +distribution of the software without specific, written prior +permission. + +STICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO +THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH CENTRUM BE LIABLE +FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT +OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + + + +Zope Public License (ZPL) Version 2.1 +------------------------------------------------------------------------------ + +A copyright notice accompanies this license document that +identifies the copyright holders. + +This license has been certified as open source. It has also +been designated as GPL compatible by the Free Software +Foundation (FSF). + +Redistribution and use in source and binary forms, with or +without modification, are permitted provided that the +following conditions are met: + +1. Redistributions in source code must retain the + accompanying copyright notice, this list of conditions, + and the following disclaimer. + +2. Redistributions in binary form must reproduce the accompanying + copyright notice, this list of conditions, and the + following disclaimer in the documentation and/or other + materials provided with the distribution. + +3. Names of the copyright holders must not be used to + endorse or promote products derived from this software + without prior written permission from the copyright + holders. + +4. The right to distribute this software or to use it for + any purpose does not give you the right to use + Servicemarks (sm) or Trademarks (tm) of the copyright + holders. Use of them is covered by separate agreement + with the copyright holders. + +5. If any files are modified, you must cause the modified + files to carry prominent notices stating that you changed + the files and the date of any change. + +Disclaimer + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' + AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT + NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY + AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN + NO EVENT SHALL THE COPYRIGHT HOLDERS BE + LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + DAMAGE. + + +The setuptools_darcs-1.2.12.egg directory and the darcsver-1.7.2.egg directory, +neither which is not used in the debian package (see patches), is included in +the upstream source and is licensed under the BSD License: + + Redistribution and use in source and binary forms, with or without + modification, are permitted under the terms of the BSD License. + + THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + SUCH DAMAGE. + +On Debian systems, the complete text of the BSD License can be +found in "/usr/share/common-licenses/BSD". diff -Nru tahoe-lafs-1.8.2/debian/patches/debian-changes-1.8.2-0ubuntu0 tahoe-lafs-1.8.2/debian/patches/debian-changes-1.8.2-0ubuntu0 --- tahoe-lafs-1.8.2/debian/patches/debian-changes-1.8.2-0ubuntu0 2011-02-24 06:01:43.000000000 +0000 +++ tahoe-lafs-1.8.2/debian/patches/debian-changes-1.8.2-0ubuntu0 1970-01-01 00:00:00.000000000 +0000 @@ -1,46 +0,0 @@ -Description: Upstream changes introduced in version 1.8.2-0ubuntu0 - This patch has been created by dpkg-source during the package build. - Here's the last changelog entry, hopefully it gives details on why - those changes were made: - . - tahoe-lafs (1.8.2-0ubuntu0) natty; urgency=low - . - * Update to version 1.8.2 - - Improved performance and fault tolerance of downloads - - Increased logging - - Fixed Twisted 10.2 compatitibility - * Update standards version to 3.9.1 - . - The person named in the Author field signed this changelog entry. -Author: Paul Hummer - ---- -The information above should follow the Patch Tagging Guidelines, please -checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here -are templates for supplementary fields that you might want to add: - -Origin: , -Bug: -Bug-Debian: http://bugs.debian.org/ -Bug-Ubuntu: https://launchpad.net/bugs/ -Forwarded: -Reviewed-By: -Last-Update: - ---- tahoe-lafs-1.8.2.orig/src/allmydata_tahoe.egg-info/requires.txt -+++ tahoe-lafs-1.8.2/src/allmydata_tahoe.egg-info/requires.txt -@@ -8,4 +8,4 @@ Nevow >= 0.6.0 - pycrypto == 2.0.1, == 2.1.0, >= 2.3 - pyasn1 >= 0.0.8a - mock --pycryptopp >= 0.5.20 -\ No newline at end of file -+pycryptopp >= 0.5.14 -\ No newline at end of file ---- tahoe-lafs-1.8.2.orig/src/allmydata_tahoe.egg-info/SOURCES.txt -+++ tahoe-lafs-1.8.2/src/allmydata_tahoe.egg-info/SOURCES.txt -@@ -1,4 +1,3 @@ -- - .darcs-boringfile - COPYING.GPL - COPYING.TGPPL.html diff -Nru tahoe-lafs-1.8.2/debian/patches/exclude_buildtest_package.diff tahoe-lafs-1.8.2/debian/patches/exclude_buildtest_package.diff --- tahoe-lafs-1.8.2/debian/patches/exclude_buildtest_package.diff 1970-01-01 00:00:00.000000000 +0000 +++ tahoe-lafs-1.8.2/debian/patches/exclude_buildtest_package.diff 2011-06-16 17:36:37.000000000 +0000 @@ -0,0 +1,34 @@ +Index: tahoe/setup.py +=================================================================== +--- tahoe.orig/setup.py 2011-04-13 22:43:22.349847608 +0200 ++++ tahoe/setup.py 2011-04-13 22:43:54.277842306 +0200 +@@ -404,7 +404,7 @@ + "sdist": MySdist, + }, + package_dir = {'':'src'}, +- packages=find_packages("src"), ++ packages=['allmydata'], + classifiers=trove_classifiers, + test_suite="allmydata.test", + install_requires=install_requires, +Index: tahoe/src/allmydata_tahoe.egg-info/SOURCES.txt +=================================================================== +--- tahoe.orig/src/allmydata_tahoe.egg-info/SOURCES.txt 2011-04-13 22:46:13.953848270 +0200 ++++ tahoe/src/allmydata_tahoe.egg-info/SOURCES.txt 2011-04-13 22:46:27.061842298 +0200 +@@ -476,7 +476,5 @@ + src/allmydata_tahoe.egg-info/not-zip-safe + src/allmydata_tahoe.egg-info/requires.txt + src/allmydata_tahoe.egg-info/top_level.txt +-src/buildtest/__init__.py +-src/buildtest/test_build_with_fake_dist.py + static/tahoe.py +-twisted/plugins/allmydata_trial.py +\ No newline at end of file ++twisted/plugins/allmydata_trial.py +Index: tahoe/src/allmydata_tahoe.egg-info/top_level.txt +=================================================================== +--- tahoe.orig/src/allmydata_tahoe.egg-info/top_level.txt 2011-04-13 22:46:53.945848318 +0200 ++++ tahoe/src/allmydata_tahoe.egg-info/top_level.txt 2011-04-13 22:47:01.213842243 +0200 +@@ -1,2 +1 @@ + allmydata +-buildtest diff -Nru tahoe-lafs-1.8.2/debian/patches/remove_upstream_setup_deps.diff tahoe-lafs-1.8.2/debian/patches/remove_upstream_setup_deps.diff --- tahoe-lafs-1.8.2/debian/patches/remove_upstream_setup_deps.diff 1970-01-01 00:00:00.000000000 +0000 +++ tahoe-lafs-1.8.2/debian/patches/remove_upstream_setup_deps.diff 2011-06-16 17:36:37.000000000 +0000 @@ -0,0 +1,56 @@ +Index: tahoe/setup.cfg +=================================================================== +--- tahoe.orig/setup.cfg 2011-04-13 16:56:35.205847712 +0200 ++++ tahoe/setup.cfg 2011-04-13 17:10:10.317846906 +0200 +@@ -8,14 +8,3 @@ + tag_build = + tag_date = 0 + tag_svn_revision = 0 +- +-[aliases] +-sdist_dsc = darcsver --count-all-patches sdist_dsc +-test_mac_diskimage = darcsver --count-all-patches test_mac_diskimage +-sdist = darcsver --count-all-patches sdist +-trial = darcsver --count-all-patches trial +-build = darcsver --count-all-patches develop --prefix=support make_executable build +-install = darcsver --count-all-patches install +-test = darcsver --count-all-patches develop --prefix=support make_executable build trial +-bdist_egg = darcsver --count-all-patches bdist_egg +- +Index: tahoe/setup.py +=================================================================== +--- tahoe.orig/setup.py 2011-04-13 17:08:52.401847307 +0200 ++++ tahoe/setup.py 2011-04-13 17:10:20.849842282 +0200 +@@ -67,15 +67,15 @@ + del sys.argv[1] + install_requires += ["fakedependency >= 1.0.0"] + +-__requires__ = install_requires[:] ++#__requires__ = install_requires[:] + +-egg = os.path.realpath(glob.glob('setuptools-*.egg')[0]) +-sys.path.insert(0, egg) +-egg = os.path.realpath(glob.glob('darcsver-*.egg')[0]) +-sys.path.insert(0, egg) +-egg = os.path.realpath(glob.glob('setuptools_darcs-*.egg')[0]) +-sys.path.insert(0, egg) +-import setuptools; setuptools.bootstrap_install_from = egg ++#egg = os.path.realpath(glob.glob('setuptools-*.egg')[0]) ++#sys.path.insert(0, egg) ++#egg = os.path.realpath(glob.glob('darcsver-*.egg')[0]) ++#sys.path.insert(0, egg) ++#egg = os.path.realpath(glob.glob('setuptools_darcs-*.egg')[0]) ++#sys.path.insert(0, egg) ++#import setuptools; setuptools.bootstrap_install_from = egg + + from setuptools import find_packages, setup + from setuptools.command import sdist +@@ -410,7 +410,7 @@ + install_requires=install_requires, + tests_require=tests_require, + include_package_data=True, +- setup_requires=setup_requires, ++ #setup_requires=setup_requires, + entry_points = { 'console_scripts': [ 'tahoe = allmydata.scripts.runner:run' ] }, + zip_safe=False, # We prefer unzipped for easier access. + versionfiles=['src/allmydata/_version.py',], diff -Nru tahoe-lafs-1.8.2/debian/patches/series tahoe-lafs-1.8.2/debian/patches/series --- tahoe-lafs-1.8.2/debian/patches/series 2011-02-23 20:57:52.000000000 +0000 +++ tahoe-lafs-1.8.2/debian/patches/series 2011-06-16 17:36:37.000000000 +0000 @@ -1 +1,2 @@ -debian-changes-1.8.2-0ubuntu0 +remove_upstream_setup_deps.diff +exclude_buildtest_package.diff diff -Nru tahoe-lafs-1.8.2/debian/rules tahoe-lafs-1.8.2/debian/rules --- tahoe-lafs-1.8.2/debian/rules 2011-02-23 19:55:36.000000000 +0000 +++ tahoe-lafs-1.8.2/debian/rules 2011-06-16 17:36:37.000000000 +0000 @@ -28,13 +28,22 @@ install: build dh_testdir dh_testroot - dh_clean -k + dh_prep dh_installdirs + dh_install + chmod 755 debian/$(package)/usr/share/munin/plugins/* python setup.py install \ --no-compile \ --install-layout=deb \ --single-version-externally-managed \ --root $(CURDIR)/debian/$(package) + + # Clean bin/tahoe trick stolen from upstream packaging script. + head -1 debian/$(package)/usr/bin/tahoe > debian/$(package)/usr/bin/tahoe.new + echo "from allmydata.scripts import runner" >> debian/$(package)/usr/bin/tahoe.new + echo "runner.run()" >> debian/$(package)//usr/bin/tahoe.new + chmod +x debian/$(package)/usr/bin/tahoe.new + mv debian/$(package)/usr/bin/tahoe.new debian/$(package)/usr/bin/tahoe binary-indep: build install dh_testdir diff -Nru tahoe-lafs-1.8.2/debian/tahoe-lafs.dirs tahoe-lafs-1.8.2/debian/tahoe-lafs.dirs --- tahoe-lafs-1.8.2/debian/tahoe-lafs.dirs 1970-01-01 00:00:00.000000000 +0000 +++ tahoe-lafs-1.8.2/debian/tahoe-lafs.dirs 2011-06-16 17:36:37.000000000 +0000 @@ -0,0 +1,2 @@ +etc/munin/plugin-conf.d/ +usr/share/munin/plugins/ diff -Nru tahoe-lafs-1.8.2/debian/tahoe-lafs.install tahoe-lafs-1.8.2/debian/tahoe-lafs.install --- tahoe-lafs-1.8.2/debian/tahoe-lafs.install 1970-01-01 00:00:00.000000000 +0000 +++ tahoe-lafs-1.8.2/debian/tahoe-lafs.install 2011-06-16 17:36:37.000000000 +0000 @@ -0,0 +1,2 @@ +misc/operations_helpers/munin/tahoe_* usr/share/munin/plugins/ +misc/operations_helpers/munin/*-conf etc/munin/plugin-conf.d/