Branches for Saucy

Author: Paolo Sammicheli
Revision Date: 2012-02-08 18:32:43 UTC

* Merge from Debian testing (LP: #929012). Remaining changes:
  - Kept the changed description in debian/control to be less confusing.
  - Added call to fclose to close file pointer
  - Test-rebuild FTFBS: type clash of float_t which is defined
  by system. In acm, "float_t" is locally defined as float, I chose
  to rename the type to "float_type"; upstream authors might possibly
  want make use of system definition. Files affected:
  src/interpolate.*, src/inventory.c
  - Add .desktop file from Phil Bull
  - Include converted icon suggested by Phill Bul as XPM