On Sun, Sep 11, 2011 at 07:54:14PM +0100, Adam D. Barratt wrote: > On Sat, 2011-09-10 at 12:45 +0000, Niels Thykier wrote: > > The following commit has been merged in the squeeze branch: > > commit 9bcbd856565b71a926187e1357661ffe0a552967 > > Author: Niels Thykier <[email protected]> > > Date: Wed Aug 17 15:30:33 2011 +0200 > [...] > > Conflicts: > > > > checks/conffiles > > debian/changelog > > Anything to worry about? > > Regards, > > Adam >
I cherry-picked the 2.5.3 commit where checks/etcfiles has been merged into checks/conffiles and possibly using a new part of the Lintian::Collect API as I recall. It should be all good unless I screwed up the actual merge, but as far as I can tell the actual changes to file are a single line (and correct). ~Niels -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
