[Pkg-bluetooth-commits] r1315 - in /packages/bluez/trunk/debian: bluez-obexd.install bluez.links bluez.links.in rules

[iwamatsu at users.alioth.debian.org]

Author: iwamatsu
Date: Tue May 21 04:22:28 2013
New Revision: 1315

URL: http://svn.debian.org/wsvn/pkg-bluetooth/?sc=1&rev=1315
Log:
Fix install path of bluetoothd

Added:
    packages/bluez/trunk/debian/bluez.links.in
      - copied, changed from r1305, packages/bluez/trunk/debian/bluez.links
Removed:
    packages/bluez/trunk/debian/bluez.links
Modified:
    packages/bluez/trunk/debian/bluez-obexd.install
    packages/bluez/trunk/debian/rules

Modified: packages/bluez/trunk/debian/bluez-obexd.install
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez/trunk/debian/bluez-obexd.install?rev=1315&op=diff
==============================================================================
--- packages/bluez/trunk/debian/bluez-obexd.install (original)
+++ packages/bluez/trunk/debian/bluez-obexd.install Tue May 21 04:22:28 2013
@@ -1,3 +1,3 @@
-usr/lib/*/bluetooth/obexd usr/lib/bluetooth
+usr/lib/*/bluetooth/obexd
 usr/share/dbus-1/services/org.bluez.obex.service
 usr/lib/systemd/user/obex.service

Copied: packages/bluez/trunk/debian/bluez.links.in (from r1305, packages/bluez/trunk/debian/bluez.links)
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez/trunk/debian/bluez.links.in?rev=1315&op=diff
==============================================================================
--- packages/bluez/trunk/debian/bluez.links (original)
+++ packages/bluez/trunk/debian/bluez.links.in Tue May 21 04:22:28 2013
@@ -1,1 +1,1 @@
-usr/lib/bluetooth/bluetoothd usr/sbin/bluetoothd
+usr/lib/@DEB_HOST_MULTIARCH@/bluetooth/bluetoothd usr/sbin/bluetoothd

Modified: packages/bluez/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez/trunk/debian/rules?rev=1315&op=diff
==============================================================================
--- packages/bluez/trunk/debian/rules (original)
+++ packages/bluez/trunk/debian/rules Tue May 21 04:22:28 2013
@@ -24,6 +24,8 @@
 
 override_dh_auto_configure:
 	dh_auto_configure -- $(CONFIGURE_FLAGS)
+	sed 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' \
+		debian/bluez.links.in > debian/bluez.links
 
 override_dh_installinit:
 	dh_installinit --name=bluetooth -- start 25 2 3 4 5 . stop 74 0 1 6 .