[Pkg-bluetooth-maintainers] Bug#453066: Ubuntu changes for bluez-utils

Steve Kowalik stevenk at debian.org
Tue Nov 27 03:12:55 UTC 2007


Package: bluez-utils
Version: 3.22-1
Severity: normal
Tags: patch

Hi,

	I just merged the Ubuntu changes into the latest Debian bluez-utils
package, and have attached a debdiff detailing the changes.

-- System Information:
Debian Release: lenny/sid
  APT prefers gutsy-updates
  APT policy: (500, 'gutsy-updates'), (500, 'gutsy-security'), (500, 'gutsy')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.22-14-generic (SMP w/1 CPU core)
Locale: LANG=en_AU.UTF-8, LC_CTYPE=en_AU.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages bluez-utils depends on:
ii  dbus                1.1.1-3ubuntu4       simple interprocess messaging syst
ii  libasound2          1.0.14-1ubuntu8      ALSA library
ii  libbluetooth2       3.19-0ubuntu1        Library to use the BlueZ Linux Blu
ii  libc6               2.6.1-1ubuntu10      GNU C Library: Shared libraries
ii  libdbus-1-3         1.1.1-3ubuntu4       simple interprocess messaging syst
ii  libglib2.0-0        2.14.1-1ubuntu1      The GLib library of C routines
ii  libgstreamer-plugin 0.10.14-1ubuntu3     GStreamer libraries from the "base
ii  libgstreamer0.10-0  0.10.14-1ubuntu3     Core GStreamer libraries and eleme
ii  libusb-0.1-4        2:0.1.12-7           userspace USB programming library
ii  libxml2             2.6.30.dfsg-2ubuntu1 GNOME XML library
ii  lsb-base            3.1-23.1ubuntu3      Linux Standard Base 3.1 init scrip
ii  makedev             2.3.1-83ubuntu3      creates device files in /dev
ii  module-init-tools   3.3-pre4-2ubuntu4    tools for managing Linux kernel mo
ii  udev                113-0ubuntu16        rule-based device node and kernel 

Versions of packages bluez-utils recommends:
ii  bluez-gnome                0.14-0ubuntu2 Bluetooth utilities for GNOME

-- no debconf information
-------------- next part --------------
diff -u bluez-utils-3.22/debian/control bluez-utils-3.22/debian/control
--- bluez-utils-3.22/debian/control
+++ bluez-utils-3.22/debian/control
@@ -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.13), autotools-dev, cdbs, libdbus-1-dev, libdbus-glib-1-dev (> 0.60), libusb-dev, libglib2.0-dev
+Build-Depends: bison, flex, debhelper (>= 5), libbluetooth-dev (>= 3.22), 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, libasound2-dev
 Vcs-Svn: svn://svn.debian.org/svn/pkg-bluetooth/packages/bluez-libs
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez-libs
 Homepage: http://bluez.sourceforge.net
diff -u bluez-utils-3.22/debian/rules bluez-utils-3.22/debian/rules
--- bluez-utils-3.22/debian/rules
+++ bluez-utils-3.22/debian/rules
@@ -10,7 +10,7 @@
 DEB_DH_INSTALLINIT_ARGS = "--name=bluetooth"
 #DH_ALWAYS_EXCLUDE = "README"
 # FIXME test --enable-alsa
-DEB_CONFIGURE_EXTRA_FLAGS := --disable-initscripts --enable-obex --enable-cups --enable-hid2hci --disable-sdpd --enable-glib --enable-pcmciarules 
+DEB_CONFIGURE_EXTRA_FLAGS := --disable-initscripts --enable-obex --enable-cups --enable-hid2hci --disable-sdpd --enable-glib --enable-pcmciarules -enable-network --enable-serial --enable-input --enable-audio --enable-alsa
 #DEB_CONFIGURE_EXTRA_FLAGS := --disable-initscripts --enable-obex --enable-cups --enable-hid2hci --enable-input --enable-network --enable-serial
 DEB_DESTDIR := $(CURDIR)/debian/tmp
 
@@ -23,6 +23,7 @@
 		$(DEB_DESTDIR)/usr/share/man/man8/l2ping.8
 
 	install -D -m 0644 $(CURDIR)/debian/passkey-agent-makefile $(CURDIR)/debian/bluez-utils/usr/share/doc/bluez-utils/examples/Makefile
+	dh_gstscancodecs
 
 install/bluez-pcmcia-support::
 	cp -f $(CURDIR)/scripts/bluetooth.rules $(CURDIR)/debian/bluez-pcmcia-support.udev
diff -u bluez-utils-3.22/debian/patches/002_hcid_conf_defaults.patch bluez-utils-3.22/debian/patches/002_hcid_conf_defaults.patch
--- bluez-utils-3.22/debian/patches/002_hcid_conf_defaults.patch
+++ bluez-utils-3.22/debian/patches/002_hcid_conf_defaults.patch
@@ -20,0 +21,8 @@
+@@ -41,6 +41,7 @@
+ 
+ 	# Inquiry and Page scan
+ 	iscan enable; pscan enable;
++	discovto 0;
+ 
+ 	# Default link mode
+ 	#   none   - no specific policy
diff -u bluez-utils-3.22/debian/bluez-utils.install bluez-utils-3.22/debian/bluez-utils.install
--- bluez-utils-3.22/debian/bluez-utils.install
+++ bluez-utils-3.22/debian/bluez-utils.install
@@ -5,4 +5,7 @@
+debian/tmp/usr/lib/alsa-lib/*
+debian/tmp/usr/lib/bluetooth/*
 debian/tmp/usr/sbin/*
 debian/tmp/usr/share/man/man1/*
 debian/tmp/usr/share/man/man5/*
 debian/tmp/usr/share/man/man8/*
+debian/tmp/usr/lib/gstreamer-0.10/*.so
only in patch2:
unchanged:
--- bluez-utils-3.22.orig/debian/patches/011_audio.service_enable.patch
+++ bluez-utils-3.22/debian/patches/011_audio.service_enable.patch
@@ -0,0 +1,9 @@
+diff -Nur bluez-utils-3.22/audio/audio.service bluez-utils-3.22.new/audio/audio.service
+--- bluez-utils-3.22/audio/audio.service	2007-10-25 09:20:37.000000000 +1000
++++ bluez-utils-3.22.new/audio/audio.service	2007-11-26 16:11:52.000000000 +1100
+@@ -2,4 +2,4 @@
+ Identifier=audio
+ Name=Audio service
+ Description=Bluetooth Audio service
+-Autostart=false
++Autostart=true


More information about the Pkg-bluetooth-maintainers mailing list