From 3f61198042172746af40ea166a9835ea6374fa33 Mon Sep 17 00:00:00 2001 From: Brian Warner Date: Thu, 10 Apr 2008 14:36:27 -0700 Subject: [PATCH] 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 --- misc/feisty/debian/rules | 12 ------------ misc/sid/debian/rules | 12 ------------ 2 files changed, 24 deletions(-) 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 -- 2.45.2