[SCM] KDE PIM Libraries module packaging branch, kde4.10, updated. debian/4.8.4-1-38-gcf38541
Sune Vuorela
pusling-guest at alioth.debian.org
Tue Apr 2 22:58:12 UTC 2013
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kdepimlibs.git;a=commitdiff;h=cf38541
The following commit has been merged in the kde4.10 branch:
commit cf385414e441bc0809c7526b2a87bba2569b0bcf
Author: Sune Vuorela <sune at vuorela.dk>
Date: Mon Mar 25 19:37:44 2013 +0100
prepare for experimental ; restore 4.10.x pim compatibility
also update symbol files
---
debian/changelog | 11 ++--
debian/control | 4 +-
debian/libakonadi-kde4.symbols | 4 +-
debian/libkpimidentities4.symbols | 3 +-
debian/patches/dont_verify_akonadi_id.diff | 70 ----------------------------
debian/patches/series | 1 -
6 files changed, 13 insertions(+), 80 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 4b40868..c9391a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-kdepimlibs (4:4.10.1-0r1) UNRELEASED; urgency=low
+kdepimlibs (4:4.10.2-1) experimental; urgency=low
* New upstream release.
@@ -10,8 +10,6 @@ kdepimlibs (4:4.10.1-0r1) UNRELEASED; urgency=low
[ José Manuel Santamaría Lema ]
* Bump kde-sc-dev-latest build dependecy to 4:4.10.1.
* Bump libakonadi-dev build dependency to 1.8.1.
- * Add dont_verify_akonadi_id.diff, it makes kmail 4.4.10 remember identity's
- settings of draft, templates and sent folders.
* Update some installed files.
* Update symbols files.
* Add lintian overrides for hardening-no-fortify-functions.
@@ -23,7 +21,6 @@ kdepimlibs (4:4.10.1-0r1) UNRELEASED; urgency=low
[ Josep Febrer ]
* Update patches
- drop 03_hide_akonadi_progressbar.diff, no longer needed
- - refresh dont_verify_akonadi_id.diff, to apply cleanly.
* Bump kdelibs5-dev build dependency to 4:4.10.
* Bump nepomuk-core-dev build dependecy to 4:4.10.
* Add build dependencies on libqjson-dev, libxslt1-dev, libx11 and pkg-config.
@@ -31,7 +28,11 @@ kdepimlibs (4:4.10.1-0r1) UNRELEASED; urgency=low
* Pass -DKDE4_BUILD_TESTS=false to cmake in order to keep the tests disabled.
* Update installed files.
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Thu, 15 Nov 2012 23:10:43 +0100
+ [ Sune Vuorela ]
+ * Make libkpimidentities4 break older kmail & friends
+ * Change my email address
+
+ -- Sune Vuorela <sune at debian.org> Mon, 25 Mar 2013 19:31:38 +0100
kdepimlibs (4:4.8.4-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 21a3506..d1f4b09 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: kdepimlibs
Section: libs
Priority: optional
Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Uploaders: Sune Vuorela <debian at pusling.com>,
+Uploaders: Sune Vuorela <sune at debian.org>,
Fathi Boudra <fabo at debian.org>,
Modestas Vainius <modax at debian.org>,
George Kiagiadakis <kiagiadakis.george at gmail.com>,
@@ -285,7 +285,7 @@ Package: libkpimidentities4
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Replaces: kdepimlibs5 (<< 4:4.4.0)
-Breaks: kdepimlibs5 (<< 4:4.4.0)
+Breaks: kdepimlibs5 (<< 4:4.4.0), kdepim-runtime (<< 4:4.5), klinkstatus (<< 4:4.5), libkalarmcal2 (<< 4:4.9), libkdepim4 (<< 4:4.5)
Description: library for managing user identities
This library provides an API for managing user identities.
.
diff --git a/debian/libakonadi-kde4.symbols b/debian/libakonadi-kde4.symbols
index c4653ac..480ef0c 100644
--- a/debian/libakonadi-kde4.symbols
+++ b/debian/libakonadi-kde4.symbols
@@ -1,4 +1,4 @@
-# SymbolsHelper-Confirmed: 4:4.10.0 amd64
+# SymbolsHelper-Confirmed: 4:4.10.2 amd64
libakonadi-kde.so.4 libakonadi-kde4 #MINVER#, kdepim-runtime
* Build-Depends-Package: kdepimlibs5-dev
_Z5qHashRKN7Akonadi10CollectionE at Base 4:4.3.4
@@ -381,6 +381,7 @@ libakonadi-kde.so.4 libakonadi-kde4 #MINVER#, kdepim-runtime
_ZN7Akonadi14ItemFetchScope18fetchAllAttributesEb at Base 4:4.3.4
_ZN7Akonadi14ItemFetchScope20setAncestorRetrievalENS0_17AncestorRetrievalE at Base 4:4.4.0
_ZN7Akonadi14ItemFetchScope24setFetchModificationTimeEb at Base 4:4.5.86
+ _ZN7Akonadi14ItemFetchScope24setIgnoreRetrievalErrorsEb at Base 4:4.10.2
_ZN7Akonadi14ItemFetchScopeC1ERKS0_ at Base 4:4.3.4
_ZN7Akonadi14ItemFetchScopeC1Ev at Base 4:4.3.4
_ZN7Akonadi14ItemFetchScopeC2ERKS0_ at Base 4:4.3.4
@@ -1646,6 +1647,7 @@ libakonadi-kde.so.4 libakonadi-kde4 #MINVER#, kdepim-runtime
_ZNK7Akonadi14ItemFetchScope13allAttributesEv at Base 4:4.3.4
_ZNK7Akonadi14ItemFetchScope17ancestorRetrievalEv at Base 4:4.4.0
_ZNK7Akonadi14ItemFetchScope21fetchModificationTimeEv at Base 4:4.5.86
+ _ZNK7Akonadi14ItemFetchScope21ignoreRetrievalErrorsEv at Base 4:4.10.2
_ZNK7Akonadi14ItemFetchScope7isEmptyEv at Base 4:4.3.4
_ZNK7Akonadi14ItemFetchScope9cacheOnlyEv at Base 4:4.3.4
_ZNK7Akonadi15AgentTypeDialog10metaObjectEv at Base 4:4.3.4
diff --git a/debian/libkpimidentities4.symbols b/debian/libkpimidentities4.symbols
index 0e52e8b..cd0e94e 100644
--- a/debian/libkpimidentities4.symbols
+++ b/debian/libkpimidentities4.symbols
@@ -1,4 +1,4 @@
-# SymbolsHelper-Confirmed: 4:4.10.0 amd64
+# SymbolsHelper-Confirmed: 4:4.10.2 amd64
libkpimidentities.so.4 libkpimidentities4 #MINVER#
* Build-Depends-Package: kdepimlibs5-dev
_ZN14KPIMIdentities13IdentityCombo11qt_metacallEN11QMetaObject4CallEiPPv at Base 4:4.3.4
@@ -180,6 +180,7 @@ libkpimidentities.so.4 libkpimidentities4 #MINVER#
_ZNK14KPIMIdentities8Identity14isXFaceEnabledEv at Base 4:4.3.4
_ZNK14KPIMIdentities8Identity14mailingAllowedEv at Base 4:4.3.4
_ZNK14KPIMIdentities8Identity15smimeSigningKeyEv at Base 4:4.3.4
+ _ZNK14KPIMIdentities8Identity15verifyAkonadiIdERK7QString at Base 4:4.10.2
_ZNK14KPIMIdentities8Identity16pgpEncryptionKeyEv at Base 4:4.3.4
_ZNK14KPIMIdentities8Identity16useSignatureFileEv at Base 4:4.3.4
_ZNK14KPIMIdentities8Identity17signatureIsInlineEv at Base 4:4.3.4
diff --git a/debian/patches/dont_verify_akonadi_id.diff b/debian/patches/dont_verify_akonadi_id.diff
deleted file mode 100644
index 2431b34..0000000
--- a/debian/patches/dont_verify_akonadi_id.diff
+++ /dev/null
@@ -1,70 +0,0 @@
-Author: José Manuel Santamaría Lema <panfaust at gmail.com>
-Description: Revert "Fix potential error when identity path is a string (bad conversion)."
- This patch reverts this upstream commit:
- https://projects.kde.org/projects/kde/kdepimlibs/repository/revisions/33acd1d6
- .
- This commit should be reverted if we are using kmail 4.4.10, because it makes
- kmail forget the identity's settings of draft, templates and sent folders.
- -
- This patch must be removed if kdepimlibs are used with kmail 2, based on akonadi.
-
---- a/kpimidentities/identity.cpp
-+++ b/kpimidentities/identity.cpp
-@@ -437,20 +437,17 @@ QString Identity::dictionary() const
-
- QString Identity::templates() const
- {
-- const QString str = property( QLatin1String( s_templates ) ).toString();
-- return verifyAkonadiId(str);
-+ return property( QLatin1String( s_templates ) ).toString();
- }
-
- QString Identity::drafts() const
- {
-- const QString str = property( QLatin1String( s_drafts ) ).toString();
-- return verifyAkonadiId(str);
-+ return property( QLatin1String( s_drafts ) ).toString();
- }
-
- QString Identity::fcc() const
- {
-- const QString str = property( QLatin1String( s_fcc ) ).toString();
-- return verifyAkonadiId(str);
-+ return property( QLatin1String( s_fcc ) ).toString();
- }
-
- QString Identity::transport() const
-@@ -665,20 +662,6 @@ bool Identity::matchesEmailAddress( cons
- return false;
- }
-
--QString Identity::verifyAkonadiId(const QString& str) const
--{
-- if(str.isEmpty())
-- return str;
-- bool ok = false;
-- const qlonglong val = str.toLongLong(&ok);
-- Q_UNUSED(val);
-- if(ok) {
-- return str;
-- } else {
-- return QString();
-- }
--}
--
- void Identity::setAutocorrectionLanguage(const QString& language)
- {
- setProperty( s_autocorrectionLanguage, language );
---- a/kpimidentities/identity.h
-+++ b/kpimidentities/identity.h
-@@ -325,10 +325,6 @@ class KPIMIDENTITIES_EXPORT Identity
- void setUoid( uint aUoid );
-
- protected:
-- /** during migration when it failed it can be a string => not a qlonglong akonadi::id => fix it*/
-- /** remove it in kde5 */
-- QString verifyAkonadiId(const QString& str) const;
--
- /** @return true if the signature is read from the output of a command */
- bool signatureIsCommand() const;
-
diff --git a/debian/patches/series b/debian/patches/series
index a2cfaac..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-dont_verify_akonadi_id.diff
--
KDE PIM Libraries module packaging
More information about the pkg-kde-commits
mailing list