-
Committer:
Bazaar Package Importer
-
Author(s):
Martin Pitt
-
Date:
2011-10-19 12:40:37 UTC
-
mfrom:
(6.3.19 sid)
-
Revision ID:
james.westby@ubuntu.com-20111019124037-eth6x32dh21lgdxp
Tags: 4.96-3ubuntu1
* Merge with Debian testing. Remaining Ubuntu changes:
- Add debian/source_bluez.py apport hook and install it in
debian/bluez.install.
- debian/control: Build against libnl3-dev instead of libnl-dev.
- debian/control: Mark bluez as "Multi-Arch: foreign" and bluez-alsa as
"Multi-Arch: same" for multi-arch friendliness.
- Add 04-Fix-disabled-after-resume.patch: Fix reinitialization after
resuming. (LP #823467)
* debian/bluez-cups.install: Don't install cups backend into a multiarch
path, cups does not support that.