Hello community, here is the log from the commit of package kcontacts for openSUSE:Factory checked in at 2016-01-23 01:06:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kcontacts (Old) and /work/SRC/openSUSE:Factory/.kcontacts.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kcontacts" Changes: -------- --- /work/SRC/openSUSE:Factory/kcontacts/kcontacts.changes 2016-01-10 13:04:44.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kcontacts.new/kcontacts.changes 2016-01-23 01:06:39.000000000 +0100 @@ -1,0 +2,9 @@ +Sat Jan 9 18:15:05 UTC 2016 - [email protected] + +- Update to KDE Applications 15.12.1 + * KDE Applications 15.12.1 + * https://www.kde.org/announcements/announce-applications-15.12.1.php + * boo#961265 + + +------------------------------------------------------------------- Old: ---- kcontacts-15.12.0.tar.xz New: ---- kcontacts-15.12.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kcontacts.spec ++++++ --- /var/tmp/diff_new_pack.WIygK6/_old 2016-01-23 01:06:39.000000000 +0100 +++ /var/tmp/diff_new_pack.WIygK6/_new 2016-01-23 01:06:39.000000000 +0100 @@ -18,7 +18,7 @@ %define kf5_version 5.5.0 Name: kcontacts -Version: 15.12.0 +Version: 15.12.1 Release: 0 Summary: New address book API for KDE License: LGPL-2.1+ ++++++ kcontacts-15.12.0.tar.xz -> kcontacts-15.12.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-15.12.0/src/phonenumber.cpp new/kcontacts-15.12.1/src/phonenumber.cpp --- old/kcontacts-15.12.0/src/phonenumber.cpp 2015-11-14 11:27:59.000000000 +0100 +++ new/kcontacts-15.12.1/src/phonenumber.cpp 2015-12-24 16:30:34.000000000 +0100 @@ -151,7 +151,7 @@ if (list.isEmpty()) { list << Home << Work << Msg << Pref << Voice << Fax << Cell << Video - << Bbs << Modem << Car << Isdn << Pcs << Pager; + << Bbs << Modem << Car << Isdn << Pcs << Pager << Undefined; } return list; @@ -160,48 +160,36 @@ QString PhoneNumber::typeFlagLabel(TypeFlag type) { switch (type) { + case Undefined: + return i18nc("Undefined phone type", "Telephone number"); case Home: return i18nc("Home phone", "Home"); - break; case Work: return i18nc("Work phone", "Work"); - break; case Msg: return i18n("Messenger"); - break; case Pref: return i18nc("Preferred phone", "Preferred"); - break; case Voice: return i18n("Voice"); - break; case Fax: return i18n("Fax"); - break; case Cell: return i18nc("Mobile Phone", "Mobile"); - break; case Video: return i18nc("Video phone", "Video"); - break; case Bbs: return i18n("Mailbox"); - break; case Modem: return i18n("Modem"); - break; case Car: return i18nc("Car Phone", "Car"); - break; case Isdn: return i18n("ISDN"); - break; case Pcs: return i18n("PCS"); - break; case Pager: return i18n("Pager"); - break; default: return i18nc("another type of phone", "Other"); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-15.12.0/src/phonenumber.h new/kcontacts-15.12.1/src/phonenumber.h --- old/kcontacts-15.12.0/src/phonenumber.h 2015-11-14 11:27:59.000000000 +0100 +++ new/kcontacts-15.12.1/src/phonenumber.h 2015-12-24 16:30:34.000000000 +0100 @@ -60,7 +60,8 @@ Car = 1024, /**< Car phone */ Isdn = 2048, /**< ISDN connection */ Pcs = 4096, /**< Personal Communication Service*/ - Pager = 8192 /**< Pager */ + Pager = 8192, /**< Pager */ + Undefined = 16384 /** Undefined number type */ }; Q_DECLARE_FLAGS(Type, TypeFlag) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-15.12.0/src/vcardtool.cpp new/kcontacts-15.12.1/src/vcardtool.cpp --- old/kcontacts-15.12.0/src/vcardtool.cpp 2015-11-14 11:27:59.000000000 +0100 +++ new/kcontacts-15.12.1/src/vcardtool.cpp 2015-12-24 16:30:34.000000000 +0100 @@ -993,14 +993,14 @@ phone.setNumber((*lineIt).value().toString()); PhoneNumber::Type type; - + bool foundType = false; const QStringList types = (*lineIt).parameters(QStringLiteral("type")); QStringList::ConstIterator typeEnd(types.end()); for (QStringList::ConstIterator it = types.begin(); it != typeEnd; ++it) { type |= mPhoneTypeMap[(*it).toUpper()]; + foundType = true; } - - phone.setType(type); + phone.setType( foundType ? type : PhoneNumber::Undefined); addr.insertPhoneNumber(phone); }
