On Fri, 2015-05-01 at 05:51 +0200, Guillem Jover wrote: > On Mon, 2015-04-27 at 01:11:33 +0100, Ben Hutchings wrote: > > On Thu, 2015-04-23 at 07:10 +0200, Guillem Jover wrote: > > > > I'd prefer if you merged and released the tarball, then I can do the > > rest. > > Sure, less work for me. > > > > > - Are you happy to pull from my git branch, or should I send one or > > > > multiple patches? > > > > > > Given that you've done the hunting and backporting I'd like your SOB > > > lines on all patches, alongside > > > [mail@domain:\n - Brief change description. ] markers for the patches > > > that required changes so proper credit is given in the commit message. > > > > OK, I've rebased and added that. > > > > All of the cherry-picks conflicted in debian/changelog, but I didn't > > bother to mention that. Aside from that they were mostly clean. > > > > I also dropped the 'release' commit so you'll need to finalise the > > changelog as you see fit. > > Perfect, thanks. Although I cannot fetch from the repo: > > ,--- > $ git pull http://git.decadent.org.uk/git/dpkg.git 1.15.x > error: Unable to find ee84e232070351e980b48e82788a353ba3857be3 under http://git.decadent.org.uk/git/dpkg.git > Cannot obtain needed tree ee84e232070351e980b48e82788a353ba3857be3 while processing commit 006ba044fbd398472e5045edef37bd21e6ba6724. > error: fetch failed. > `--- > > I guess, perhaps a «git update-server-info» was missing? Odd, I do have the post-update hook enabled to run that. Anyway, fixed now. Ben. -- Ben Hutchings It is easier to write an incorrect program than to understand a correct one.
Description: This is a digitally signed message part