From: Brian Warner <warner@allmydata.com>
Date: Thu, 10 Apr 2008 21:36:27 +0000 (-0700)
Subject: debian: use setuptools-generated support/bin/tahoe instead of bin/tahoe, to match... 
X-Git-Url: https://git.rkrishnan.org/vdrive/components/com_hotproperty/-?a=commitdiff_plain;h=3f61198042172746af40ea166a9835ea6374fa33;p=tahoe-lafs%2Ftahoe-lafs.git

debian: use setuptools-generated support/bin/tahoe instead of bin/tahoe, to match Zooko's change that makes our in-tree bin/tahoe spawn support/bin/tahoe
---

diff --git a/misc/feisty/debian/rules b/misc/feisty/debian/rules
index a7a6d118..5abfddcb 100644
--- 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 a7a6d118..5abfddcb 100644
--- 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