[Pkg-bluetooth-commits] r706 - in /packages/bluez-utils/trunk/debian: ./ patches/
filippo at users.alioth.debian.org
filippo at users.alioth.debian.org
Tue Apr 15 15:44:32 UTC 2008
Author: filippo
Date: Tue Apr 15 15:44:32 2008
New Revision: 706
URL: http://svn.debian.org/wsvn/pkg-bluetooth/?sc=1&rev=706
Log:
merge from unstable's version 3.30-2
Added:
packages/bluez-utils/trunk/debian/bluez-audio.preinst
packages/bluez-utils/trunk/debian/patches/006_a2dpsink_marginal.patch
Removed:
packages/bluez-utils/trunk/debian/patches/001_audio_service_autostart.patch
packages/bluez-utils/trunk/debian/patches/006_baudrates.patch
Modified:
packages/bluez-utils/trunk/debian/NEWS
packages/bluez-utils/trunk/debian/README.Debian
packages/bluez-utils/trunk/debian/bluez-audio.install
packages/bluez-utils/trunk/debian/bluez-utils.install
packages/bluez-utils/trunk/debian/bluez-utils.postinst
packages/bluez-utils/trunk/debian/bluez-utils.preinst
packages/bluez-utils/trunk/debian/changelog
packages/bluez-utils/trunk/debian/control
packages/bluez-utils/trunk/debian/rules
Modified: packages/bluez-utils/trunk/debian/NEWS
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez-utils/trunk/debian/NEWS?rev=706&op=diff
==============================================================================
--- packages/bluez-utils/trunk/debian/NEWS (original)
+++ packages/bluez-utils/trunk/debian/NEWS Tue Apr 15 15:44:32 2008
@@ -1,3 +1,12 @@
+bluez-utils (3.30-2) unstable; urgency=low
+
+ This upstream version switches the service infrastructure from external
+ processes to shared objects. Services (i.e. audio) are started automatically
+ and do not require a .service file in /etc/bluetooth/. audio.service will be
+ removed automatically by the upgrade unless modified.
+
+ -- Filippo Giunchedi <filippo at debian.org> Mon, 14 Apr 2008 17:34:21 +0200
+
bluez-utils (3.7-1) unstable; urgency=low
This version reverts the /etc/bluetooth/passkeys infrastructure as agents for
Modified: packages/bluez-utils/trunk/debian/README.Debian
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez-utils/trunk/debian/README.Debian?rev=706&op=diff
==============================================================================
--- packages/bluez-utils/trunk/debian/README.Debian (original)
+++ packages/bluez-utils/trunk/debian/README.Debian Tue Apr 15 15:44:32 2008
@@ -1,12 +1,7 @@
bluez-utils for Debian
----------------------
-In order to use BlueZ you need the BlueZ kernel modules installed.
-These are part of modern Linux kernels, 2.4.21 or better, and 2.6
-series kernels. Patches for earlier kernels are available from
-http://www.bluez.org.
-
-It also automatically creates the /dev/rfcomm* serial devices for using
+The /dev/rfcomm* serial devices entries are automatically created for using
RFCOMM with legacy applications -- see rfcomm(8). Users must be in group
'dialout' to have privileges to use these devices.
@@ -19,14 +14,14 @@
below for more details on their configuration.
The manual pages in this package are mostly very rudimentary. Further
-documentation for BlueZ can be found at http://www.bluez.org
+documentation for BlueZ can be found at http://www.bluez.org and at the BlueZ
+wiki http://wiki.bluez.org.
If you wish to install PCMCIA card services support for your Bluetooth
devices you should install the bluez-pcmcia-support package.
-Some USB dongles require firmware to make them work: install
-bluez-firmware (on a 2.6 kernel)
-The bluez-firmware package is available in Debian's "non-free" section.
+Some USB dongles require firmware to make them work: bluez-firmware from the
+"non-free" section provides the required firmware.
Additional Documentation
------------------------
@@ -55,8 +50,8 @@
Please note that this mode of operation is _not_ _supported_.
The format is (one per line): <remote_address><whitespace><pincode>
Don't mess with files in /var/lib/bluetooth/ unless you know what you are
-doing. I repeat: manually adding a pincode for a remote device is NOT
-SUPPORTED.
+doing.
+I repeat: manually adding a pincode for a remote device is NOT SUPPORTED.
Keyboard and mouse support
--------------------------
Modified: packages/bluez-utils/trunk/debian/bluez-audio.install
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez-utils/trunk/debian/bluez-audio.install?rev=706&op=diff
==============================================================================
--- packages/bluez-utils/trunk/debian/bluez-audio.install (original)
+++ packages/bluez-utils/trunk/debian/bluez-audio.install Tue Apr 15 15:44:32 2008
@@ -1,5 +1,3 @@
-debian/tmp/etc/bluetooth/audio.service
-debian/tmp/etc/bluetooth/audio.conf
debian/tmp/usr/lib/alsa-lib/libasound*.so
debian/tmp/usr/lib/gstreamer-0.10/libgstbluetooth.so
-debian/tmp/usr/lib/bluetooth/bluetoothd-service-audio
+debian/tmp/usr/lib/bluetooth/plugins/libaudio.so
Added: packages/bluez-utils/trunk/debian/bluez-audio.preinst
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez-utils/trunk/debian/bluez-audio.preinst?rev=706&op=file
==============================================================================
--- packages/bluez-utils/trunk/debian/bluez-audio.preinst (added)
+++ packages/bluez-utils/trunk/debian/bluez-audio.preinst Tue Apr 15 15:44:32 2008
@@ -1,0 +1,28 @@
+#!/bin/sh
+
+# snippet from http://wiki.debian.org/DpkgConffileHandling
+
+# Remove a no-longer used conffile
+rm_conffile() {
+ PKGNAME="$1"
+ CONFFILE="$2"
+ if [ -e "$CONFFILE" ]; then
+ md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`"
+ old_md5sum="`dpkg-query -W -f='${Conffiles}' $PKGNAME | sed -n -e \"\\\\' $CONFFILE '{s/ obsolete$//;s/.* //p}\"`"
+ if [ "$md5sum" != "$old_md5sum" ]; then
+ echo "Obsolete conffile $CONFFILE has been modified by you."
+ echo "Saving as $CONFFILE.dpkg-bak ..."
+ mv -f "$CONFFILE" "$CONFFILE".dpkg-bak
+ else
+ echo "Removing obsolete conffile $CONFFILE ..."
+ rm -f "$CONFFILE"
+ fi
+ fi
+}
+
+case "$1" in
+install|upgrade)
+ if dpkg --compare-versions "$2" le "3.24-1+b1"; then
+ rm_conffile bluez-audio "/etc/bluetooth/audio.service"
+ fi
+esac
Modified: packages/bluez-utils/trunk/debian/bluez-utils.install
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez-utils/trunk/debian/bluez-utils.install?rev=706&op=diff
==============================================================================
--- packages/bluez-utils/trunk/debian/bluez-utils.install (original)
+++ packages/bluez-utils/trunk/debian/bluez-utils.install Tue Apr 15 15:44:32 2008
@@ -6,9 +6,6 @@
debian/tmp/usr/share/man/man1/*
debian/tmp/usr/share/man/man5/*
debian/tmp/usr/share/man/man8/*
-debian/tmp/usr/lib/bluetooth/bluetoothd-service-input
-debian/tmp/etc/bluetooth/input.service
-debian/tmp/usr/lib/bluetooth/bluetoothd-service-network
-debian/tmp/etc/bluetooth/network.service
-debian/tmp/usr/lib/bluetooth/bluetoothd-service-serial
-debian/tmp/etc/bluetooth/serial.service
+debian/tmp/usr/lib/bluetooth/libinput.so
+debian/tmp/usr/lib/bluetooth/libnetwork.so
+debian/tmp/usr/lib/bluetooth/libserial.so
Modified: packages/bluez-utils/trunk/debian/bluez-utils.postinst
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez-utils/trunk/debian/bluez-utils.postinst?rev=706&op=diff
==============================================================================
--- packages/bluez-utils/trunk/debian/bluez-utils.postinst (original)
+++ packages/bluez-utils/trunk/debian/bluez-utils.postinst Tue Apr 15 15:44:32 2008
@@ -19,20 +19,23 @@
/usr/sbin/update-rc.d -f bluez-utils remove
# maybe a (medium/low debconf?) notice is best suited here
fi
-
mv_conffile "/etc/init.d/bluez-utils" "/etc/init.d/bluetooth"
mv_conffile "/etc/default/bluez-utils" "/etc/default/bluetooth"
- mv_conffile "/etc/dbus-1/system.d/bluez-hcid.conf" "/etc/dbus-1/system.d/bluetooth.conf"
+ mv_conffile "/etc/dbus-1/system.d/bluez-hcid.conf" "/etc/dbus-1/system.d/bluetooth.conf"
- # update modules.conf
- /sbin/update-modules >/dev/null 2>&1
+ # update modules.conf
+ /sbin/update-modules >/dev/null 2>&1
# use MAKEDEV instead of the original bluez script below as per policy 10.6
if [ -x /dev/MAKEDEV ]; then
echo "Creating device nodes ..."
cd /dev && ./MAKEDEV bluetooth
fi
-
+ # reload dbus config file
+ if [ -x /etc/init.d/dbus ]; then
+ invoke-rc.d dbus force-reload || true
+ fi
+
# if [ -r /etc/bluetooth/pin ]; then
# echo "Converting default outgoing PIN to default passkey:"
# cp -v /etc/bluetooth/pin /etc/bluetooth/passkeys/default
Modified: packages/bluez-utils/trunk/debian/bluez-utils.preinst
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez-utils/trunk/debian/bluez-utils.preinst?rev=706&op=diff
==============================================================================
--- packages/bluez-utils/trunk/debian/bluez-utils.preinst (original)
+++ packages/bluez-utils/trunk/debian/bluez-utils.preinst Tue Apr 15 15:44:32 2008
@@ -1,6 +1,6 @@
#!/bin/sh
-# snip from http://www.dpkg.org/ConffileHandling
+# snippet from http://www.dpkg.org/ConffileHandling
# Prepare to move a conffile without triggering a dpkg question
prep_mv_conffile() {
Modified: packages/bluez-utils/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez-utils/trunk/debian/changelog?rev=706&op=diff
==============================================================================
--- packages/bluez-utils/trunk/debian/changelog (original)
+++ packages/bluez-utils/trunk/debian/changelog Tue Apr 15 15:44:32 2008
@@ -1,4 +1,4 @@
-bluez-utils (3.30-0exp1) experimental; urgency=low
+bluez-utils (3.30-2exp1) experimental; urgency=low
[ Filippo Giunchedi ]
* New upstream release
@@ -6,12 +6,35 @@
* Enable services inside hcid, replacing old racy daemons and change init
script accordingly (Closes: #454727)
* Add watch file
- * Fix bashism in init script (Closes: #464495)
-
- [ Eddy Petrișor ]
- * Please add dbus to Required-Start (Closes: #475656)
-
- -- Filippo Giunchedi <filippo at debian.org> Sat, 15 Apr 2008 14:30:12 +0300
+
+ -- Filippo Giunchedi <filippo at debian.org> Tue, 15 Apr 2008 17:33:47 +0200
+
+bluez-utils (3.30-2) unstable; urgency=low
+
+ * Add dbus as dependency in the init script (Closes: #475656)
+ * Add a NEWS explaining the switch from services to shared objects
+ (Closes: #475076)
+ * Downgrade bluez-gnome from recommends to suggests together with
+ kdebluetooth (Closes: #448553, #458945)
+ * Remove old Conflicts/Replaces on bluez-sdp and bluez-pan
+
+ -- Filippo Giunchedi <filippo at debian.org> Mon, 14 Apr 2008 17:54:56 +0200
+
+bluez-utils (3.30-1) unstable; urgency=low
+
+ * New upstream release (Closes: #473403)
+ + Bump build-dep to libbluetooth-dev >= 3.30
+ + Services are now plugins, so drop 001_audio_service_autostart.patch
+ + Drop 006_baudrates.patch applied upstream
+ * Explicitly enable PAND/DUND/HIDD instead of plugins for now
+ * Fix bashism in init script (Closes: #464495)
+ * Add patch to register a2dpsink as marginal so it doesn't take over
+ * Reload dbus in postinst (Closes: #466013)
+ * Change homepage field to bluez.org (Closes: #444332)
+ * Rephrase README.Debian and remove references to 2.4 kernel
+ (Closes: #413393)
+
+ -- Filippo Giunchedi <filippo at debian.org> Sat, 05 Apr 2008 16:09:24 +0200
bluez-utils (3.24-1) unstable; urgency=low
Modified: packages/bluez-utils/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez-utils/trunk/debian/control?rev=706&op=diff
==============================================================================
--- packages/bluez-utils/trunk/debian/control (original)
+++ packages/bluez-utils/trunk/debian/control Tue Apr 15 15:44:32 2008
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Bluetooth Maintainers <pkg-bluetooth-maintainers at lists.alioth.debian.org>
Uploaders: Edd Dumbill <ejad at debian.org>, Filippo Giunchedi <filippo at debian.org>, Mario Iseli <mario at debian.org>
-Build-Depends: bison, flex, debhelper (>= 5), libbluetooth-dev (>= 3.24), autotools-dev, cdbs, libdbus-1-dev, libdbus-glib-1-dev (> 0.60), libusb-dev, libglib2.0-dev, libasound2-dev, libgstreamer0.10-dev, libgstreamer-plugins-base0.10-dev, gstreamer-tools (>= 0.10.14), libhal-dev, libexpat1-dev
+Build-Depends: bison, flex, debhelper (>= 5), libbluetooth-dev (>= 3.30), autotools-dev, cdbs, libdbus-1-dev, libdbus-glib-1-dev (> 0.60), libusb-dev, libglib2.0-dev, libgstreamer-plugins-base0.10-dev, libgstreamer0.10-dev, gstreamer-tools (>= 0.10.14), libasound2-dev, libhal-dev, libexpat1-dev
Vcs-Svn: svn://svn.debian.org/svn/pkg-bluetooth/packages/bluez-utils
Vcs-Browser: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez-utils
Homepage: http://www.bluez.org
@@ -12,10 +12,8 @@
Package: bluez-utils
Architecture: any
Depends: ${shlibs:Depends}, module-init-tools, makedev (<< 3.3.8.2-0) | udev, lsb-base (>= 3.0-3), dbus
-Recommends: bluez-gnome, bluez-audio
-Suggests: bluez-firmware
-Conflicts: bluez-sdp (<= 1.5-2), bluez-pan
-Replaces: bluez-sdp (<= 1.5-2), bluez-pan
+Recommends: bluez-audio
+Suggests: bluez-gnome | kdebluetooth, bluez-firmware
Description: Bluetooth tools and daemons
This package contains tools and system daemons for using Bluetooth devices.
.
Added: packages/bluez-utils/trunk/debian/patches/006_a2dpsink_marginal.patch
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez-utils/trunk/debian/patches/006_a2dpsink_marginal.patch?rev=706&op=file
==============================================================================
--- packages/bluez-utils/trunk/debian/patches/006_a2dpsink_marginal.patch (added)
+++ packages/bluez-utils/trunk/debian/patches/006_a2dpsink_marginal.patch Tue Apr 15 15:44:32 2008
@@ -1,0 +1,10 @@
+--- audio/gsta2dpsink.c.orig 2008-04-05 15:05:52.000000000 +0200
++++ audio/gsta2dpsink.c 2008-04-05 15:06:05.000000000 +0200
+@@ -696,6 +696,6 @@
+ gboolean gst_a2dp_sink_plugin_init (GstPlugin * plugin)
+ {
+ return gst_element_register (plugin, "a2dpsink",
+- GST_RANK_PRIMARY, GST_TYPE_A2DP_SINK);
++ GST_RANK_MARGINAL, GST_TYPE_A2DP_SINK);
+ }
+
Modified: packages/bluez-utils/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez-utils/trunk/debian/rules?rev=706&op=diff
==============================================================================
--- packages/bluez-utils/trunk/debian/rules (original)
+++ packages/bluez-utils/trunk/debian/rules Tue Apr 15 15:44:32 2008
@@ -32,6 +32,9 @@
install/bluetooth::
install -D -m 0644 $(CURDIR)/debian/bluetooth.override $(CURDIR)/debian/bluetooth/usr/share/lintian/overrides/bluetooth
+install/bluez-audio::
+ install -D -m 0644 $(CURDIR)/audio/audio.conf $(CURDIR)/debian/bluez-audio/etc/bluetooth/audio.conf
+
binary-install/bluez-audio::
dh_gstscancodecs -pbluez-audio
More information about the Pkg-bluetooth-commits
mailing list