On Sun, Apr 24, 2016 at 06:25:03PM +0100, Dominic Hargreaves wrote: > I've applied these in branch dom/jessie-imports-from-5.20.3 on top of > the jessie branch (which now has the fix for #821848 applied). I used > two separate merge commits (one for the functional stuff and one for the > docs).
Looks good. I like the separate merges. Grouping together fixes/5.20.3/preserve_record_separator.diff fixes/5.20.3/test_count_base_rs.diff more explicitly might be nice but that's just picking nits. I note that there are no Bug headers, just Bug-Debian. While many of the commit subjects have an rt.perl.org ticket number on them, not all of them do. Unfortunately I suspect that adding Bug headers would duplicate the ticket number in the perl -V patch list for the ones that have them already in Subject. I'm not sure if there is a right thing to do here. Maybe add Bug headers just to the easy cases? I spotted these ones: fixes/utf8_regexp_crash.diff fixes/5.20.3/remove_get_magic.diff > We still need to decide the best way of documenting these changes. > I suppose a local perldelta.pod style file in /usr/share/doc/perl, > referenced from the changelog? Normally we don't try and reproduce the > perldelta changes when we cherry-pick individual commits from maint > releases, but normally users can get all the context they need from > the referenced Debian changelog if they are interested. That's a good idea. /usr/share/doc/perl/perldebdelta.pod ? > I've included the full list of included commits as an attachment. > A review of that branch would be good, as it's a somewhat necessarily > manual and error-prone process. Couldn't spot any obvious errors. Great work, thanks! -- Niko