commit 22fba9a3f53bf1567c840b6dc3f22919748206c8 Author: Damian Johnson atagar@torproject.org Date: Fri Jun 10 18:35:03 2011 -0700

Dropping the TorCtl copyright from deb

Since TorCtl is no longer bundled with the arm deb we don't need its copyright. --- build/debian/copyright | 37 ------------------------------------- 1 files changed, 0 insertions(+), 37 deletions(-)

diff --git a/build/debian/copyright b/build/debian/copyright index 0c3da03..156b34f 100644 --- a/build/debian/copyright +++ b/build/debian/copyright @@ -25,43 +25,6 @@ License: GPL On Debian systems, the complete text of the GNU General Public License can be found in `/usr/share/common-licenses/GPL-3'.

-This is distributed with TorCtl which has the following license: -=============================================================================== -The Python Tor controller code is distributed under this license: - -Copyright 2005, Nick Mathewson, Roger Dingledine -Copyright 2007-2010, Mike Perry - -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 names of the copyright owners 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 -OWNER 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. - -The also includes methods for reading proc files (and some of the code) -borrowd from psutil which has the following license: =============================================================================== psutil is distributed under BSD license reproduced below.