debian: use our own /usr/bin/tahoe, remove runtime dependency on setuptools (since...

diff --git a/misc/feisty/debian/control b/misc/feisty/debian/control
index 8e779e32eb1217f321f7eaa7d66586fb764415fd..0b86abc4ea38ad696f7d7c2272344a0b9a138fc0 100644 (file)
--- a/misc/feisty/debian/control
+++ b/misc/feisty/debian/control
@@ -9,7 +9,7 @@ Standards-Version: 3.7.2
 
 Package: allmydata-tahoe
 Architecture: all
-Depends: ${python:Depends}, python-twisted, python-foolscap (>= 0.2.5), python-pyopenssl, python-nevow, python-simplejson (>= 1.4), python-zfec (>= 1.1), python-pycryptopp (>= 0.2.8), python-pkg-resources | python-setuptools
+Depends: ${python:Depends}, python-twisted, python-foolscap (>= 0.2.5), python-pyopenssl, python-nevow, python-simplejson (>= 1.4), python-zfec (>= 1.1), python-pycryptopp (>= 0.2.8)
 Recommends:
 XB-Python-Version: 2.4,2.5
 Description: A secure distributed filestore

diff --git a/misc/feisty/debian/rules b/misc/feisty/debian/rules
index 5abfddcb03469126804e1cfc4f035277931beb77..0966bf757028462c04332dc7e7d9592ef1d5b5ab 100644 (file)
--- a/misc/feisty/debian/rules
+++ b/misc/feisty/debian/rules
@@ -9,10 +9,26 @@ include /usr/share/cdbs/1/class/python-distutils.mk
 
 STAGING_DIR=$(CURDIR)/debian/allmydata-tahoe
 
+# we overwrite the setuptools-generated /usr/bin/tahoe (located in
+# support/bin/tahoe after a 'make build') with a different version, because
+# the setuptools form (using "entry points") insists upon .egg-info -visible
+# forms of dependent packages to be installed. For a debian package, we rely
+# upon the dependencies that are declared in debian/control .
+#
+# To make sure the #! line matches the version of python that we're using for
+# this build, we copy it from the setuptools-generated /usr/bin/tahoe, then
+# add other code to the generated file.
+
 install/allmydata-tahoe::
        mkdir -pm755 $(STAGING_DIR)
        python setup.py install --root=$(STAGING_DIR)
 
+       head -1 $(STAGING_DIR)/usr/bin/tahoe >$(STAGING_DIR)/usr/bin/tahoe.new
+       echo "from allmydata.scripts import runner" >>$(STAGING_DIR)/usr/bin/tahoe.new
+       echo "runner.run()" >>$(STAGING_DIR)/usr/bin/tahoe.new
+       chmod +x $(STAGING_DIR)/usr/bin/tahoe.new
+       mv $(STAGING_DIR)/usr/bin/tahoe.new $(STAGING_DIR)/usr/bin/tahoe
+
        dh_pycentral
 
 clean::

diff --git a/misc/sid/debian/control b/misc/sid/debian/control
index cca142c8d582b66a6d426cfd4e9e97328d07c541..ac542d0190f857e6c7f3461666faa03a852c99bc 100644 (file)
--- a/misc/sid/debian/control
+++ b/misc/sid/debian/control
@@ -9,7 +9,7 @@ Standards-Version: 3.7.2
 
 Package: allmydata-tahoe
 Architecture: all
-Depends: ${python:Depends}, python-twisted-core, python-foolscap (>= 0.2.5), python-pyopenssl, python-twisted-names, python-nevow, python-simplejson (>= 1.4), python-zfec (>= 1.1), python-pycryptopp (>= 0.2.8), python-pkg-resources | python-setuptools
+Depends: ${python:Depends}, python-twisted-core, python-foolscap (>= 0.2.5), python-pyopenssl, python-twisted-names, python-nevow, python-simplejson (>= 1.4), python-zfec (>= 1.1), python-pycryptopp (>= 0.2.8)
 Recommends:
 XB-Python-Version: 2.4
 Description: A secure distributed filestore

diff --git a/misc/sid/debian/rules b/misc/sid/debian/rules
index 5abfddcb03469126804e1cfc4f035277931beb77..0966bf757028462c04332dc7e7d9592ef1d5b5ab 100644 (file)
--- a/misc/sid/debian/rules
+++ b/misc/sid/debian/rules
@@ -9,10 +9,26 @@ include /usr/share/cdbs/1/class/python-distutils.mk
 
 STAGING_DIR=$(CURDIR)/debian/allmydata-tahoe
 
+# we overwrite the setuptools-generated /usr/bin/tahoe (located in
+# support/bin/tahoe after a 'make build') with a different version, because
+# the setuptools form (using "entry points") insists upon .egg-info -visible
+# forms of dependent packages to be installed. For a debian package, we rely
+# upon the dependencies that are declared in debian/control .
+#
+# To make sure the #! line matches the version of python that we're using for
+# this build, we copy it from the setuptools-generated /usr/bin/tahoe, then
+# add other code to the generated file.
+
 install/allmydata-tahoe::
        mkdir -pm755 $(STAGING_DIR)
        python setup.py install --root=$(STAGING_DIR)
 
+       head -1 $(STAGING_DIR)/usr/bin/tahoe >$(STAGING_DIR)/usr/bin/tahoe.new
+       echo "from allmydata.scripts import runner" >>$(STAGING_DIR)/usr/bin/tahoe.new
+       echo "runner.run()" >>$(STAGING_DIR)/usr/bin/tahoe.new
+       chmod +x $(STAGING_DIR)/usr/bin/tahoe.new
+       mv $(STAGING_DIR)/usr/bin/tahoe.new $(STAGING_DIR)/usr/bin/tahoe
+
        dh_pycentral
 
 clean::