I think the problem comes from patching and not cleaning out files that
are build generated.

Attached is a patch that makes rebuild possible.  It should at least be
a start in fixing the bug.  A git repo including this and additional
changes at:
http://anonscm.debian.org/gitweb/?p=users/michaeld-guest/tahoe.git

Regards,
Mike.
diff --git a/debian/patches/exclude_buildtest_package.diff b/debian/patches/exclude_buildtest_package.diff
index 2471409..cadb425 100644
--- a/debian/patches/exclude_buildtest_package.diff
+++ b/debian/patches/exclude_buildtest_package.diff
@@ -2,10 +2,8 @@ Description: Exclude buildtest python package from Debian package.
  By default tahoe-lafs also install a buildtest package but this isn't relevant
  in the context of the Debian package.
 Author: bertagaz <[email protected]>
-Index: tahoe/setup.py
-===================================================================
---- tahoe.orig/setup.py	2011-04-13 22:43:22.349847608 +0200
-+++ tahoe/setup.py	2011-04-13 22:43:54.277842306 +0200
+--- a/setup.py
++++ b/setup.py
 @@ -404,7 +404,7 @@
                  "sdist": MySdist,
                  },
@@ -15,24 +13,8 @@ Index: tahoe/setup.py
        classifiers=trove_classifiers,
        test_suite="allmydata.test",
        install_requires=install_requires,
-Index: tahoe/src/allmydata_tahoe.egg-info/SOURCES.txt
-===================================================================
---- tahoe.orig/src/allmydata_tahoe.egg-info/SOURCES.txt	2011-04-13 22:46:13.953848270 +0200
-+++ tahoe/src/allmydata_tahoe.egg-info/SOURCES.txt	2011-04-13 22:46:27.061842298 +0200
-@@ -476,7 +476,5 @@
- src/allmydata_tahoe.egg-info/not-zip-safe
- src/allmydata_tahoe.egg-info/requires.txt
- src/allmydata_tahoe.egg-info/top_level.txt
--src/buildtest/__init__.py
--src/buildtest/test_build_with_fake_dist.py
- static/tahoe.py
--twisted/plugins/allmydata_trial.py
-\ No newline at end of file
-+twisted/plugins/allmydata_trial.py
-Index: tahoe/src/allmydata_tahoe.egg-info/top_level.txt
-===================================================================
---- tahoe.orig/src/allmydata_tahoe.egg-info/top_level.txt	2011-04-13 22:46:53.945848318 +0200
-+++ tahoe/src/allmydata_tahoe.egg-info/top_level.txt	2011-04-13 22:47:01.213842243 +0200
+--- a/src/allmydata_tahoe.egg-info/top_level.txt
++++ b/src/allmydata_tahoe.egg-info/top_level.txt
 @@ -1,2 +1 @@
  allmydata
 -buildtest
diff --git a/debian/patches/remove_upstream_setup_deps.diff b/debian/patches/remove_upstream_setup_deps.diff
index 640425b..5021240 100644
--- a/debian/patches/remove_upstream_setup_deps.diff
+++ b/debian/patches/remove_upstream_setup_deps.diff
@@ -2,10 +2,8 @@ Description: Remove upstream setup dependencies.
  Tahoe-lafs setup uses a custom setuptools which rely on darcsver to do some
  smart guessings. This isn't relevant in Debian and needs to be ignored.
 Author: bertagaz <[email protected]>
-Index: tahoe/setup.cfg
-===================================================================
---- tahoe.orig/setup.cfg	2011-09-14 13:28:55.000000000 +0200
-+++ tahoe/setup.cfg	2011-09-14 14:00:08.127061668 +0200
+--- a/setup.cfg
++++ b/setup.cfg
 @@ -4,16 +4,6 @@
  	http://tahoe-lafs.org/source/tahoe-lafs/deps/tahoe-dep-sdists/
  	http://tahoe-lafs.org/source/tahoe-lafs/deps/tahoe-lafs-dep-eggs/
@@ -23,10 +21,8 @@ Index: tahoe/setup.cfg
  [egg_info]
  tag_build = 
  tag_date = 0
-Index: tahoe/setup.py
-===================================================================
---- tahoe.orig/setup.py	2011-06-25 13:19:00.000000000 +0200
-+++ tahoe/setup.py	2011-09-14 13:57:36.726551958 +0200
+--- a/setup.py
++++ b/setup.py
 @@ -67,15 +67,15 @@
      del sys.argv[1]
      install_requires += ["fakedependency >= 1.0.0"]
diff --git a/debian/rules b/debian/rules
index 47ee783..0ebaa6b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,6 +12,9 @@ clean:
 	dh_testroot
 	python setup.py clean
 	rm -rf build
+	rm -f src/allmydata_tahoe.egg-info/PKG-INFO
+	rm -f src/allmydata_tahoe.egg-info/SOURCES.txt
+	rm -f src/allmydata_tahoe.egg-info/requires.txt
 	find . -name "*\.py[co]" -exec rm -f {} \;
 	dh_clean
 

Attachment: signature.asc
Description: OpenPGP digital signature

Reply via email to