~ubuntu-branches/ubuntu/intrepid/alsa-utils/intrepid-proposed

Viewing all changes in revision 15.

  • Committer: Bazaar Package Importer
  • Author(s): Daniel T Chen
  • Date: 2006-07-05 17:28:22 UTC
  • mfrom: (1.2.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20060705172822-i8qc1x6zyu8upokb
Tags: 1.0.11-4ubuntu1
* Merge from debian unstable:
  - debian/asoundconf: Drop Ubuntu delta (whitespace-only).
  - debian/control: Retain delta (see 1.0.10-1ubuntu5 for rationale).
  - debian/dirs:
    + Retain delta (keep sbin but drop lib/udev; see below for
      debian/udev.script).
    + Remove usr/share/lintian/overrides (see 1.0.11-1 for
      rationale).
  - debian/init:
    + Retain /sbin/alsactl delta.
    + Drop shell quoting delta [both $() and `` being valid POSIX].
    + Retain delta for earlier exit with $TARGET_CARD.
  - debian/modprobe-post-install-part: Drop (see 1.0.10-1ubuntu5 for
    rationale).
  - debian/{postinst,rules}:
    + Retain deltas (/etc/udev/rules.d/85-alsa.rules).
    + Don't install lintian override.
  - debian/udev.script: Drop (instead hack debian/{init,udev.rules}).

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: