Branches for Gutsy

Author: Daniel T Chen
Revision Date: 2007-05-31 02:49:05 UTC

* Fix mismerge by reverting to Debian packaging with these noted
  exceptions, making xubuntu-desktop installable again:
  - debian/{control,rules}: Don't build xfce4-mixer-oss, since
    everything is ALSA-enabled in this source package (see
    1:4.3.90.1svn+r21167-0ubuntu1),
  - Amend debian/NEWS.Debian to note the above difference,
  - Use Ubuntu's debian/patches/
    0{1_volume_hotkeys,2_xfce4-mixer-panel-plugin_border}.patch,
  - Readd epoch and DebianMaintainerField changes.