ubuntu packaging: fixed partial debian merge and updated for 1.17 maintenance changes
Authored by: Jean-Francois Dockes 2012-05-15
Parent(s): [f0980f]
Child(ren): [e5beb9]