manually merge some changes in debian/ from trunk to branches/2.5 -- it seems they...