Branches for Vivid

Author: Steve Langasek
Revision Date: 2010-06-06 07:07:05 UTC

* Merge from Debian unstable, remaining changes:
* xpp.cxx: Fixed problem of options sometimes being dropped (Thanks to
  Klaus Singvogel from SUSE for the patch).
* cupshelper.cxx: xpp showed "Destination not available" for all printers
  instead of the printer properties. Fixed.
* Dropped changes, included in Debian:
  - debian/control: build-depend on cups instead of cupsys.
  - debian/patches/ashes_to_ashes,_const_to_const.patch: fixed differently
    in Debian.