Unmerged changes from Debian

[Debian Bug Importer]

The cupsys package has been updated in Debian, and those changes
        need to be merged into Ubuntu. An automatic merge was
        attempted, but was not able to process all of the changes.

        The output from the automatic attempt can be found here:

        http://people.ubuntu.com/~scott/merge/review/cupsys

        Some documentation about the output can be found here:

        http://people.ubuntu.com/~scott/merge/README

[Martin Pitt (pitti)]

Done:
 cupsys (1.1.20final+rc1-10ubuntu1) hoary; urgency=low
 .
   * Resynchronized to Debian
   * Now keep all Ubuntu specific modification as patches prefixed with
     "ubuntu-" to ease further merges:
     - ubuntu-auxgroups: allow cupsd to run in auxilliary groups
     - ubuntu-init.d: pretty initscript, make /usr/share/cups/model
       lpadmin-writeable to install custom printer drivers
     - ubuntu-localports: listen on localhost port only by default
     - ubuntu-logrotate: use 'restart', not 'reload' to restart cupsd after log
       rotation (reload does not exist any more)
     - ubuntu-nowebadmin: display a red warning on the web interface that
       administrative functions are disabled for security reasons
     - ubuntu-runasuser: do not run as 'root', but as 'cupsys' by default
   * Ubuntu-specific debian/rules (can't be patched):
     - configure with --with-cups-user=cupsys
     - apply patch debian/patches/ja-nowebadmin.ptch (must be done after
       uudecoding ja.tar.gz.uu)