Move the desktop file out of debian, as we use it when installing too
Actually readd the desktop file
Merge branch 'sb-trunk-oldxul' of github.com:nightingale-media-player/nightingale-hacking into sb-trunk-oldxul