[SCM] kcoreaddons packaging branch, master, updated. 3b2a846b15831edf3b4aafa1e04a85de99ced044
Jonathan Riddell
jriddell-guest at moszumanska.debian.org
Tue Sep 23 16:00:51 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kcoreaddons.git;a=commitdiff;h=3b2a846
The following commit has been merged in the master branch:
commit 3b2a846b15831edf3b4aafa1e04a85de99ced044
Author: Jonathan Riddell <jr at jriddell.org>
Date: Tue Sep 23 18:00:48 2014 +0200
sync to Kubuntu 5.2.0 packaging
---
debian/changelog | 21 ++++++++++++++
debian/control | 8 ++++--
debian/libkf5coreaddons-dev.install | 1 +
debian/libkf5coreaddons5.install | 3 +-
debian/libkf5coreaddons5.symbols | 55 ++++++++++++++++++++++++++++++++-----
debian/rules | 2 +-
debian/watch | 3 +-
7 files changed, 80 insertions(+), 13 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 6ad5933..a84b01d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,24 @@
+kcoreaddons (5.2.0-0ubuntu1) utopic; urgency=medium
+
+ * New upstream release
+ * Use pkg-kde-tools version 3 scripts
+ * dev package Depends on libkf5service-dev used by KF5CoreAddonsTargets.cmake
+ * desktoptojson moved from libkf5service-dev to here
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Mon, 22 Sep 2014 19:45:22 +0200
+
+kcoreaddons (5.1.0-0ubuntu1) utopic; urgency=medium
+
+ [ José Manuel Santamaría Lema ]
+ * Update libraries *.install paths so a soname bump doesn't go
+ unnoticed.
+
+ [ Scarlett Clark ]
+ * New upstream release
+ * Patch symbols with batchpatch
+
+ -- Scarlett Clark <scarlett at scarlettgatelyclark.com> Tue, 05 Aug 2014 17:14:50 +0200
+
kcoreaddons (5.0.0-0ubuntu1) utopic; urgency=medium
[ Jonathan Riddell ]
diff --git a/debian/control b/debian/control
index 2e33e1e..7d6858f 100644
--- a/debian/control
+++ b/debian/control
@@ -4,9 +4,9 @@ Maintainer: Debian/Ubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
Uploaders: Jonathan Riddell <jriddell at ubuntu.com>,
Maximiliano Curia <maxy at debian.org>
Build-Depends: cmake,
- debhelper (>= 8.0.0),
- extra-cmake-modules (>= 1.0.0),
- pkg-kde-tools,
+ debhelper (>= 9.0.0),
+ extra-cmake-modules (>= 1.2.0),
+ pkg-kde-tools (>= 0.15.15ubuntu1~),
qt5-default,
qtbase5-dev,
qttools5-dev,
@@ -21,6 +21,8 @@ Package: libkf5coreaddons-dev
Section: libdevel
Architecture: any
Depends: libkf5coreaddons5 (= ${binary:Version}), qtbase5-dev
+Replaces: libkf5service-dev (<= 5.2.0)
+Breaks: libkf5service-dev (<= 5.2.0)
Description: KDE Frameworks 5 addons to QtCore - development files
KCoreAddons provides classes built on top of QtCore to perform various tasks
such as manipulating mime types, autosaving files, creating backup files,
diff --git a/debian/libkf5coreaddons-dev.install b/debian/libkf5coreaddons-dev.install
index 79d2248..0d65411 100644
--- a/debian/libkf5coreaddons-dev.install
+++ b/debian/libkf5coreaddons-dev.install
@@ -3,3 +3,4 @@ usr/lib/*/cmake/*
usr/lib/*/libKF5CoreAddons.so
usr/lib/*/qt5/mkspecs/modules/*
usr/share/mime/packages/kde5.xml
+usr/bin/desktoptojson
diff --git a/debian/libkf5coreaddons5.install b/debian/libkf5coreaddons5.install
index a2bb441..6602980 100644
--- a/debian/libkf5coreaddons5.install
+++ b/debian/libkf5coreaddons5.install
@@ -1 +1,2 @@
-usr/lib/*/libKF5CoreAddons.so.5*
+usr/lib/*/libKF5CoreAddons.so.5
+usr/lib/*/libKF5CoreAddons.so.5.*
diff --git a/debian/libkf5coreaddons5.symbols b/debian/libkf5coreaddons5.symbols
index 66f6d6c..74e29cd 100644
--- a/debian/libkf5coreaddons5.symbols
+++ b/debian/libkf5coreaddons5.symbols
@@ -1,4 +1,4 @@
-# SymbolsHelper-Confirmed: 5.0.0 amd64
+# SymbolsHelper-Confirmed: 5.2.0 i386
libKF5CoreAddons.so.5 libkf5coreaddons5 #MINVER#
_ZN10KAboutData10addLicenseEN13KAboutLicense10LicenseKeyE at Base 4.100.0
_ZN10KAboutData10pluginDataERK7QString at Base 4.97.0
@@ -128,11 +128,14 @@ libKF5CoreAddons.so.5 libkf5coreaddons5 #MINVER#
_ZN13KCompositeJobD1Ev at Base 4.97.0
_ZN13KCompositeJobD2Ev at Base 4.97.0
_ZN13KPluginLoader10findPluginERK7QString at Base 4.99.0
+ _ZN13KPluginLoader11findPluginsERK7QStringSt8functionIFbRK15KPluginMetaDataEE at Base 5.2.0
_ZN13KPluginLoader11qt_metacallEN11QMetaObject4CallEiPPv at Base 4.99.0
_ZN13KPluginLoader11qt_metacastEPKc at Base 4.99.0
_ZN13KPluginLoader12setLoadHintsE6QFlagsIN8QLibrary8LoadHintEE at Base 4.99.0
+ _ZN13KPluginLoader13forEachPluginERK7QStringSt8functionIFvS2_EE at Base 5.2.0
_ZN13KPluginLoader13pluginVersionEv at Base 4.99.0
_ZN13KPluginLoader16staticMetaObjectE at Base 4.99.0
+ _ZN13KPluginLoader18instantiatePluginsERK7QStringSt8functionIFbRK15KPluginMetaDataEEP7QObject at Base 5.2.0
_ZN13KPluginLoader4loadEv at Base 4.99.0
_ZN13KPluginLoader6unloadEv at Base 4.99.0
_ZN13KPluginLoader7factoryEv at Base 4.99.0
@@ -198,6 +201,24 @@ libKF5CoreAddons.so.5 libkf5coreaddons5 #MINVER#
_ZN14KStringHandler9perlSplitERK7QRegExpRK7QStringi at Base 4.97.0
_ZN14KStringHandler9perlSplitERK7QStringS2_i at Base 4.97.0
_ZN15KFileSystemType14fileSystemTypeERK7QString at Base 4.97.0
+ _ZN15KPluginMetaData14readStringListERK11QJsonObjectRK7QString at Base 5.2.0
+ _ZN15KPluginMetaData19readTranslatedValueERK11QJsonObjectRK7QStringRK10QJsonValue at Base 5.2.0
+ _ZN15KPluginMetaData20readTranslatedStringERK11QJsonObjectRK7QStringS5_ at Base 5.2.0
+ _ZN15KPluginMetaDataC1ERK11QJsonObjectRK7QString at Base 5.2.0
+ _ZN15KPluginMetaDataC1ERK13KPluginLoader at Base 5.2.0
+ _ZN15KPluginMetaDataC1ERK13QPluginLoader at Base 5.2.0
+ _ZN15KPluginMetaDataC1ERK7QString at Base 5.2.0
+ _ZN15KPluginMetaDataC1ERKS_ at Base 5.2.0
+ _ZN15KPluginMetaDataC1Ev at Base 5.2.0
+ _ZN15KPluginMetaDataC2ERK11QJsonObjectRK7QString at Base 5.2.0
+ _ZN15KPluginMetaDataC2ERK13KPluginLoader at Base 5.2.0
+ _ZN15KPluginMetaDataC2ERK13QPluginLoader at Base 5.2.0
+ _ZN15KPluginMetaDataC2ERK7QString at Base 5.2.0
+ _ZN15KPluginMetaDataC2ERKS_ at Base 5.2.0
+ _ZN15KPluginMetaDataC2Ev at Base 5.2.0
+ _ZN15KPluginMetaDataD1Ev at Base 5.2.0
+ _ZN15KPluginMetaDataD2Ev at Base 5.2.0
+ _ZN15KPluginMetaDataaSERKS_ at Base 5.2.0
_ZN15KRandomSequence7Private4drawEv at Base 4.97.0
_ZN15KRandomSequence7getBoolEv at Base 4.97.0
_ZN15KRandomSequence7getLongEm at Base 4.97.0
@@ -227,9 +248,6 @@ libKF5CoreAddons.so.5 libkf5coreaddons5 #MINVER#
_ZN17Kdelibs4MigrationD2Ev at Base 4.99.0
_ZN18KCharMacroExpander16expandPlainMacroERK7QStringiR11QStringList at Base 4.97.0
_ZN18KCharMacroExpander18expandEscapedMacroERK7QStringiR11QStringList at Base 4.97.0
- _ZN18KCharMacroExpanderD0Ev at Base 4.97.0
- _ZN18KCharMacroExpanderD1Ev at Base 4.97.0
- _ZN18KCharMacroExpanderD2Ev at Base 4.97.0
_ZN18KMacroExpanderBase12expandMacrosER7QString at Base 4.97.0
_ZN18KMacroExpanderBase13setEscapeCharE5QChar at Base 4.97.0
_ZN18KMacroExpanderBase16expandPlainMacroERK7QStringiR11QStringList at Base 4.97.0
@@ -243,9 +261,6 @@ libKF5CoreAddons.so.5 libkf5coreaddons5 #MINVER#
_ZN18KMacroExpanderBaseD2Ev at Base 4.97.0
_ZN18KWordMacroExpander16expandPlainMacroERK7QStringiR11QStringList at Base 4.97.0
_ZN18KWordMacroExpander18expandEscapedMacroERK7QStringiR11QStringList at Base 4.97.0
- _ZN18KWordMacroExpanderD0Ev at Base 4.97.0
- _ZN18KWordMacroExpanderD1Ev at Base 4.97.0
- _ZN18KWordMacroExpanderD2Ev at Base 4.97.0
_ZN20KCompositeJobPrivateC1Ev at Base 4.97.0
_ZN20KCompositeJobPrivateC2Ev at Base 4.97.0
_ZN20KCompositeJobPrivateD0Ev at Base 4.97.0
@@ -271,6 +286,13 @@ libKF5CoreAddons.so.5 libkf5coreaddons5 #MINVER#
_ZN20KJobTrackerInterfaceD0Ev at Base 4.97.0
_ZN20KJobTrackerInterfaceD1Ev at Base 4.97.0
_ZN20KJobTrackerInterfaceD2Ev at Base 4.97.0
+ _ZN22Kdelibs4ConfigMigrator10setUiFilesERK11QStringList at Base 5.2.0
+ _ZN22Kdelibs4ConfigMigrator14setConfigFilesERK11QStringList at Base 5.2.0
+ _ZN22Kdelibs4ConfigMigrator7migrateEv at Base 5.2.0
+ _ZN22Kdelibs4ConfigMigratorC1ERK7QString at Base 5.2.0
+ _ZN22Kdelibs4ConfigMigratorC2ERK7QString at Base 5.2.0
+ _ZN22Kdelibs4ConfigMigratorD1Ev at Base 5.2.0
+ _ZN22Kdelibs4ConfigMigratorD2Ev at Base 5.2.0
_ZN4KJob10emitResultEv at Base 4.97.0
_ZN4KJob10setPercentEm at Base 4.97.0
_ZN4KJob11descriptionEPS_RK7QStringRK5QPairIS1_S1_ES7_ at Base 4.97.0
@@ -464,6 +486,25 @@ libKF5CoreAddons.so.5 libkf5coreaddons5 #MINVER#
_ZNK14KJobUiDelegate28isAutoWarningHandlingEnabledEv at Base 4.97.0
_ZNK14KJobUiDelegate3jobEv at Base 4.97.0
_ZNK14KPluginFactory10metaObjectEv at Base 4.99.0
+ _ZNK15KPluginMetaData10rootObjectEv at Base 5.2.0
+ _ZNK15KPluginMetaData11descriptionEv at Base 5.2.0
+ _ZNK15KPluginMetaData11instantiateEv at Base 5.2.0
+ _ZNK15KPluginMetaData12dependenciesEv at Base 5.2.0
+ _ZNK15KPluginMetaData12serviceTypesEv at Base 5.2.0
+ _ZNK15KPluginMetaData18isEnabledByDefaultEv at Base 5.2.0
+ _ZNK15KPluginMetaData4nameEv at Base 5.2.0
+ _ZNK15KPluginMetaData5valueERK7QStringS2_ at Base 5.2.0
+ _ZNK15KPluginMetaData7authorsEv at Base 5.2.0
+ _ZNK15KPluginMetaData7isValidEv at Base 5.2.0
+ _ZNK15KPluginMetaData7licenseEv at Base 5.2.0
+ _ZNK15KPluginMetaData7rawDataEv at Base 5.2.0
+ _ZNK15KPluginMetaData7versionEv at Base 5.2.0
+ _ZNK15KPluginMetaData7websiteEv at Base 5.2.0
+ _ZNK15KPluginMetaData8categoryEv at Base 5.2.0
+ _ZNK15KPluginMetaData8fileNameEv at Base 5.2.0
+ _ZNK15KPluginMetaData8iconNameEv at Base 5.2.0
+ _ZNK15KPluginMetaData8pluginIdEv at Base 5.2.0
+ _ZNK15KPluginMetaDataeqERKS_ at Base 5.2.0
_ZNK16KSharedDataCache14evictionPolicyEv at Base 4.97.0
_ZNK16KSharedDataCache4findERK7QStringP10QByteArray at Base 4.97.0
_ZNK16KSharedDataCache8containsERK7QString at Base 4.97.0
diff --git a/debian/rules b/debian/rules
index 520187f..9606ffb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@
#!/usr/bin/make -f
-include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
+include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
override_dh_strip:
$(overridden_command) --dbg-package=libkf5coreaddons5-dbg
diff --git a/debian/watch b/debian/watch
index 80aac88..3e56b97 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,3 @@
version=3
-http://download.kde.org/stable/frameworks/([\d.]+)/kcoreaddons-([\d.]+)\.tar\.xz
+http://download.kde.org/unstable/frameworks/([\d\.]*)/kcoreaddons-(.*)\.tar\.xz
+http://download.kde.org/stable/frameworks/([\d\.]*)/kcoreaddons-(.*)\.tar\.xz
--
kcoreaddons packaging
More information about the pkg-kde-commits
mailing list