Hello community,
here is the log from the commit of package yast2-bluetooth
checked in at Thu Dec 7 19:54:14 CET 2006.
--------
--- yast2-bluetooth/yast2-bluetooth.changes 2006-08-16 15:01:11.000000000 +0200
+++ /mounts/work_src_done/NOARCH/yast2-bluetooth/yast2-bluetooth.changes 2006-12-04 15:40:20.000000000 +0100
@@ -1,0 +2,10 @@
+Wed Nov 29 16:26:36 CET 2006 - lslezak@suse.cz
+
+- display the bluetooth icon (#211565)
+- help text: added description of %h and %d sequences in device
+ name (#144696)
+- do not try to read non existing config files (#211902)
+- use Progress:set()
+- 2.15.0
+
+-------------------------------------------------------------------
Old:
----
yast2-bluetooth-2.14.0.tar.bz2
New:
----
yast2-bluetooth-2.15.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-bluetooth.spec ++++++
--- /var/tmp/diff_new_pack.6V1x8P/_old 2006-12-07 19:53:04.000000000 +0100
+++ /var/tmp/diff_new_pack.6V1x8P/_new 2006-12-07 19:53:04.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-bluetooth (Version 2.14.0)
+# spec file for package yast2-bluetooth (Version 2.15.0)
#
# Copyright (c) 2006 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.14.0
+Version: 2.15.0
Release: 1
-License: GPL
+License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-bluetooth-2.14.0.tar.bz2
+Source0: yast2-bluetooth-2.15.0.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.14.0
+%setup -n yast2-bluetooth-2.15.0
%build
%{prefix}/bin/y2tool y2autoconf
@@ -70,6 +70,13 @@
%doc %{prefix}/share/doc/packages/yast2-bluetooth
%changelog -n yast2-bluetooth
+* Wed Nov 29 2006 - lslezak@suse.cz
+- display the bluetooth icon (#211565)
+- help text: added description of %%h and %%d sequences in device
+ name (#144696)
+- do not try to read non existing config files (#211902)
+- use Progress:set()
+- 2.15.0
* Wed Aug 16 2006 - lslezak@suse.cz
- adapted to bluez-3.1
- 2.14.0
++++++ yast2-bluetooth-2.14.0.tar.bz2 -> yast2-bluetooth-2.15.0.tar.bz2 ++++++
++++ 5148 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-bluetooth-2.14.0/Makefile.am new/yast2-bluetooth-2.15.0/Makefile.am
--- old/yast2-bluetooth-2.14.0/Makefile.am 2006-08-16 13:53:38.000000000 +0200
+++ new/yast2-bluetooth-2.15.0/Makefile.am 2006-11-30 13:09:01.000000000 +0100
@@ -67,7 +67,7 @@
# because the prerequisite is made here (not anymore!)
# and we don't want any paths in y2autoconf
# info '(autoconf)config.status Invocation'
-$(RPMNAME).pc: $(RPMNAME).pc.in
+$(RPMNAME).pc: $(RPMNAME).pc.in config.status
./config.status --file=$@:$<
if CREATE_PKGCONFIG_NOARCH
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-bluetooth-2.14.0/Makefile.am.common new/yast2-bluetooth-2.15.0/Makefile.am.common
--- old/yast2-bluetooth-2.14.0/Makefile.am.common 2006-08-16 13:53:38.000000000 +0200
+++ new/yast2-bluetooth-2.15.0/Makefile.am.common 2006-11-30 13:09:01.000000000 +0100
@@ -29,7 +29,19 @@
dist-hook: check-syntax
+CHECK_SYNTAX = true
check-syntax: $(client_DATA) $(ycpchook)
- if test "$(client_DATA)"; then $(bindir)/ycpc -qE -M. -I. $(YCPCFLAGS) $(filter %.ycp,$^) || exit 1; fi
+ @if test "$(client_DATA)"; then \
+ if $(CHECK_SYNTAX); then \
+ TO_CHECK="$(filter %.ycp,$^)"; \
+ echo "Checking syntax of $${TO_CHECK}"; \
+ if ! $(YCPC) -qE -M. -I. $(YCPCFLAGS) $${TO_CHECK}; then \
+ echo "Failed. Disable by 'make ... CHECK_SYNTAX=false' at your own risk"; \
+ exit 1; \
+ fi; \
+ else \
+ echo "Syntax check disabled"; \
+ fi; \
+ fi
-include .dep
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-bluetooth-2.14.0/VERSION new/yast2-bluetooth-2.15.0/VERSION
--- old/yast2-bluetooth-2.14.0/VERSION 2006-08-16 13:50:06.000000000 +0200
+++ new/yast2-bluetooth-2.15.0/VERSION 2006-11-30 10:09:58.000000000 +0100
@@ -1 +1 @@
-2.14.0
+2.15.0
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-bluetooth-2.14.0/configure.in new/yast2-bluetooth-2.15.0/configure.in
--- old/yast2-bluetooth-2.14.0/configure.in 2006-08-16 13:53:38.000000000 +0200
+++ new/yast2-bluetooth-2.15.0/configure.in 2006-11-30 13:09:01.000000000 +0100
@@ -1,9 +1,9 @@
dnl configure.in for yast2-bluetooth
dnl
-dnl -- This file is generated by y2autoconf 2.13.19 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.13.16 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-bluetooth, 2.14.0, http://bugs.opensuse.org/, yast2-bluetooth)
+AC_INIT(yast2-bluetooth, 2.15.0, 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.14.0"
+VERSION="2.15.0"
RPMNAME="yast2-bluetooth"
MAINTAINER="Ladislav Slezak "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-bluetooth-2.14.0/src/Bluetooth.ycp new/yast2-bluetooth-2.15.0/src/Bluetooth.ycp
--- old/yast2-bluetooth-2.14.0/src/Bluetooth.ycp 2006-08-16 14:56:32.000000000 +0200
+++ new/yast2-bluetooth-2.15.0/src/Bluetooth.ycp 2006-11-30 13:08:34.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Bluetooth settings, input and output functions
* Authors: Ladislav Slezak
*
- * $Id: Bluetooth.ycp 32379 2006-08-16 12:58:07Z lslezak $
+ * $Id: Bluetooth.ycp 34666 2006-11-30 12:08:31Z lslezak $
*
* Representation of the configuration of bluetooth devices.
* Input and output routines.
@@ -127,13 +127,25 @@
* @return true on success
*/
global boolean Read() {
+
+ // check whether the sysconfig file exists, if not then use the default values,
+ // bluez-utils package might not be installed at HW proposal in the 2nd stage
+ boolean read_sysconfig = true;
+ const string sysconfig_file = "/etc/sysconfig/bluetooth";
+
+ if (SCR::Read(.target.size, sysconfig_file) < 0)
+ {
+ y2warning("File %1 doesn't exist, using default values", sysconfig_file);
+ read_sysconfig = false;
+ }
+
// read sysconfig settings
// read global setting
- enabled = (SCR::Read(.sysconfig.bluetooth.START_SERVICES) == "yes");
+ enabled = read_sysconfig ? (SCR::Read(.sysconfig.bluetooth.START_SERVICES) == "yes") : false;
y2milestone("bluetooth enabled: %1", enabled);
// search for all daemon variables
- list<string> dir = (list<string>) SCR::Dir(.sysconfig.bluetooth);
+ list<string> dir = read_sysconfig ? (list<string>) SCR::Dir(.sysconfig.bluetooth) : [];
y2debug("detected variables: %1", dir);
list<string> detected_services = detect_services(dir);
@@ -157,16 +169,28 @@
);
y2milestone("configuration of daemons: %1", daemons);
+
+ // check whether the config file exists, if not then use the default values,
+ // bluez-utils package might not be installed at HW proposal in the 2nd stage
+ boolean read_hcid = true;
+ const string hcid_file = "/etc/bluetooth/hcid.conf";
+
+ if (SCR::Read(.target.size, hcid_file) < 0)
+ {
+ y2warning("File %1 doesn't exist, using default values", hcid_file);
+ read_hcid = false;
+ }
+
// read hcid.conf settings
// read scan settings
- inquiry_scan = (SCR::Read(.bluetooth.hcid.value.device.iscan) == ["enable"]);
+ inquiry_scan = read_hcid ? (SCR::Read(.bluetooth.hcid.value.device.iscan) == ["enable"]) : false;
y2milestone("inquiry_scan: %1", inquiry_scan);
- page_scan = (SCR::Read(.bluetooth.hcid.value.device.pscan) == ["enable"]);
+ page_scan = read_hcid ? (SCR::Read(.bluetooth.hcid.value.device.pscan) == ["enable"]) : false;
y2milestone("page_scan: %1", page_scan);
- security_manager = ((list<string>)SCR::Read(.bluetooth.hcid.value.options.security))[0]:"auto";
+ security_manager = read_hcid ? (((list<string>)SCR::Read(.bluetooth.hcid.value.options.security))[0]:"auto") : "auto";
y2milestone("security_manager: %1", security_manager);
- device_name = ((list<string>)SCR::Read(.bluetooth.hcid.value.device.name))[0]:"\"BlueZ %h (%d)\"";
+ device_name = read_hcid ? (((list<string>)SCR::Read(.bluetooth.hcid.value.device.name))[0]:"\"BlueZ %h (%d)\"") : "\"BlueZ %h (%d)\"";
// remove leading and trailing double quotes
string device_name_parsed = regexpsub(device_name, "^\"(.*)\"$", "\\1");
@@ -177,7 +201,7 @@
y2milestone("device_name: %1", device_name);
// read device and service class
- string class_str = ((list<string>)SCR::Read(.bluetooth.hcid.value.device.class))[0]:"0x100100";
+ string class_str = read_hcid ? (((list<string>)SCR::Read(.bluetooth.hcid.value.device.class))[0]:"0x100100") : "0x100100";
y2milestone("class_str: %1", class_str);
integer class = tointeger(class_str);
@@ -187,7 +211,7 @@
y2milestone("service_class: %1", tohexstring(service_class));
// read PIN
- pin = ((list<string>)SCR::Read(.bluetooth.hcid.value.options.passkey))[0]:"\"BlueZ\"";
+ pin = read_hcid ? (((list<string>)SCR::Read(.bluetooth.hcid.value.options.passkey))[0]:"\"BlueZ\"") : "\"BlueZ\"";
// remove leading and trailing double quotes
string pin_parsed = regexpsub(pin, "^\"(.*)\"$", "\\1");
@@ -195,7 +219,7 @@
{
pin = pin_parsed;
}
- y2milestone("pin: %1", pin);
+ y2debug("pin: %1", pin);
return true;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-bluetooth-2.14.0/src/bluetooth_proposal.ycp new/yast2-bluetooth-2.15.0/src/bluetooth_proposal.ycp
--- old/yast2-bluetooth-2.14.0/src/bluetooth_proposal.ycp 2005-05-18 12:40:19.000000000 +0200
+++ new/yast2-bluetooth-2.15.0/src/bluetooth_proposal.ycp 2006-11-30 13:08:34.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Proposal function dispatcher.
* Authors: Ladislav Slezak
*
- * $Id: bluetooth_proposal.ycp 22789 2005-03-24 14:32:08Z lslezak $
+ * $Id: bluetooth_proposal.ycp 34666 2006-11-30 12:08:31Z lslezak $
*
* Proposal function dispatcher for bluetooth configuration.
* See source/installation/proposal/proposal-API.txt
@@ -33,7 +33,7 @@
if(force_reset || !Bluetooth::proposal_valid) {
Bluetooth::proposal_valid = true;
- Progress::off();
+ boolean progress = Progress::set(false);
// open progress popup window
UI::OpenDialog(`VBox(`Label(_("Detecting Bluetooth adapters..."))));
@@ -43,7 +43,7 @@
// close progress popup
UI::CloseDialog();
- Progress::on();
+ Progress::set(progress);
}
string proposal = Bluetooth::Summary();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-bluetooth-2.14.0/src/helps.ycp new/yast2-bluetooth-2.15.0/src/helps.ycp
--- old/yast2-bluetooth-2.14.0/src/helps.ycp 2006-08-16 14:56:32.000000000 +0200
+++ new/yast2-bluetooth-2.15.0/src/helps.ycp 2006-11-30 08:14:17.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Help texts of all the dialogs
* Authors: Ladislav Slezak
*
- * $Id: helps.ycp 32379 2006-08-16 12:58:07Z lslezak $
+ * $Id: helps.ycp 34660 2006-11-30 07:14:15Z lslezak $
*/
{
@@ -31,7 +31,10 @@
") +
/* Help text for global settings dialog 3/6*/
-_("<P><B>Device Name</B> is the name visible when remote devices ask for it.</P>") +
+
+_("<P><B>Device Name</B> is the name visible when remote devices ask for it.
+The name can contain sequence %h (which is replaced by the host name) or %d
+(replaced by device ID of the bluetooth adapter).</P>") +
/* Help text for global settings dialog 4/6*/
_("<P>Assign which services (or <I>profiles</I> as they are called in Bluetooth) are available
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-bluetooth-2.14.0/src/wizards.ycp new/yast2-bluetooth-2.15.0/src/wizards.ycp
--- old/yast2-bluetooth-2.14.0/src/wizards.ycp 2005-01-21 18:37:04.000000000 +0100
+++ new/yast2-bluetooth-2.15.0/src/wizards.ycp 2006-11-29 16:35:27.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Wizards definitions
* Authors: Ladislav Slezak
*
- * $Id: wizards.ycp 20674 2005-01-06 15:41:46Z lslezak $
+ * $Id: wizards.ycp 34650 2006-11-29 15:35:25Z lslezak $
*/
{
@@ -87,6 +87,7 @@
];
Wizard::CreateDialog();
+ Wizard::SetDesktopIcon("bluetooth");
any ret = Sequencer::Run(aliases, sequence);
@@ -102,6 +103,7 @@
any BluetoothAutoSequence() {
Wizard::CreateDialog();
+ Wizard::SetDesktopIcon("bluetooth");
any ret = MainSequence();
UI::CloseDialog();
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org