[php-maint] packaging PHP 5.6.1

[Ondřej Surý]

Hi Thijs,

On Tue, Oct 14, 2014, at 07:49, Thijs Kinkhorst wrote:
> Hi all,
> 
> PHP 5.6.1 has been released and it would be nice if we could have that in
> the archive before the close of jessie (5 nov). I've tried to import it
> with git-import-orig but end up with conflicts in two ext/date/ files. Is
> this normal and/or am I doing something wrong?

the repo somehow got broken and this happens from time to time.

The solution is to merge previous tag and then the new one. (Then rebase
and those extra merges will be skipped.)

I think I have asked at more places and nobody know why this should
happen.

Anyway feel free to do the upload. I just returned from US west coast to
EU and haven't slept, so I will be mostly useless till tomorrow.

Cheers,
-- 
Ondřej Surý <ondrej at sury.org>
Knot DNS (https://www.knot-dns.cz/) – a high-performance DNS server