[Jonathan Nieder] > Here are some quick patches to get the diffs in src/1.7.x/debian/patches > to apply to today's trunk (though not to actually build successfully).
Thanks so much for your work! I've been meaning to find time to upload 1.7.x snapshots to experimental, but have been too busy of late. Maybe tonight, maybe in a couple days. Your patches will help a lot. Also, annotating all those patches with info from commit logs is much appreciated. I will probably distill it down some, but your patch is a great starting point. I've wanted to get rid of the dpatch-formatted headers for awhile, it just never really seemed worth the trouble. > | $ debian/rules build > | [...] > | # Run svn once, to make sure it populates BUILD/dummy_home/.subversion/* > | BUILD/subversion/svn/svn --version > /dev/null > | svn: E200019: Version mismatch in 'svn_gnome_keyring': found 1.6.17, > expected 1.8.0-dev > | make: *** [debian/stamp-build-arch] Error 1 > > Maybe svn needs a Build-Conflicts against libsvn1. After removing > that package, the build gets further: There's already a Build-Conflicts with libsvn-dev for similar reasons. I'd rather not expand it to libsvn1 unless it's the only reasonable course (it makes it harder to do test builds if I have to uninstall svn in the test environment). In this particular case, I think svn_gnome_keyring is loaded via dlopen, not runtime linkage, so ensuring that it gets the build version rather than the installed version might not be as easy. I'll probably try and patch the dlopen call can be patched to use a relative path instead of absolute, so that it respects things like LD_LIBRARY_PATH. > | gcc: error: subversion/bindings/swig/python/svn_client.c: No such file or > directory > | gcc: fatal error: no input files > | compilation terminated. > | make[1]: *** [subversion/bindings/swig/python/svn_client.lo] Error 1 > | make[1]: Leaving directory `/home/jrn/src/subversion-package/BUILD' > | make: *** [debian/stamp-build-arch] Error 2 > > It looks like build-fixes or python-builds will need more work. Yeah, I'll investigate. Probably a VPATH issue of some sort. Thanks. -- Peter Samuelson | org-tld!p12n!peter | http://p12n.org/ -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
