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