[or-cvs] r23900: {arm} Removing dependency on python 2.6 for installation and build (in arm: release resources trunk)

[Damian Johnson]

Author: atagar
Date: 2010-12-07 17:46:03 +0000 (Tue, 07 Dec 2010)
New Revision: 23900

Modified:
   arm/release/setup.py
   arm/resources/deb-prep.sh
   arm/trunk/setup.py
Log:
Removing dependency on python 2.6 for installation and building.
This was using the gzip name attribute unnecessarily which isn't available in older python versions (caught by weasel).



Modified: arm/release/setup.py
===================================================================
--- arm/release/setup.py	2010-12-07 17:42:11 UTC (rev 23899)
+++ arm/release/setup.py	2010-12-07 17:46:03 UTC (rev 23900)
@@ -51,7 +51,7 @@
     
     # places in tmp rather than a relative path to avoid having this copy appear
     # in the deb and rpm builds
-    manFilename = manOutputFile.name
+    manFilename = tmpFilename
   except IOError, exc:
     print "Unable to compress man page: %s" % exc
 

Modified: arm/resources/deb-prep.sh
===================================================================
--- arm/resources/deb-prep.sh	2010-12-07 17:42:11 UTC (rev 23899)
+++ arm/resources/deb-prep.sh	2010-12-07 17:46:03 UTC (rev 23900)
@@ -14,6 +14,6 @@
 # /usr/share/doc/arm/armrc.sample -> /usr/share/doc/tor-arm/armrc.sample.gz
 sed -i 's/\/usr\/share\/doc\/arm\/armrc.sample/\/usr\/share\/doc\/tor-arm\/armrc.sample.gz/g' release_deb/arm.1
 
-tar czf tor-arm_1.4.0.2.orig.tar.gz release_deb
+tar czf tor-arm_1.4.0.1.orig.tar.gz release_deb
 svn export resources/build/debian release_deb/debian
 

Modified: arm/trunk/setup.py
===================================================================
--- arm/trunk/setup.py	2010-12-07 17:42:11 UTC (rev 23899)
+++ arm/trunk/setup.py	2010-12-07 17:46:03 UTC (rev 23900)
@@ -51,7 +51,7 @@
     
     # places in tmp rather than a relative path to avoid having this copy appear
     # in the deb and rpm builds
-    manFilename = manOutputFile.name
+    manFilename = tmpFilename
   except IOError, exc:
     print "Unable to compress man page: %s" % exc