← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/bluez/oneiric

« back to all changes in this revision

Viewing changes to debian/patches/04-Fix-bluetooth-hid2hci.rules.patch

  • Committer: Bazaar Package Importer
  • Author(s): Mathieu Trudel-Lapierre
  • Date: 2011-07-28 16:47:35 UTC
  • mfrom: (1.1.34 upstream) (6.3.15 sid)
  • Revision ID: james.westby@ubuntu.com-20110728164735-f34luwrarv52mhlq
Tags: 4.95-0ubuntu1
* New upstream release.
* Resynchronize with Debian unstable, remaining changes:
  - debian/source_bluez.py, debian/bluez.install:
    + apport hook made by Baptiste Mille-Mathias.
  - debian/rules: don't use simple-patchsys.
  - debian/source/format: use source format 3.0.
  - debian/patches/pkg-config-install-paths.patch: install bluez-alsa plugin
    to the multiarch path, now that alsa-lib has transitioned.
* debian/patches/02_disable_hal.patch: refreshed.
* debian/patches/pkg-config-install-paths.patch: refreshed.
* debian/control, debian/rules: run autoreconf when building as required by
  pkg-config-install-paths.patch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/04-Fix-bluetooth-hid2hci.rules.patch
 
1
From f274ce220b4adbc0af792140901b0a327404a13b Mon Sep 17 00:00:00 2001
 
2
From: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
 
3
Date: Thu, 9 Jun 2011 12:57:30 +0900
 
4
Subject: [PATCH 2/2] Fix bluetooth-hid2hci.rules
 
5
 
 
6
Apply from http://permalink.gmane.org/gmane.linux.bluez.kernel/13457.
 
7
---
 
8
 scripts/bluetooth-hid2hci.rules |    4 +---
 
9
 1 files changed, 1 insertions(+), 3 deletions(-)
 
10
 
 
11
diff --git a/scripts/bluetooth-hid2hci.rules b/scripts/bluetooth-hid2hci.rules
 
12
index 3b36629..0687c8a 100644
 
13
--- a/scripts/bluetooth-hid2hci.rules
 
14
+++ b/scripts/bluetooth-hid2hci.rules
 
15
@@ -11,9 +11,7 @@ ATTR{bInterfaceClass}=="03", ATTR{bInterfaceSubClass}=="01", ATTR{bInterfaceProt
 
16
   RUN+="hid2hci --method=dell --devpath=%p", ENV{HID2HCI_SWITCH}="1"
 
17
 
 
18
 # Logitech devices
 
19
-KERNEL=="hiddev*", ATTRS{idVendor}=="046d", ATTRS{idProduct}=="c70[35e]", \
 
20
-  RUN+="hid2hci --method=logitech-hid --devpath=%p"
 
21
-KERNEL=="hidraw*", ATTRS{idVendor}=="046d", ATTRS{idProduct}=="c70[4abc]|c71[34bc]", \
 
22
+KERNEL=="hiddev*", ATTRS{idVendor}=="046d", ATTRS{idProduct}=="c70[345abce]|c71[34bc]", \
 
23
   RUN+="hid2hci --method=logitech-hid --devpath=%p"
 
24
 
 
25
 ENV{DEVTYPE}!="usb_device", GOTO="hid2hci_end"
 
26
-- 
 
27
1.7.5.3
 
28