Hello community,
here is the log from the commit of package yast2-bluetooth
checked in at Wed May 23 12:17:55 CEST 2007.
--------
--- yast2-bluetooth/yast2-bluetooth.changes 2007-03-01 15:12:58.000000000 +0100
+++ /mounts/work_src_done/NOARCH/yast2-bluetooth/yast2-bluetooth.changes 2007-05-23 10:58:22.822139000 +0200
@@ -1,0 +2,7 @@
+Wed May 23 10:26:31 CEST 2007 - lslezak@suse.cz
+
+- fix for bluez >= 3.10 (SDP daemon is now included in HCID daemon)
+ (#276650)
+- 2.15.2
+
+-------------------------------------------------------------------
Old:
----
yast2-bluetooth-2.15.1.tar.bz2
New:
----
yast2-bluetooth-2.15.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-bluetooth.spec ++++++
--- /var/tmp/diff_new_pack.t24873/_old 2007-05-23 12:17:52.000000000 +0200
+++ /var/tmp/diff_new_pack.t24873/_new 2007-05-23 12:17:52.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-bluetooth (Version 2.15.1)
+# spec file for package yast2-bluetooth (Version 2.15.2)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-bluetooth
-Version: 2.15.1
+Version: 2.15.2
Release: 1
License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-bluetooth-2.15.1.tar.bz2
+Source0: yast2-bluetooth-2.15.2.tar.bz2
prefix: /usr
BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite
Requires: yast2
@@ -34,7 +34,7 @@
Ladislav Slezak
%prep
-%setup -n yast2-bluetooth-2.15.1
+%setup -n yast2-bluetooth-2.15.2
%build
%{prefix}/bin/y2tool y2autoconf
@@ -70,6 +70,10 @@
%doc %{prefix}/share/doc/packages/yast2-bluetooth
%changelog
+* Wed May 23 2007 - lslezak@suse.cz
+- fix for bluez >= 3.10 (SDP daemon is now included in HCID daemon)
+ (#276650)
+- 2.15.2
* Thu Mar 01 2007 - lslezak@suse.cz
- fixed a rich text tag in the help text (#249490)
- 2.15.1
++++++ yast2-bluetooth-2.15.1.tar.bz2 -> yast2-bluetooth-2.15.2.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bluetooth-2.15.1/bluetooth.pot new/yast2-bluetooth-2.15.2/bluetooth.pot
--- old/yast2-bluetooth-2.15.1/bluetooth.pot 2005-04-22 09:52:16.000000000 +0200
+++ new/yast2-bluetooth-2.15.2/bluetooth.pot 1970-01-01 01:00:00.000000000 +0100
@@ -1,531 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR SuSE Linux AG, Nuernberg
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-04-22 09:52+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME \n"
-"Language-Team: LANGUAGE \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. %1 is a package name (bluez-utils)
-#: src/Bluetooth.ycp:129
-#, ycp-format
-msgid "Package %1 will be installed."
-msgstr ""
-
-#. Bluetooth read dialog caption
-#: src/Bluetooth.ycp:216
-msgid "Saving Bluetooth Configuration"
-msgstr ""
-
-#. Progress stage 1/2
-#: src/Bluetooth.ycp:223
-msgid "Write the settings"
-msgstr ""
-
-#. Progress stage 2/2
-#: src/Bluetooth.ycp:225
-msgid "Restart Bluetooth service"
-msgstr ""
-
-#. Progress step 1/2
-#: src/Bluetooth.ycp:228
-msgid "Writing the settings..."
-msgstr ""
-
-#. Progress step 2/2
-#: src/Bluetooth.ycp:230
-msgid "Restarting Bluetooth service..."
-msgstr ""
-
-#. Progress finished
-#: src/Bluetooth.ycp:232
-msgid "Finished"
-msgstr ""
-
-#. ask for confirmation, the text (hardware class) is displayed below header "YaST2 will detect the following hardware:"
-#: src/Bluetooth.ycp:349
-msgid "Bluetooth Adapter"
-msgstr ""
-
-#. Configuration summary text
-#. status string
-#: src/Bluetooth.ycp:381 src/dialogs.ycp:344
-msgid "Enabled"
-msgstr ""
-
-#: src/Bluetooth.ycp:381
-msgid "Disabled"
-msgstr ""
-
-#. no daemon is enabled, appended to string "Started services: "
-#: src/Bluetooth.ycp:408
-msgid "<I>None</I>"
-msgstr ""
-
-#. status string, %1 is replaced by list of daemons (e.g. "HCI, SDP, PAND") or "none"
-#: src/Bluetooth.ycp:412
-#, ycp-format
-msgid "<li>Started services: %1</li>"
-msgstr ""
-
-#. Command line help text for the Xbluetooth module
-#: src/bluetooth.ycp:35
-msgid "Configuration of bluetooth"
-msgstr ""
-
-#. open progress popup window
-#: src/bluetooth_proposal.ycp:39
-msgid "Detecting Bluetooth adapters..."
-msgstr ""
-
-#. Rich text title for Bluetooth in proposals
-#: src/bluetooth_proposal.ycp:94
-msgid "Bluetooth"
-msgstr ""
-
-#. Menu title for Bluetooth in proposals
-#: src/bluetooth_proposal.ycp:96
-msgid "&Bluetooth"
-msgstr ""
-
-#: src/dialogs.ycp:21
-msgid "Yes"
-msgstr ""
-
-#: src/dialogs.ycp:22
-msgid "No"
-msgstr ""
-
-#. Bluetooth global settings dialog caption
-#: src/dialogs.ycp:49
-msgid "Bluetooth Configuration"
-msgstr ""
-
-#: src/dialogs.ycp:56
-msgid "&Disable Bluetooth Services"
-msgstr ""
-
-#: src/dialogs.ycp:58
-msgid "&Enable Bluetooth Services"
-msgstr ""
-
-#: src/dialogs.ycp:63
-msgid "Basic Configuration"
-msgstr ""
-
-#: src/dialogs.ycp:67
-msgid "&Device Name"
-msgstr ""
-
-#: src/dialogs.ycp:80
-msgid "Security Manager"
-msgstr ""
-
-#: src/dialogs.ycp:84
-msgid "&Security Manager Disabled"
-msgstr ""
-
-#: src/dialogs.ycp:86
-msgid "Use Local &PIN for Incoming Connections"
-msgstr ""
-
-#: src/dialogs.ycp:89
-msgid "I&dentification Number (PIN)"
-msgstr ""
-
-#: src/dialogs.ycp:93
-msgid "Always Ask &User for a PIN"
-msgstr ""
-
-#: src/dialogs.ycp:104
-msgid "Advanced &Daemon Configuration..."
-msgstr ""
-
-#: src/dialogs.ycp:106
-msgid "&Security Options..."
-msgstr ""
-
-#: src/dialogs.ycp:108
-msgid "&Device and Service Classes..."
-msgstr ""
-
-#. Dialog caption - daemon configuration
-#: src/dialogs.ycp:197
-#, ycp-format
-msgid "%1 Daemon Configuration"
-msgstr ""
-
-#: src/dialogs.ycp:205
-msgid "Set Network Daemon to &Listen Mode"
-msgstr ""
-
-#: src/dialogs.ycp:207
-msgid "Set Network Daemon to &Search Mode"
-msgstr ""
-
-#: src/dialogs.ycp:209
-msgid "&Other Settings"
-msgstr ""
-
-#: src/dialogs.ycp:220
-msgid "&Daemon Arguments"
-msgstr ""
-
-#. network daemon mode, space at the beginning is required
-#. the text is appended to description of PAND daemon
-#: src/dialogs.ycp:309
-msgid " (listen mode)"
-msgstr ""
-
-#. network daemon mode, space at the beginning is required
-#. the text is appended to description of PAND daemon
-#: src/dialogs.ycp:315
-msgid " (search mode)"
-msgstr ""
-
-#. caption in bluetooth services configuration dialog
-#: src/dialogs.ycp:337
-msgid "Bluetooth Daemon Configuration"
-msgstr ""
-
-#: src/dialogs.ycp:343
-msgid "Current Available Daemons:"
-msgstr ""
-
-#: src/dialogs.ycp:344
-msgid "Daemon"
-msgstr ""
-
-#: src/dialogs.ycp:344
-msgid "Description"
-msgstr ""
-
-#: src/dialogs.ycp:347
-msgid "&Enable"
-msgstr ""
-
-#: src/dialogs.ycp:348
-msgid "&Disable"
-msgstr ""
-
-#: src/dialogs.ycp:350
-msgid "E&dit..."
-msgstr ""
-
-#. caption in bluetooth services configuration dialog
-#: src/dialogs.ycp:450
-msgid "Security Options"
-msgstr ""
-
-#: src/dialogs.ycp:458
-msgid "Authentication and Encryption"
-msgstr ""
-
-#: src/dialogs.ycp:461
-msgid "&Enable Authentication"
-msgstr ""
-
-#: src/dialogs.ycp:463
-msgid "Enable En&cryption"
-msgstr ""
-
-#: src/dialogs.ycp:468
-msgid "Scan Options"
-msgstr ""
-
-#: src/dialogs.ycp:471
-msgid "Enable &Inquiry Scan"
-msgstr ""
-
-#: src/dialogs.ycp:473
-msgid "Enable &Page Scan"
-msgstr ""
-
-#. caption in bluetooth class configuration dialog
-#: src/dialogs.ycp:533
-msgid "Class Configuration"
-msgstr ""
-
-#. combo box item - device class
-#: src/dialogs.ycp:537
-msgid "Computer"
-msgstr ""
-
-#. combo box item - device class
-#: src/dialogs.ycp:539
-msgid "Computer (Desktop)"
-msgstr ""
-
-#. combo box item - device class
-#: src/dialogs.ycp:541
-msgid "Computer (Server)"
-msgstr ""
-
-#. combo box item - device class
-#: src/dialogs.ycp:543
-msgid "Computer (Laptop)"
-msgstr ""
-
-#. service class name and description
-#: src/dialogs.ycp:549
-msgid "Positioning (Location Identification)"
-msgstr ""
-
-#. service class name and description
-#: src/dialogs.ycp:551
-msgid "Networking (LAN, Ad Hoc, etc.)"
-msgstr ""
-
-#. service class name and description
-#: src/dialogs.ycp:553
-msgid "Rendering (Printing, Speaker, etc.)"
-msgstr ""
-
-#. service class name and description
-#: src/dialogs.ycp:555
-msgid "Capturing (Scanner, Microphone, etc.)"
-msgstr ""
-
-#. service class name and description
-#: src/dialogs.ycp:557
-msgid "Object Transfer (v-Inbox, v-Folder, etc.)"
-msgstr ""
-
-#. service class name and description
-#: src/dialogs.ycp:559
-msgid "Audio (Speaker, Microphone, Headset Service, etc.)"
-msgstr ""
-
-#. service class name and description
-#: src/dialogs.ycp:561
-msgid "Telephony (Cordless Telephony, Modem, Headset Service, etc.)"
-msgstr ""
-
-#. service class name and description
-#: src/dialogs.ycp:563
-msgid "Information (Web Server, WAP Server, etc.)"
-msgstr ""
-
-#: src/dialogs.ycp:573
-msgid "&Device Class"
-msgstr ""
-
-#: src/dialogs.ycp:575
-msgid "&Service Class"
-msgstr ""
-
-#. Write dialog help text
-#: src/helps.ycp:20
-msgid ""
-"<p><b><big>Saving Bluetooth Configuration</big></b><br>\n"
-"Please wait...<br></p>\n"
-msgstr ""
-
-#. Help text for global settings dialog 1/6
-#: src/helps.ycp:25
-msgid "<P><B>Configure Bluetooth Support</B></P>"
-msgstr ""
-
-#. Help text for global settings dialog 2/6
-#: src/helps.ycp:28
-msgid ""
-"<P>If you enable Bluetooth support, the Bluetooth system is started\n"
-"automatically by the hotplug system after a Bluetooth adapter is found in your\n"
-"computer.</P>\n"
-msgstr ""
-
-#. Help text for global settings dialog 3/6
-#: src/helps.ycp:34
-msgid "<P><B>Device Name</B> is the name visible when remote devices ask for it.</P>"
-msgstr ""
-
-#. Help text for global settings dialog 4/6
-#: src/helps.ycp:37
-msgid ""
-"<P>Assign which services (or <I>Profiles</I> as they are called in Bluetooth) are available\n"
-"when the Bluetooth system starts in <B>Advanced Daemon Configuration<B>.</P>\n"
-msgstr ""
-
-#. Help text for global settings dialog 5/6
-#: src/helps.ycp:42
-msgid "<P><B>Security Manager</B> sets how incoming connections are treated regarding PINs.</P>"
-msgstr ""
-
-#. Help text for global settings dialog 6/6
-#: src/helps.ycp:45
-msgid ""
-"<P>Some devices require a PIN for identification. Usually this is a four or\n"
-"five digit number. If no PIN is required, choose '0000'.</P>\n"
-msgstr ""
-
-#. Help text for class configuration dialog 1/3
-#: src/helps.ycp:50
-msgid "<P><B>Class Configuration</B></P>"
-msgstr ""
-
-#: src/helps.ycp:51
-msgid "<P>Here, set the class of the local Bluetooth device.</P>"
-msgstr ""
-
-#. Help text for class configuration dialog 2/3
-#: src/helps.ycp:54
-msgid "<P><B>Device Class</B> is the type of the local device, such as workstation or server.</P>"
-msgstr ""
-
-#. Help text for class configuration dialog 3/3
-#: src/helps.ycp:57
-msgid "<P>In <B>Service Class</B>, select services offered by the computer to remote devices.</P>"
-msgstr ""
-
-#. Help text for service configuration dialog 1/10
-#: src/helps.ycp:62
-msgid "<P><B>Daemon Configuration</B></P>"
-msgstr ""
-
-#. Help text for service configuration dialog 2/10
-#: src/helps.ycp:65
-msgid ""
-"<P>The daemons here provide various services. To change daemon\n"
-"settings, press <B>Edit</B>.</P>\n"
-msgstr ""
-
-#. Help text for service configuration dialog 3/10
-#: src/helps.ycp:70
-msgid ""
-"<P><B>HCID</B> -- The host controller interface daemon manages all Bluetooth\n"
-"devices in your computer.</P>\n"
-msgstr ""
-
-#. Help text for service configuration dialog 4/10
-#: src/helps.ycp:75
-msgid ""
-"<P><B>SDPD</B> -- The service discovery protocol daemon is needed from remote devices to\n"
-"find out which Bluetooth services are available on your computer. The other\n"
-"daemons connect to this one.</P>\n"
-msgstr ""
-
-#. Help text for service configuration dialog 5/10
-#: src/helps.ycp:82
-msgid ""
-"<P><B>OPD</B>--The OBEX push daemon is needed, for example, to transfer\n"
-"files from a device onto your computer. If you are using KDE or GNOME, do not\n"
-"activate the OPD daemon. It is only needed for other desktops and causes\n"
-"problems with KDE and GNOME.</P>\n"
-msgstr ""
-
-#. Help text for service configuration dialog 6/10
-#: src/helps.ycp:88
-msgid ""
-"<P><B>RFCOMM</B> -- This is a serial cable emulation protocol needed for some devices and\n"
-"services. It is not a 'real' daemon, but a process configuring the existing\n"
-"Bluetooth devices.</P>\n"
-msgstr ""
-
-#. Help text for service configuration dialog 7/10
-#: src/helps.ycp:94
-msgid ""
-"<P><B>PAND</B> -- The personal area network daemon is used to create\n"
-"networks using Bluetooth. It creates a kind of wireless ethernet network.</P>\n"
-msgstr ""
-
-#. Help text for service configuration dialog 8/10
-#: src/helps.ycp:99
-msgid ""
-"<P><B>DUND</B> -- The dial-up networking daemon allows LAN access over\n"
-"PPP. You need it if you have a Bluetooth modem.</P>\n"
-msgstr ""
-
-#. Help text for service configuration dialog 9/10
-#: src/helps.ycp:104
-msgid ""
-"<P><B>HID</B> -- The human interface device profile is used for devices like\n"
-"keyboard and mouse.</P>\n"
-msgstr ""
-
-#. Help text for service configuration dialog 10/10
-#: src/helps.ycp:109
-msgid ""
-"<P><B>HID2HCI</B> -- This is actually not a 'real' daemon, but a help utility to switch\n"
-"a HID adapter into HCI mode (or vice versa). Normally you should not need it.</P>\n"
-msgstr ""
-
-#. Help text for detailed service configuration dialog 1/5
-#: src/helps.ycp:114
-msgid "<P><B>Security Options</B></P>"
-msgstr ""
-
-#. Help text for detailed service configuration dialog 2/5
-#: src/helps.ycp:117
-msgid "<P>To enhance security, you should enable <B>Authentication</B> and <B>Encryption</B>.</P>"
-msgstr ""
-
-#. Help text for detailed service configuration dialog 3/5
-#: src/helps.ycp:120
-msgid ""
-"<P>Encryption can only be done if authentication is enabled. Activating both\n"
-"enhances security a little bit, but you often run into problems if you do so.\n"
-"Not all devices support encryption. If you have problems connecting to a remote\n"
-"device, try it with encryption disabled.</P>\n"
-msgstr ""
-
-#. Help text for detailed service configuration dialog 4/5
-#: src/helps.ycp:127
-msgid ""
-"<P>With <B>Inquiry Scan</B>, decide if remote devices detect your\n"
-"adapter when scanning for available devices.</P>\n"
-msgstr ""
-
-#. Help text for detailed service configuration dialog 5/5
-#: src/helps.ycp:132
-msgid "<P>Enabling <B>Page Scan</B> allows remote devices to connect to your device.</P>"
-msgstr ""
-
-#. HCI daemon description
-#: src/helps.ycp:138
-msgid "Bluetooth device manager"
-msgstr ""
-
-#. SDP daemon description
-#: src/helps.ycp:140
-msgid "Device announcement"
-msgstr ""
-
-#. OPD daemon description
-#: src/helps.ycp:142
-msgid "File transfer service"
-msgstr ""
-
-#. RFCOMM daemon description
-#: src/helps.ycp:144
-msgid "Serial cable emulation"
-msgstr ""
-
-#. PAND daemon description
-#: src/helps.ycp:146
-msgid "Network connection"
-msgstr ""
-
-#. DUND daemon description
-#: src/helps.ycp:148
-msgid "Dial-up connection"
-msgstr ""
-
-#. HID daemon description
-#: src/helps.ycp:150
-msgid "Input device support (keyboard, mouse)"
-msgstr ""
-
-#. HID2HCI daemon description
-#: src/helps.ycp:152
-msgid "Use HID device in HCI mode"
-msgstr ""
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bluetooth-2.15.1/configure new/yast2-bluetooth-2.15.2/configure
--- old/yast2-bluetooth-2.15.1/configure 2007-03-01 15:11:45.000000000 +0100
+++ new/yast2-bluetooth-2.15.2/configure 2007-05-23 10:55:36.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.60 for yast2-bluetooth 2.15.1.
+# Generated by GNU Autoconf 2.60 for yast2-bluetooth 2.15.2.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -559,8 +559,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-bluetooth'
PACKAGE_TARNAME='yast2-bluetooth'
-PACKAGE_VERSION='2.15.1'
-PACKAGE_STRING='yast2-bluetooth 2.15.1'
+PACKAGE_VERSION='2.15.2'
+PACKAGE_STRING='yast2-bluetooth 2.15.2'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1181,7 +1181,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2-bluetooth 2.15.1 to adapt to many kinds of systems.
+\`configure' configures yast2-bluetooth 2.15.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1252,7 +1252,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-bluetooth 2.15.1:";;
+ short | recursive ) echo "Configuration of yast2-bluetooth 2.15.2:";;
esac
cat <<\_ACEOF
@@ -1330,7 +1330,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-bluetooth configure 2.15.1
+yast2-bluetooth configure 2.15.2
generated by GNU Autoconf 2.60
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1344,7 +1344,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-bluetooth $as_me 2.15.1, which was
+It was created by yast2-bluetooth $as_me 2.15.2, which was
generated by GNU Autoconf 2.60. Invocation command line was
$ $0 $@
@@ -2145,7 +2145,7 @@
# Define the identity of the package.
PACKAGE='yast2-bluetooth'
- VERSION='2.15.1'
+ VERSION='2.15.2'
cat >>confdefs.h <<_ACEOF
@@ -2372,7 +2372,7 @@
-VERSION="2.15.1"
+VERSION="2.15.2"
RPMNAME="yast2-bluetooth"
MAINTAINER="Ladislav Slezak "
@@ -3258,7 +3258,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-bluetooth $as_me 2.15.1, which was
+This file was extended by yast2-bluetooth $as_me 2.15.2, which was
generated by GNU Autoconf 2.60. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3301,7 +3301,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-bluetooth config.status 2.15.1
+yast2-bluetooth config.status 2.15.2
configured by $0, generated by GNU Autoconf 2.60,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bluetooth-2.15.1/configure.in new/yast2-bluetooth-2.15.2/configure.in
--- old/yast2-bluetooth-2.15.1/configure.in 2007-03-01 15:11:39.000000000 +0100
+++ new/yast2-bluetooth-2.15.2/configure.in 2007-05-23 10:55:30.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-bluetooth, 2.15.1, http://bugs.opensuse.org/, yast2-bluetooth)
+AC_INIT(yast2-bluetooth, 2.15.2, http://bugs.opensuse.org/, yast2-bluetooth)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.15.1"
+VERSION="2.15.2"
RPMNAME="yast2-bluetooth"
MAINTAINER="Ladislav Slezak "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bluetooth-2.15.1/src/Bluetooth.ycp new/yast2-bluetooth-2.15.2/src/Bluetooth.ycp
--- old/yast2-bluetooth-2.15.1/src/Bluetooth.ycp 2006-11-30 13:08:34.000000000 +0100
+++ new/yast2-bluetooth-2.15.2/src/Bluetooth.ycp 2007-05-23 10:54:42.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Bluetooth settings, input and output functions
* Authors: Ladislav Slezak
*
- * $Id: Bluetooth.ycp 34666 2006-11-30 12:08:31Z lslezak $
+ * $Id: Bluetooth.ycp 38097 2007-05-23 08:54:42Z lslezak $
*
* Representation of the configuration of bluetooth devices.
* Input and output routines.
@@ -106,6 +106,11 @@
if (all != nil && size(all) > 0)
{
foreach(string var, all, ``{
+ // the SDP_START variable might be lying around from < bluez-3.10
+ // ignore it.
+ if (var == "SDP_START") {
+ continue;
+ }
if (regexpmatch(var, ".*_START$"))
{
string daemon_name = regexpsub(var, "(.*)_START$", "\\1");
@@ -114,6 +119,8 @@
}
);
}
+ // SDP is always there, but built into hcid since bluez-3.10
+ ret = add(ret, "SDP");
return ret;
}
@@ -154,6 +161,10 @@
// reset daemon list
daemons = [];
foreach(string service, detected_services, ``{
+ if ((service == "SDP" ))
+ {
+ continue;
+ }
// read start status
boolean service_enabled = (SCR::Read(.sysconfig.bluetooth + (service + "_START")) == "yes");
@@ -163,6 +174,17 @@
// read daemon arguments
string args = (string)SCR::Read(.sysconfig.bluetooth + (service + "_DAEMON_ARGS"));
+ if ((service == "HCI"))
+ {
+ boolean sdp_enabled = false;
+ if (regexpmatch(args, "([ \t]|^)-s([ \t]|$)"))
+ {
+ sdp_enabled = true;
+ }
+ daemons = add(daemons, $[ "service" : "SDP", "enabled": sdp_enabled,
+ "daemon" : "", "args" : "" ]);
+ }
+
daemons = add(daemons, $[ "service" : service, "enabled" : service_enabled,
"daemon" : binary, "args" : args ]);
}
@@ -259,7 +281,31 @@
SCR::Write(.sysconfig.bluetooth.START_SERVICES, (enabled) ? "yes" : "no");
// write daemon settings
+ boolean sdp_enabled = false;
foreach(map d, daemons, ``{
+ if ((d["service"]:"") == "SDP")
+ {
+ sdp_enabled = (d["enabled"]:false);
+ }
+ }
+ );
+ foreach(map d, daemons, ``{
+ if ((d["service"]:"") == "SDP")
+ {
+ // SDPD is now handled by passing "-s" to hcid, since bluez-3.10
+ continue;
+ }
+ else if ((d["service"]:"") == "HCI")
+ {
+ if (regexpmatch(d["args"]:"", "([ \t]|^)-s([ \t]|$)"))
+ {
+ d["args"] = regexpsub(d["args"]:"", "(.*)([ \t]|^)-s([ \t]|$)(.*)", "\\1 \\4");
+ }
+ if (sdp_enabled)
+ {
+ d["args"] = "-s " + (d["args"]:"");
+ }
+ }
SCR::Write(.sysconfig.bluetooth + ((d["service"]:"") + "_START"), d["enabled"]:false ? "yes" : "no");
SCR::Write(.sysconfig.bluetooth + ((d["service"]:"") + "_DAEMON_ARGS"), d["args"]:"");
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bluetooth-2.15.1/VERSION new/yast2-bluetooth-2.15.2/VERSION
--- old/yast2-bluetooth-2.15.1/VERSION 2007-03-01 15:09:16.000000000 +0100
+++ new/yast2-bluetooth-2.15.2/VERSION 2007-05-23 10:26:24.000000000 +0200
@@ -1 +1 @@
-2.15.1
+2.15.2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org