Remove some debian stuff.
Merge branch 'stable' into debian
Readd debian stuff in debian branch.