On Sat, 25 May 2013 11:47:01 +0300, Niko Tyni wrote: > > ... I just merged the 2_0_8 tag into the httpd24 branch and tarred it up. > > svn merge didn't complain, so that sould be ok, I guess. > > Nice it was that easy. For some reason I thought 'svn merge' wouldn't > work at all without write access to the upstream repo. Luckily SVN isn't > _that_ centralized :)
Yeah, I was also pleasantly surprised that it was so easy :) > On Fri, May 24, 2013 at 11:33:22PM +0300, Damyan Ivanov wrote: > > > I started in the other direction -- from the current 2.0.8 package, > > picking commits from upstream's httpd24 branch, until the build > > succeeded. The result is a series of patches, with which the > > compilation seems to succeed. I couldn't make the tests really start > > to run. > > I'm not quite sure which approach is better. Just doing an 'svn merge' > and a fake upstream tarball is less work for us, but Damyan's way makes > it clearer what code we're distributing. > > Maybe go ahead with separate patches for now? At least as long as that > scales. We could still switch to a fake upstream merged tarball later > if it feels necessary. I'm also fine with this approach if someone wants to pick the commits. > Hm, mental note: we should definitely credit Jan Kaluza in our changelog > as the one who ported the upstream code to Apache 2.4. Ack. > > Perhaps a less naive approach would be to really merge the http24 > > upstream branch, for example by importing every revision as a quilt > > patch (28 in total, if my git-svn copy is right). > > It's even more work but yes, I think I'd prefer having all the httpd24 > commits in rather than just the 'obligatory ones'. > > I just pushed a ntyni/httpd24 branch to the git repo. I think it should > be rebased onto whichever solution we choose for the upstream merge. Same for my gregoa/httpd24 branch (which I pushed earlier today, before seeing this mail). Dam, in case you have the commits ready, you could take debian/ from my branch (which should incorporate Niko's work) and go on from there. 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 `- NP: Die Schmetterlinge: Der große Stahlarbeiterstreik
signature.asc
Description: Digital signature
