update feisty packaging

diff --git a/.darcs-boringfile b/.darcs-boringfile
index d5c8037e8a48635ff2ffbf922128d96460929cdb..79c92fc3c044ebe6d013f5d9cd66ca4a2dc67b55 100644 (file)
--- a/.darcs-boringfile
+++ b/.darcs-boringfile
@@ -42,10 +42,11 @@
 ^dist($|/)
 ^debian($|/)
 
-^(dapper|sid)/debian/allmydata
-^(dapper|sid)/debian/files$
+^(dapper|sid|feisty)/debian/allmydata
+^(dapper|sid|feisty)/debian/files$
 ^build($|/)
 ^build-stamp$
+^python-build-stamp-2.[45]$
 ^\.figleaf$
 ^coverage-html($|/)
 ^twisted/plugins/dropin\.cache$

diff --git a/feisty/debian/control b/feisty/debian/control
index 0c4d1983edd382dbf07c3c845531d97354cdaf8a..29626ddfdb31484e92519a032e9d8a5e3ccc9a4e 100644 (file)
--- a/feisty/debian/control
+++ b/feisty/debian/control
@@ -4,11 +4,13 @@ Priority: optional
 Maintainer: Brian Warner <warner@allmydata.com>
 Build-Depends: debhelper (>= 5.0.37.1), cdbs (>= 0.4.41), python-central (>= 0.4.10), python, python-all-dev
 Build-Depends-Indep: python-twisted
+XS-Python-Version: 2.4,2.5
 Standards-Version: 3.7.2
 
 Package: allmydata-tahoe
 Architecture: all
 Depends: ${python:Depends}, python-twisted, python-foolscap, python-pyopenssl, python-nevow
 Recommends:
+XB-Python-Version: 2.4,2.5
 Description: A secure distributed filestore
  Allmydata (tahoe2)

diff --git a/feisty/debian/rules b/feisty/debian/rules
index a5bcb01c72b83f25588bd33a13493aa1a6ed64d7..af77fd9ed2702063b59967655ff68cf59ce68193 100644 (file)
--- a/feisty/debian/rules
+++ b/feisty/debian/rules
@@ -16,7 +16,6 @@ install/allmydata-tahoe::
        python setup.py install --root=$(STAGING_DIR)
 
        dh_pycentral
-       dh_python
 
 clean::
        -rm -rf build