[or-cvs] r23833: {arm} More changes for deb: changed the changelog to my @torprojec (in arm: resources/build/debian trunk)

[Damian Johnson]

Author: atagar
Date: 2010-11-19 06:07:01 +0000 (Fri, 19 Nov 2010)
New Revision: 23833

Removed:
   arm/resources/build/debian/pycompat
Modified:
   arm/resources/build/debian/changelog
   arm/resources/build/debian/control
   arm/resources/build/debian/copyright
   arm/trunk/setup.py
Log:
More changes for deb:
changed the changelog to my @torproject.org address
copied the torctl license into debian/copyright
appended slash to homepage url
droping pycompat



Modified: arm/resources/build/debian/changelog
===================================================================
--- arm/resources/build/debian/changelog	2010-11-19 05:29:53 UTC (rev 23832)
+++ arm/resources/build/debian/changelog	2010-11-19 06:07:01 UTC (rev 23833)
@@ -2,4 +2,4 @@
 
   * Initial release (upstream version 1.3.7-1, closes: #603056).
   
- -- Damian Johnson (www.atagar.com) <atagar1 at gmail.com>  Wed, 6 Oct 2010 22:30:43 -0700
+ -- Damian Johnson <atagar at torproject.org>  Wed, 6 Oct 2010 22:30:43 -0700

Modified: arm/resources/build/debian/control
===================================================================
--- arm/resources/build/debian/control	2010-11-19 05:29:53 UTC (rev 23832)
+++ arm/resources/build/debian/control	2010-11-19 06:07:01 UTC (rev 23833)
@@ -1,10 +1,10 @@
 Source: tor-arm
 Section: comm
 Priority: extra
-Maintainer: Damian Johnson (www.atagar.com) <atagar1 at gmail.com>
+Maintainer: Damian Johnson <atagar at torproject.org>
 Build-Depends: debhelper (>= 5), python-support (>= 0.6), cdbs (>= 0.4.49), python
 Standards-Version: 3.9.1
-Homepage: http://www.atagar.com/arm
+Homepage: http://www.atagar.com/arm/
 
 Package: tor-arm
 Architecture: all

Modified: arm/resources/build/debian/copyright
===================================================================
--- arm/resources/build/debian/copyright	2010-11-19 05:29:53 UTC (rev 23832)
+++ arm/resources/build/debian/copyright	2010-11-19 06:07:01 UTC (rev 23833)
@@ -25,3 +25,38 @@
 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.
+

Deleted: arm/resources/build/debian/pycompat
===================================================================
--- arm/resources/build/debian/pycompat	2010-11-19 05:29:53 UTC (rev 23832)
+++ arm/resources/build/debian/pycompat	2010-11-19 06:07:01 UTC (rev 23833)
@@ -1 +0,0 @@
-2

Modified: arm/trunk/setup.py
===================================================================
--- arm/trunk/setup.py	2010-11-19 05:29:53 UTC (rev 23832)
+++ arm/trunk/setup.py	2010-11-19 06:07:01 UTC (rev 23833)
@@ -75,7 +75,7 @@
 # TODO: not sure how to remove this from the deb build too...
 eggPath = '/usr/share/arm-%s.egg-info' % VERSION
 
-if os.path.isfile(eggPath):
+if not isDebInstall and os.path.isfile(eggPath):
   if "-q" not in sys.argv: print "Removing %s" % eggPath
   os.remove(eggPath)