~ubuntu-branches/ubuntu/lucid/xfce4-mixer/lucid

Viewing all changes in revision 17.

  • Committer: Bazaar Package Importer
  • Author(s): Lionel Le Folgoc
  • Date: 2007-12-23 14:14:29 UTC
  • Revision ID: james.westby@ubuntu.com-20071223141429-2gsumr0x9jgtd3do
Tags: 1:4.4.2-2ubuntu1
* Merge with debian unstable:
  - 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
  - debian/xfce4-mixer-oss.shlibs: dropped, we don't build this variant.
* debian/patches: update 01_volume_hotkeys.patch and
  02_xfce4-mixer-panel-plugin_border.patch, so that 03_mixer-block-menu
  applies cleanly.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: