Also look for conf in /etc/default, Ubuntu patch
Prevent a FTBFS on kfreebsd, Ubuntu patch
gcdmaster segfault fix, Ubuntu patch
CD_TEXT hldtst fix
Fix desktop file
fix spelling and hyphen used as minus
Scsilib patches from Ubuntu, Changelog update