[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kde-build-metadata] /: Remove duplicate dependencies on kdoctools (these are provided via kf5umbrel
From:       Ben Cooksley <null () kde ! org>
Date:       2018-09-14 6:54:21
Message-ID: E1g0hzh-0001uM-K5 () code ! kde ! org
[Download RAW message or body]

Git commit 7d0a0be87dbdc1e0736ad5e4e0ddb060fa5e6fec by Ben Cooksley.
Committed on 14/09/2018 at 06:53.
Pushed by bcooksley into branch 'master'.

Remove duplicate dependencies on kdoctools (these are provided via kf5umbrella)
Also, sync dependencies from master to stable

M  +0    -12   dependency-data-kf5-qt5
M  +9    -4    dependency-data-stable-kf5-qt5

https://commits.kde.org/kde-build-metadata/7d0a0be87dbdc1e0736ad5e4e0ddb060fa5e6fec

diff --git a/dependency-data-kf5-qt5 b/dependency-data-kf5-qt5
index 48555ca..f8f1944 100644
--- a/dependency-data-kf5-qt5
+++ b/dependency-data-kf5-qt5
@@ -572,7 +572,6 @@ kde/pim/kmbox: kde/pim/kmime
 kde/pim/ktnef: kde/pim/kcalcore
 kde/pim/ktnef: kde/pim/kcalutils
 kde/pim/ktnef: kde/pim/kcontacts
-kde/pim/ktnef: frameworks/kdoctools
 
 # KCalUtils
 kde/pim/kcalutils: kde/pim/kcalcore
@@ -621,7 +620,6 @@ kde/pim/libkleo: kde/pim/kpimtextedit
 # Kleopatra
 kde/pim/kleopatra: kde/pim/kmime
 kde/pim/kleopatra: kde/pim/libkleo
-kde/pim/kleopatra: frameworks/kdoctools
 
 # General PIM libraries
 kde/pim/libkdepim: kde/pim/akonadi
@@ -726,7 +724,6 @@ kde/pim/kmail: kde/pim/libksieve
 kde/pim/kmail: kde/pim/mailcommon
 kde/pim/kmail: kde/pim/messagelib
 kde/pim/kmail: kde/pim/pimcommon
-kde/pim/kmail: frameworks/kdoctools
 
 # KAddressbook
 kde/pim/kaddressbook: kde/pim/akonadi
@@ -740,7 +737,6 @@ kde/pim/kaddressbook: kde/pim/libkleo
 kde/pim/kaddressbook: kde/pim/pimcommon
 
 # KNotes
-kde/pim/knotes: frameworks/kdoctools
 kde/pim/knotes: kde/pim/akonadi
 kde/pim/knotes: kde/pim/akonadi-notes
 kde/pim/knotes: kde/pim/akonadi-search
@@ -790,7 +786,6 @@ kde/pim/korganizer: kde/pim/kontactinterface
 kde/pim/korganizer: kde/pim/kpimtextedit
 kde/pim/korganizer: kde/pim/libkdepim
 kde/pim/korganizer: kde/pim/pimcommon
-kde/pim/korganizer: frameworks/kdoctools
 
 # Akregator
 kde/pim/akregator: kde/pim/akonadi-mime
@@ -802,7 +797,6 @@ kde/pim/akregator: kde/pim/libkleo
 kde/pim/akregator: kde/pim/messagelib
 kde/pim/akregator: kde/pim/pimcommon
 kde/pim/akregator: frameworks/syndication
-kde/pim/akregator: frameworks/kdoctools
 
 # KAlarm
 kde/pim/kalarm: frameworks/kholidays
@@ -821,7 +815,6 @@ kde/pim/kalarm: kde/pim/kpimtextedit
 kde/pim/kalarm: kde/pim/libkdepim
 kde/pim/kalarm: kde/pim/mailcommon
 kde/pim/kalarm: kde/pim/pimcommon
-kde/pim/kalarm: frameworks/kdoctools
 
 # Sieve Editor UI
 kde/pim/pim-sieve-editor: kde/pim/kimap
@@ -829,7 +822,6 @@ kde/pim/pim-sieve-editor: kde/pim/kmailtransport
 kde/pim/pim-sieve-editor: kde/pim/kpimtextedit
 kde/pim/pim-sieve-editor: kde/pim/libksieve
 kde/pim/pim-sieve-editor: kde/pim/pimcommon
-kde/pim/pim-sieve-editor: frameworks/kdoctools
 
 # KMail Account Wizard
 kde/pim/kmail-account-wizard: kde/pim/akonadi
@@ -852,7 +844,6 @@ kde/pim/pim-data-exporter: kde/pim/kpimtextedit
 kde/pim/pim-data-exporter: kde/pim/libkdepim
 kde/pim/pim-data-exporter: kde/pim/mailcommon
 kde/pim/pim-data-exporter: kde/pim/pimcommon
-kde/pim/pim-data-exporter: frameworks/kdoctools
 
 # MBox Importer
 kde/pim/mbox-importer: kde/pim/akonadi
@@ -877,7 +868,6 @@ kde/pim/kontact: kde/pim/kdepim-apps-libs
 kde/pim/kontact: kde/pim/kontactinterface
 kde/pim/kontact: kde/pim/kpimtextedit
 kde/pim/kontact: kde/pim/libkdepim
-kde/pim/kontact: frameworks/kdoctools
 
 # Akonadi Import Wizard
 kde/pim/akonadi-import-wizard: kde/pim/akonadi
@@ -889,7 +879,6 @@ kde/pim/akonadi-import-wizard: kde/pim/mailcommon
 kde/pim/akonadi-import-wizard: kde/pim/mailimporter
 kde/pim/akonadi-import-wizard: kde/pim/messagelib
 kde/pim/akonadi-import-wizard: kde/pim/pimcommon
-kde/pim/akonadi-import-wizard: frameworks/kdoctools
 
 # Akonadi Calendar Tools
 kde/pim/akonadi-calendar-tools: frameworks/kdelibs4support
@@ -918,7 +907,6 @@ kde/pim/kdepim-runtime: kde/pim/kmbox
 kde/pim/kdepim-runtime: kde/pim/kmime
 kde/pim/kdepim-runtime: kde/pim/libkgapi
 kde/pim/kdepim-runtime: kde/pim/pimcommon
-kde/pim/kdepim-runtime: frameworks/kdoctools
 
 # PIM Addons
 kde/pim/kdepim-addons: kde/pim/akonadi
diff --git a/dependency-data-stable-kf5-qt5 b/dependency-data-stable-kf5-qt5
index f6dad56..f8f1944 100644
--- a/dependency-data-stable-kf5-qt5
+++ b/dependency-data-stable-kf5-qt5
@@ -690,7 +690,6 @@ kde/pim/messagelib: kde/pim/akonadi-search
 kde/pim/messagelib: kde/pim/grantleetheme
 kde/pim/messagelib: kde/pim/kcontacts
 kde/pim/messagelib: kde/pim/kdepim-apps-libs
-kde/pim/messagelib: kde/pim/kdepim-runtime #needed for unit tests
 kde/pim/messagelib: kde/pim/kidentitymanagement
 kde/pim/messagelib: kde/pim/kldap
 kde/pim/messagelib: kde/pim/kmailtransport
@@ -1057,6 +1056,7 @@ kde/kdeedu/analitza: -frameworks/kf5umbrella
 
 # KAlgebra
 kde/kdeedu/kalgebra: -frameworks/kf5umbrella
+kde/kdeedu/kalgebra: frameworks/kcoreaddons
 kde/kdeedu/kalgebra: frameworks/ki18n
 kde/kdeedu/kalgebra: frameworks/kirigami
 kde/kdeedu/kalgebra: kde/kdeedu/analitza
@@ -1085,6 +1085,10 @@ kde/kdeedu/minuet: frameworks/ki18n
 kde/kdeedu/minuet: frameworks/kcrash
 kde/kdeedu/minuet: frameworks/kdoctools
 
+# GCompris
+extragear/edu/gcompris: -frameworks/kf5umbrella
+extragear/edu/gcompris: frameworks/kdoctools
+
 # KDE Network!
 # KGet
 kde/kdenetwork/kget: kdesupport/qca
@@ -1153,6 +1157,10 @@ extragear/utils/okteta: kdesupport/qca
 # Dolphin Plugins
 kde/kdesdk/dolphin-plugins: kde/applications/dolphin
 
+# Kirigami Gallery
+kde/kdesdk/kirigami-gallery: -frameworks/kf5umbrella
+kde/kdesdk/kirigami-gallery: frameworks/kirigami
+
 # Web Development Tools!
 
 # Bindings!
@@ -1224,7 +1232,6 @@ extragear/pim/zanshin: kde/pim/kontactinterface
 extragear/pim/zanshin: kde/pim/kdepim-runtime
 
 # Extragear SDK
-extragear/sdk/plasma-sdk: kde/workspace/plasma-workspace
 extragear/sdk/massif-visualizer: extragear/graphics/kdiagram
 extragear/sdk/heaptrack: extragear/graphics/kdiagram
 
@@ -1238,8 +1245,6 @@ extragear/utils/plasma-mycroft: frameworks/kcoreaddons
 extragear/utils/plasma-mycroft: frameworks/plasma-framework
 extragear/utils/plasma-mycroft: frameworks/ki18n
 extragear/utils/plasma-mycroft: frameworks/knotifications
-extragear/utils/plasma-mycroft: kde/workspace/plasma-workspace
-extragear/utils/plasma-mycroft: extragear/sdk/plasma-sdk
 
 ### KDevelop ###
 
[prev in list] [next in list] [prev in thread] [next in thread]