tag 653312 + patch thanks On Sun, 04 Mar 2012 13:45:09 +0000, Michael Dorrington wrote:
> 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 Here's the same patch without the line noise from the different diff headers, and I can confirm that the package builds. Since I'm no expert in python stuff, I'd rather let someone else upload or at least take a review ... Cheers, gregor -- .''`. Homepage: http://info.comodo.priv.at/ - OpenPGP key 0xBB3A68018649AA06 : :' : Debian GNU/Linux user, admin, and developer - http://www.debian.org/ `. `' Member of VIBE!AT & SPI, fellow of the Free Software Foundation Europe `-
diff -Nru tahoe-lafs-1.8.3/debian/changelog tahoe-lafs-1.8.3/debian/changelog --- tahoe-lafs-1.8.3/debian/changelog 2011-09-15 20:29:21.000000000 +0200 +++ tahoe-lafs-1.8.3/debian/changelog 2012-03-14 19:21:02.000000000 +0100 @@ -1,3 +1,12 @@ +tahoe-lafs (1.8.3-2.1) UNRELEASED; urgency=low + + * Non-maintainer upload. + * Fix "Error on building from source: aborting due to unexpected upstream + changes": apply patch from Michael Dorrington (handling of build generated + files in patch and clean target). (Closes: #653312) + + -- gregor herrmann <[email protected]> Wed, 14 Mar 2012 19:15:20 +0100 + tahoe-lafs (1.8.3-2) unstable; urgency=high [ Bert Agaz ] diff -Nru tahoe-lafs-1.8.3/debian/patches/exclude_buildtest_package.diff tahoe-lafs-1.8.3/debian/patches/exclude_buildtest_package.diff --- tahoe-lafs-1.8.3/debian/patches/exclude_buildtest_package.diff 2011-09-15 20:29:21.000000000 +0200 +++ tahoe-lafs-1.8.3/debian/patches/exclude_buildtest_package.diff 2012-03-14 19:13:10.000000000 +0100 @@ -15,20 +15,6 @@ 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 diff -Nru tahoe-lafs-1.8.3/debian/rules tahoe-lafs-1.8.3/debian/rules --- tahoe-lafs-1.8.3/debian/rules 2011-09-15 20:29:21.000000000 +0200 +++ tahoe-lafs-1.8.3/debian/rules 2012-03-14 19:13:10.000000000 +0100 @@ -12,6 +12,9 @@ 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
signature.asc
Description: Digital signature
