[acoustid-fingerprinter/f25] (2 commits) ...Fix build (patches from Debian)