On Sat, 2017-01-07 at 11:15 +0100, Sebastiaan Couwenberg wrote: > On 01/07/2017 10:39 AM, Adam D. Barratt wrote: > > On Sat, 2017-01-07 at 10:24 +0100, Sebastiaan Couwenberg wrote: > >> On 01/07/2017 09:55 AM, Sebastiaan Couwenberg wrote: > >>> On 01/07/2017 09:19 AM, Adam D. Barratt wrote: > >>>> On Fri, 2017-01-06 at 23:23 +0000, Adam D. Barratt wrote: > >>>>> Control: tags -1 + pending > >>>>> > >>>>> On Thu, 2017-01-05 at 21:27 +0100, Sebastiaan Couwenberg wrote: > >>>>>> On 01/05/2017 09:04 PM, Adam D. Barratt wrote: > >>>>>>> On Tue, 2016-12-06 at 22:00 +0100, Sebastiaan Couwenberg wrote: > >>>>>>>> Sorry for the outdated debdiff, for p-u the distribution has been > >>>>>>>> changed to stable. > >>>>>>> > >>>>>>> Please go ahead. > >>>>>> > >>>>>> Thanks! > >>>>> > >>>>> Flagged for acceptance. > >>>> > >>>> The upload subsequently FTBFS on all architectures on the buildds. > > [...] > >>> I simply built the package in an up-to-date jessie cowbuilder chroot. > >>> > >>> The buildds used a newer PHP from p-u, my build was with > >>> 5.6.24+dfsg-0+deb8u1 in jessie. > > > > Ah, yes. The point of the point release is to update stable to include > > the set of packages currently in p-u, so builds happen against jessie > > +p-u. (It's also the only way you can usefully e.g. rebuild package X > > against a new upload of package Y without having to wait for a point > > release in between, which would be silly.) > > > >>> I can reproduce the build failure with an i386 chroot on barriere, which > >>> also uses php 5.6.29+dfsg-0+deb8u1 from jessie-security. > > [...] > >>> > >>> https://github.com/mapserver/mapserver/commit/d5cc5840683bded229dbc2cc7d534db6d1e1f386#diff-f8894221d4e5ead75cf65d8aa506ae91 > >>> > >>> If that change to mapscript/php/error.c is acceptable for jessie, I'll > >>> include it in the package and prepare mapserver/6.4.1-5+deb8u2. > >> > >> I've confirmed that the above commit fixes the FTFBS in the jessie i386 > >> chroot on barriere (with php 5.6.29+dfsg-0+deb8u1), and also works in my > >> jessie amd64 chroot (with php 5.6.24+dfsg-0+deb8u1). > >> > >> Updated debdiff against the version in jessie is attached. > > > > It seems a bit of a hack, but under the circumstances I can't imagine it > > would break anything else. Please go ahead. > > Thanks! mapserver/6.4.1-5+deb8u2 has been uploaded too.
Flagged for acceptance. Regards, Adam