Hello community, here is the log from the commit of package libbluedevil for openSUSE:Factory checked in at 2014-12-29 00:33:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libbluedevil (Old) and /work/SRC/openSUSE:Factory/.libbluedevil.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libbluedevil" Changes: -------- --- /work/SRC/openSUSE:Factory/libbluedevil/libbluedevil.changes 2014-12-21 12:00:35.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libbluedevil.new/libbluedevil.changes 2014-12-29 00:33:18.000000000 +0100 @@ -1,0 +2,8 @@ +Tue Dec 23 23:32:58 UTC 2014 - [email protected] + +- Update to 2.1 + * Adapter::name() now returns alias of adapter +- Drop 0001-Adapter-name-now-returns-alias-of-adapter.patch, merged + upstream + +------------------------------------------------------------------- Old: ---- 0001-Adapter-name-now-returns-alias-of-adapter.patch libbluedevil-2.0.tar.xz New: ---- libbluedevil-2.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libbluedevil.spec ++++++ --- /var/tmp/diff_new_pack.FgY0fJ/_old 2014-12-29 00:33:20.000000000 +0100 +++ /var/tmp/diff_new_pack.FgY0fJ/_new 2014-12-29 00:33:20.000000000 +0100 @@ -18,15 +18,13 @@ Name: libbluedevil -Version: 2.0 +Version: 2.1 Release: 0 Summary: Qt Bluetooth client library License: LGPL-2.0+ Group: System/Libraries Url: http://www.kde.org Source: http://download.kde.org/stable/%{name}/%{version}/src/%{name}-%{version}.tar.xz -# PATCH-FIX-UPSTREAM 0001-Adapter-name-now-returns-alias-of-adapter.patch -Patch0: 0001-Adapter-name-now-returns-alias-of-adapter.patch BuildRequires: cmake BuildRequires: kde4-filesystem BuildRequires: libqt4-devel @@ -52,7 +50,6 @@ %prep %setup -q -n %{name}-%{version} -%patch0 -p1 %build %cmake_kde4 -d build ++++++ libbluedevil-2.0.tar.xz -> libbluedevil-2.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libbluedevil-2.0/CMakeLists.txt new/libbluedevil-2.1/CMakeLists.txt --- old/libbluedevil-2.0/CMakeLists.txt 2014-12-03 09:18:54.000000000 +0100 +++ new/libbluedevil-2.1/CMakeLists.txt 2014-12-22 12:20:44.000000000 +0100 @@ -31,7 +31,7 @@ ARCHIVE DESTINATION "${LIB_INSTALL_DIR}" COMPONENT Devel ) -set(GENERIC_LIB_VERSION "2.0") +set(GENERIC_LIB_VERSION "2.1") set(GENERIC_LIB_SOVERSION "2") set(VERSION ${GENERIC_LIB_VERSION}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libbluedevil-2.0/bluedevil/bluedeviladapter.cpp new/libbluedevil-2.1/bluedevil/bluedeviladapter.cpp --- old/libbluedevil-2.0/bluedevil/bluedeviladapter.cpp 2014-12-03 09:18:54.000000000 +0100 +++ new/libbluedevil-2.1/bluedevil/bluedeviladapter.cpp 2014-12-22 12:20:44.000000000 +0100 @@ -89,7 +89,7 @@ for(i = changed_properties.constBegin(); i != changed_properties.constEnd(); ++i) { QVariant value = i.value(); QString property = i.key(); - if (property == "Name") { + if (property == "Alias") { emit m_q->nameChanged(value.toString()); } else if (property == "Powered") { emit m_q->poweredChanged(value.toBool()); @@ -141,12 +141,12 @@ QString Adapter::name() const { - return d->m_bluezAdapterInterface->name(); + return d->m_bluezAdapterInterface->alias(); } -QString Adapter::alias() const +QString Adapter::systemName() const { - return d->m_bluezAdapterInterface->alias(); + return d->m_bluezAdapterInterface->name(); } quint32 Adapter::adapterClass() const @@ -214,9 +214,9 @@ return UUIDs; } -void Adapter::setAlias(const QString& alias) +void Adapter::setName(const QString& name) { - d->m_bluezAdapterInterface->setAlias(alias); + d->m_bluezAdapterInterface->setAlias(name); } void Adapter::setPowered(bool powered) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libbluedevil-2.0/bluedevil/bluedeviladapter.h new/libbluedevil-2.1/bluedevil/bluedeviladapter.h --- old/libbluedevil-2.0/bluedevil/bluedeviladapter.h 2014-12-03 09:18:54.000000000 +0100 +++ new/libbluedevil-2.1/bluedevil/bluedeviladapter.h 2014-12-22 12:20:44.000000000 +0100 @@ -49,8 +49,8 @@ Q_OBJECT Q_PROPERTY(QString address READ address) - Q_PROPERTY(QString name READ name) - Q_PROPERTY(QString alias READ alias WRITE setAlias) + Q_PROPERTY(QString name READ name WRITE setName) + Q_PROPERTY(QString systemName READ systemName) Q_PROPERTY(quint32 adapterClass READ adapterClass) Q_PROPERTY(bool powered READ isPowered WRITE setPowered) Q_PROPERTY(bool discoverable READ isDiscoverable WRITE setDiscoverable) @@ -75,14 +75,19 @@ QString address() const; /** + * Returns the friendly name of the adapter. + * + * Friendly name is alias of the adapter. If no alias is set, it returns + * the system name. + * * @return The friendly name of the adapter. */ QString name() const; /** - * @return The alias of the adapter + * @return The system name (hostname) of the adapter. */ - QString alias() const; + QString systemName() const; /** * @return The class of the adapter. @@ -147,9 +152,9 @@ public Q_SLOTS: /** - * Set the alias of the adapter + * Set the name (alias) of the adapter */ - void setAlias(const QString &alias); + void setName(const QString &name); /** * Sets whether this adapter is consuming energy or not. -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
