[Pkg-bluetooth-commits] r1051 - in /packages/bluez/trunk/debian: bluez.install patches/03_fix_udevdir.patch

[iwamatsu at users.alioth.debian.org]

Author: iwamatsu
Date: Tue May 31 08:14:12 2011
New Revision: 1051

URL: http://svn.debian.org/wsvn/pkg-bluetooth/?sc=1&rev=1051
Log:
Add debian/patches/03_fix_udevdir.patch

Fix install path of udevdir.


Added:
    packages/bluez/trunk/debian/patches/03_fix_udevdir.patch
Modified:
    packages/bluez/trunk/debian/bluez.install

Modified: packages/bluez/trunk/debian/bluez.install
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez/trunk/debian/bluez.install?rev=1051&op=diff
==============================================================================
--- packages/bluez/trunk/debian/bluez.install (original)
+++ packages/bluez/trunk/debian/bluez.install Tue May 31 08:14:12 2011
@@ -4,3 +4,4 @@
 debian/tmp/usr/sbin/*
 debian/tmp/usr/bin/*
 debian/tmp/usr/share/man/man*
+debian/tmp/lib/udev/*

Added: packages/bluez/trunk/debian/patches/03_fix_udevdir.patch
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez/trunk/debian/patches/03_fix_udevdir.patch?rev=1051&op=file
==============================================================================
--- packages/bluez/trunk/debian/patches/03_fix_udevdir.patch (added)
+++ packages/bluez/trunk/debian/patches/03_fix_udevdir.patch Tue May 31 08:14:12 2011
@@ -1,0 +1,30 @@
+# If PCMCIA enabled, udevdir value override from /lib/udev to
+# $(libexecdir)/udev.
+# Forwarded: http://marc.info/?l=linux-bluetooth&m=130682805515756
+# Origin: Debian
+# Bug-Debian: None
+# Author: Nobuhiro Iwamatsu <iwamatsu at debian.org>
+
+diff --git a/Makefile.am b/Makefile.am
+index 175f8c9..5325d6d 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -355,8 +355,6 @@ EXTRA_DIST += scripts/bluetooth.rules \
+ 		scripts/bluetooth-hid2hci.rules scripts/bluetooth-serial.rules
+ 
+ if PCMCIA
+-udevdir = $(libexecdir)/udev
+-
+ dist_udev_SCRIPTS = scripts/bluetooth_serial
+ endif
+ 
+--- a/Makefile.in	2011-05-31 16:39:13.000000000 +0900
++++ b/Makefile.in	2011-05-31 16:39:28.000000000 +0900
+@@ -1169,7 +1169,6 @@
+ @BCCMD_TRUE@	tools/ubcsp.c $(am__append_44)
+ @BCCMD_TRUE at tools_bccmd_LDADD = lib/libbluetooth.la $(am__append_45)
+ @HID2HCI_TRUE at udevdir = @UDEV_DIR@
+- at PCMCIA_TRUE@udevdir = $(libexecdir)/udev
+ @HID2HCI_TRUE at tools_hid2hci_LDADD = @USB_LIBS@ @UDEV_LIBS@
+ @DFUTOOL_TRUE at tools_dfutool_SOURCES = tools/dfutool.c tools/dfu.h tools/dfu.c
+ @DFUTOOL_TRUE at tools_dfutool_LDADD = @USB_LIBS@