upstream fixes.

Signed-off-by: Peter Soetens <peter@thesourceworks.com>
Version 2.6.0-4

Signed-off-by: Peter Soetens <peter@thesourceworks.com>
Change version number writing to avoid build farm trouble.

Signed-off-by: Peter Soetens <peter@thesourceworks.com>