[Pkg-bluetooth-commits] r1109 - in /packages/bluez/trunk/debian: bluez-alsa.install bluez-compat.install bluez-cups.install bluez-gstreamer.install bluez-pcmcia-support.install bluez.install changelog control libbluetooth-dev.install libbluetooth3.install rules
iwamatsu at users.alioth.debian.org
iwamatsu at users.alioth.debian.org
Sat Aug 20 10:43:49 UTC 2011
Author: iwamatsu
Date: Sat Aug 20 10:43:49 2011
New Revision: 1109
URL: http://svn.debian.org/wsvn/pkg-bluetooth/?sc=1&rev=1109
Log:
Decruft rules file and strip debian/tmp/ from .install files
Modified:
packages/bluez/trunk/debian/bluez-alsa.install
packages/bluez/trunk/debian/bluez-compat.install
packages/bluez/trunk/debian/bluez-cups.install
packages/bluez/trunk/debian/bluez-gstreamer.install
packages/bluez/trunk/debian/bluez-pcmcia-support.install
packages/bluez/trunk/debian/bluez.install
packages/bluez/trunk/debian/changelog
packages/bluez/trunk/debian/control
packages/bluez/trunk/debian/libbluetooth-dev.install
packages/bluez/trunk/debian/libbluetooth3.install
packages/bluez/trunk/debian/rules
Modified: packages/bluez/trunk/debian/bluez-alsa.install
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez/trunk/debian/bluez-alsa.install?rev=1109&op=diff
==============================================================================
--- packages/bluez/trunk/debian/bluez-alsa.install (original)
+++ packages/bluez/trunk/debian/bluez-alsa.install Sat Aug 20 10:43:49 2011
@@ -1,1 +1,2 @@
-debian/tmp/usr/lib/*/alsa-lib/*.so
+usr/lib/*/alsa-lib/*.so
+usr/share/alsa/bluetooth.conf
Modified: packages/bluez/trunk/debian/bluez-compat.install
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez/trunk/debian/bluez-compat.install?rev=1109&op=diff
==============================================================================
--- packages/bluez/trunk/debian/bluez-compat.install (original)
+++ packages/bluez/trunk/debian/bluez-compat.install Sat Aug 20 10:43:49 2011
@@ -1,0 +1,6 @@
+usr/bin/pand
+usr/share/man/man1/pand.1
+usr/bin/dund
+usr/share/man/man1/dund.1
+usr/bin/hidd
+usr/share/man/man1/hidd.1
Modified: packages/bluez/trunk/debian/bluez-cups.install
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez/trunk/debian/bluez-cups.install?rev=1109&op=diff
==============================================================================
--- packages/bluez/trunk/debian/bluez-cups.install (original)
+++ packages/bluez/trunk/debian/bluez-cups.install Sat Aug 20 10:43:49 2011
@@ -1,1 +1,1 @@
-debian/tmp/usr/lib/cups/backend/*
+usr/lib/*/cups/backend/bluetooth
Modified: packages/bluez/trunk/debian/bluez-gstreamer.install
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez/trunk/debian/bluez-gstreamer.install?rev=1109&op=diff
==============================================================================
--- packages/bluez/trunk/debian/bluez-gstreamer.install (original)
+++ packages/bluez/trunk/debian/bluez-gstreamer.install Sat Aug 20 10:43:49 2011
@@ -1,2 +1,1 @@
-debian/tmp/usr/lib/gstreamer-*/*.so
-
+usr/lib/*/gstreamer-*/*.so
Modified: packages/bluez/trunk/debian/bluez-pcmcia-support.install
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez/trunk/debian/bluez-pcmcia-support.install?rev=1109&op=diff
==============================================================================
--- packages/bluez/trunk/debian/bluez-pcmcia-support.install (original)
+++ packages/bluez/trunk/debian/bluez-pcmcia-support.install Sat Aug 20 10:43:49 2011
@@ -1,1 +1,2 @@
-scripts/bluetooth_serial /lib/udev
+lib/udev/bluetooth_serial
+lib/udev/rules.d/97-bluetooth-serial.rules
Modified: packages/bluez/trunk/debian/bluez.install
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez/trunk/debian/bluez.install?rev=1109&op=diff
==============================================================================
--- packages/bluez/trunk/debian/bluez.install (original)
+++ packages/bluez/trunk/debian/bluez.install Sat Aug 20 10:43:49 2011
@@ -1,7 +1,32 @@
-debian/tmp/etc/bluetooth/main.conf
-debian/tmp/etc/bluetooth/rfcomm.conf
-debian/tmp/etc/dbus*/*
-debian/tmp/usr/sbin/*
-debian/tmp/usr/bin/*
-debian/tmp/usr/share/man/man*
-debian/tmp/lib/udev/hid2hci /lib/udev
+etc/bluetooth/main.conf
+etc/bluetooth/rfcomm.conf
+input/input.conf etc/bluetooth
+audio/audio.conf etc/bluetooth
+network/network.conf etc/bluetooth
+serial/serial.conf etc/bluetooth
+etc/dbus-1
+usr/sbin
+usr/bin/rctest
+usr/bin/hcitool
+usr/bin/sdptool
+usr/bin/dfutool
+usr/bin/ciptool
+usr/bin/l2ping
+usr/bin/l2test
+usr/bin/rfcomm
+lib/udev/hid2hci
+lib/udev/rules.d/97-bluetooth-hid2hci.rules
+lib/udev/rules.d/97-bluetooth.rules
+usr/share/man/man1/sdptool.1
+usr/share/man/man1/hcitool.1
+usr/share/man/man1/dfutool.1
+usr/share/man/man1/ciptool.1
+usr/share/man/man1/hciemu.1
+usr/share/man/man1/rfcomm.1
+usr/share/man/man1/rctest.1
+usr/share/man/man8/bluetoothd.8
+usr/share/man/man8/hid2hci.8
+usr/share/man/man8/hciattach.8
+usr/share/man/man8/l2ping.8
+usr/share/man/man8/hciconfig.8
+usr/share/man/man8/bccmd.8
Modified: packages/bluez/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez/trunk/debian/changelog?rev=1109&op=diff
==============================================================================
--- packages/bluez/trunk/debian/changelog (original)
+++ packages/bluez/trunk/debian/changelog Sat Aug 20 10:43:49 2011
@@ -7,9 +7,11 @@
* Drop patchsys-quilt.mk snippet: superfluous with source
format 3.0 "(quilt)".
* Refresh patch.
+ * Switch to multiarch.
* Update debian/rules.
- Remove obsolete configure flags.
- Add new plugins (proximity, sap, wiimote, thermometer, dbusoob).
+ - Strip and move to .install files.
-- Nobuhiro Iwamatsu <iwamatsu at debian.org> Thu, 04 Aug 2011 11:46:35 +0900
Modified: packages/bluez/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez/trunk/debian/control?rev=1109&op=diff
==============================================================================
--- packages/bluez/trunk/debian/control (original)
+++ packages/bluez/trunk/debian/control Sat Aug 20 10:43:49 2011
@@ -3,10 +3,9 @@
Priority: optional
Maintainer: Debian Bluetooth Maintainers <pkg-bluetooth-maintainers at lists.alioth.debian.org>
Uploaders: Nobuhiro Iwamatsu <iwamatsu at debian.org>
-Build-Depends: debhelper (>= 8),
+Build-Depends: debhelper (>= 8.1.3), cdbs (>= 0.4.93),
dh-autoreconf(>= 4),
autotools-dev,
- cdbs,
flex,
bison,
gstreamer-tools,
@@ -29,7 +28,9 @@
Section: libs
Conflicts: libsdp2 (<= 1.5-2)
Replaces: libsdp2 (<= 1.5-2)
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
+Multi-Arch: same
Architecture: linux-any
Description: Library to use the BlueZ Linux Bluetooth stack
BlueZ is the official Linux Bluetooth protocol stack. It is an Open Source
Modified: packages/bluez/trunk/debian/libbluetooth-dev.install
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez/trunk/debian/libbluetooth-dev.install?rev=1109&op=diff
==============================================================================
--- packages/bluez/trunk/debian/libbluetooth-dev.install (original)
+++ packages/bluez/trunk/debian/libbluetooth-dev.install Sat Aug 20 10:43:49 2011
@@ -1,4 +1,3 @@
-debian/tmp/usr/include/*
-debian/tmp/usr/lib/lib*.so
-debian/tmp/usr/lib/*.la
-debian/tmp/usr/lib/pkgconfig/*
+usr/include/bluetooth
+usr/lib/*/libbluetooth.so
+usr/lib/*/pkgconfig
Modified: packages/bluez/trunk/debian/libbluetooth3.install
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez/trunk/debian/libbluetooth3.install?rev=1109&op=diff
==============================================================================
--- packages/bluez/trunk/debian/libbluetooth3.install (original)
+++ packages/bluez/trunk/debian/libbluetooth3.install Sat Aug 20 10:43:49 2011
@@ -1,1 +1,2 @@
-debian/tmp/usr/lib/lib*.so.*
+usr/lib/*/libbluetooth.so.3
+usr/lib/*/libbluetooth.so.3.*
Modified: packages/bluez/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez/trunk/debian/rules?rev=1109&op=diff
==============================================================================
--- packages/bluez/trunk/debian/rules (original)
+++ packages/bluez/trunk/debian/rules Sat Aug 20 10:43:49 2011
@@ -11,7 +11,8 @@
#DEB_DH_AUTORECONF_ARGS = "-ivf"
DEB_UPDATE_RCD_PARAMS = "start 25 2 3 4 5 . stop 74 0 1 6 ."
DEB_DH_INSTALLINIT_ARGS = "--name=bluetooth"
-DEB_CONFIGURE_EXTRA_FLAGS := --enable-health \
+DEB_CONFIGURE_EXTRA_FLAGS := --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
+ --enable-health \
--enable-attrib \
--enable-gstreamer \
--enable-alsa \
@@ -38,39 +39,18 @@
--enable-wiimote \
--enable-thermometer \
--enable-dbusoob \
- --disable-hal
+ --disable-hal
DEB_DESTDIR := $(CURDIR)/debian/tmp
TEST_PROGRAM_LIST = simple-agent simple-service test-adapter test-audio test-device \
- test-discovery test-input test-manager test-network test-serial \
- test-service test-telephony
-
-#install/bluetooth::
- #install -D -m 0644 $(CURDIR)/debian/bluetooth.override \
- $(CURDIR)/debian/bluetooth/usr/share/lintian/overrides/bluetooth
+ test-discovery test-input test-manager test-network test-serial \
+ test-service test-telephony
install/bluez::
- # conf files
- install -D -m 0644 $(CURDIR)/input/input.conf \
- $(CURDIR)/debian/bluez/etc/bluetooth/input.conf
- install -D -m 0644 $(CURDIR)/audio/audio.conf \
- $(CURDIR)/debian/bluez/etc/bluetooth/audio.conf
- install -D -m 0644 $(CURDIR)/network/network.conf \
- $(CURDIR)/debian/bluez/etc/bluetooth/network.conf
- install -D -m 0644 $(CURDIR)/serial/serial.conf \
- $(CURDIR)/debian/bluez/etc/bluetooth/serial.conf
-
- # udev rules, actually upstream version is changed with
- # sed -i 's at RUN+="/usr/sbin/hid2hci at RUN+="/lib/udev/bluez@'
- # scripts/bluetooth-hid2hci.rules
- # and the diff is in debian/patches/010_udev_rules_agent.patch
- install -D -m 0644 $(CURDIR)/scripts/bluetooth-hid2hci.rules \
- $(CURDIR)/debian/bluez/lib/udev/rules.d/62-bluez-hid2hci.rules
install -D -m 0755 $(CURDIR)/debian/bluez_agent.udev \
$(CURDIR)/debian/bluez/lib/udev/bluez
- # misc
install -D -m 0755 $(CURDIR)/test/agent \
$(CURDIR)/debian/bluez/usr/bin/bluetooth-agent
for d in $(TEST_PROGRAM_LIST) ; do \
@@ -81,26 +61,6 @@
install -D -m 0644 $(CURDIR)/debian/README.examples \
$(CURDIR)/debian/bluez/usr/share/doc/bluez/examples/README
-#install/bluez-utils::
- #install -D -m 0644 $(CURDIR)/debian/bluez-utils.override \
- # $(CURDIR)/debian/bluez-utils/usr/share/lintian/overrides/bluez-utils
-
-install/bluez-alsa::
- install -D -m 0644 $(CURDIR)/audio/bluetooth.conf \
- $(CURDIR)/debian/bluez-alsa/usr/share/alsa/bluetooth.conf
-
-install/bluez-pcmcia-support::
- cp -f $(CURDIR)/scripts/bluetooth-serial.rules \
- $(CURDIR)/debian/bluez-pcmcia-support.udev
-
-binary-install/bluez-compat::
- for d in pand dund hidd; do \
- mv -v $(CURDIR)/debian/bluez/usr/bin/$$d \
- $(CURDIR)/debian/bluez-compat/usr/bin/;\
- mv -v $(CURDIR)/debian/bluez/usr/share/man/man1/$$d* \
- $(CURDIR)/debian/bluez-compat/usr/share/man/man1/;\
- done
-
binary-install/bluez-gstreamer::
LD_LIBRARY_PATH="$(CURDIR)/debian/tmp/usr/lib:$(LD_LIBRARY_PATH)" \
dh_gstscancodecs -pbluez-gstreamer
@@ -109,8 +69,5 @@
install -D -m 0644 $(CURDIR)/debian/bluetooth-dbus.conf \
$(CURDIR)/debian/bluez/etc/dbus-1/system.d/bluetooth.conf
-binary-install/bluez-pcmcia-support::
- chmod a+x $(CURDIR)/debian/bluez-pcmcia-support/lib/udev/bluetooth_serial
-
clean::
-rm -f $(CURDIR)/debian/bluez-pcmcia-support.udev
More information about the Pkg-bluetooth-commits
mailing list