-
Committer:
Package Import Robot
-
Author(s):
Iain Lane, Iain Lane, Steve Langasek
-
Date:
2012-05-01 15:42:57 UTC
-
mfrom:
(6.3.24 sid)
-
Revision ID:
package-import@ubuntu.com-20120501154257-h0pr1yf6xxjym52g
Tags: 4.99-2ubuntu1
[ Iain Lane ]
* Merge with Debian unstable, remaining changes:
- Upstart support:
o Add debian/bluez.bluetooth.upstart and drop
debian/bluez.bluetooth.default.
o debian/rules: Drop -DEB_UPDATE_RCD_PARAMS
o Disable 07-fix-639356.patch and don't install 97-bluetooth.rules (in
debian/bluez.install) and debian/bluez-udev (in debian/rules), we
don't want to use the udev rules to start bluez. The upstart job does
that already.
- debian/bluez-alsa.install: Install ALSA bluetooth configuration into the
right place for ALSA 1.0.25.
- Add debian/source_bluez.py Apport package hook. Install in
debian/bluez.install.
- debian/control: Build against libnl3-dev, not libnl-dev.
- debian/patches/socket_audio.patch: re-enable the socket API for the
bluetooth audio manager. This reverts an upstream change that switches to
the MediaEndpoint DBus API by default, but it looks like PulseAudio isn't
quite ready to use that yet.
- Add sbc_mmx.patch: Fix building with gcc 4.7.
- debian/patches/10-unregister_interface_on_exit.patch: unregister the SAP
interface on exit.
- debian/patches/11-explicitly_close.patch: make sure the io channel for
HFP is properly closed on exit.
- debian/patches/enable_audio_profiles.patch: properly enable the Source
profile, its state is checked twice, once in audio/a2dp.c again which was
not taken into account in the previous upload.
- Drop debian/bluez.preinst and debian/bluez-alsa.preinst: Obsolete
conffile migrations, 10.04 LTS has a much newer version.
- Transition the BLUETOOTH_ENABLED variable to an Upstart override
variable if it's been changed.
* debian/control: Continue depending on module-init-tools instead of kmod
(reverts Debian change), as we do not have the latter yet.
* debian/patches/python3.diff: Some additional changes
[ Steve Langasek ]
* Switch to python3.