debian: use setuptools-generated support/bin/tahoe instead of bin/tahoe, to match...

diff --git a/misc/feisty/debian/rules b/misc/feisty/debian/rules
index a7a6d1180ec819eb6c3680e0d80a9f6f4d270c9c..5abfddcb03469126804e1cfc4f035277931beb77 100644 (file)
--- a/misc/feisty/debian/rules
+++ b/misc/feisty/debian/rules
@@ -9,21 +9,9 @@ include /usr/share/cdbs/1/class/python-distutils.mk
 
 STAGING_DIR=$(CURDIR)/debian/allmydata-tahoe
 
-# we overwrite the setuptools-generated /usr/bin/tahoe with our package's
-# original 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 .
-#
-# One disadvantage to this approach is that the #! line will not get updated
-# to match the version of python that we're using for this build. Instead, it
-# will retain the original '#!/usr/bin/env python', which has the potential
-# to surprise people.
-
 install/allmydata-tahoe::
        mkdir -pm755 $(STAGING_DIR)
        python setup.py install --root=$(STAGING_DIR)
-       cp bin/tahoe $(STAGING_DIR)/usr/bin/
 
        dh_pycentral
 

diff --git a/misc/sid/debian/rules b/misc/sid/debian/rules
index a7a6d1180ec819eb6c3680e0d80a9f6f4d270c9c..5abfddcb03469126804e1cfc4f035277931beb77 100644 (file)
--- a/misc/sid/debian/rules
+++ b/misc/sid/debian/rules
@@ -9,21 +9,9 @@ include /usr/share/cdbs/1/class/python-distutils.mk
 
 STAGING_DIR=$(CURDIR)/debian/allmydata-tahoe
 
-# we overwrite the setuptools-generated /usr/bin/tahoe with our package's
-# original 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 .
-#
-# One disadvantage to this approach is that the #! line will not get updated
-# to match the version of python that we're using for this build. Instead, it
-# will retain the original '#!/usr/bin/env python', which has the potential
-# to surprise people.
-
 install/allmydata-tahoe::
        mkdir -pm755 $(STAGING_DIR)
        python setup.py install --root=$(STAGING_DIR)
-       cp bin/tahoe $(STAGING_DIR)/usr/bin/
 
        dh_pycentral