[SCM] pkg-kde.alioth.debian.org website branch, master, updated. 16586b32f49ae1eab1de19a07c670c3957a3ed6f

[Sandro Knauß]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/www.git;a=commitdiff;h=26c1850

The following commit has been merged in the master branch:
commit 26c185021b1ea34ce33f725b79da09935a4bd8b1
Author: Sandro Knauß <hefee at debian.org>
Date:   Sun Dec 17 14:42:43 2017 +0100

    update pim-build-deps graph
---
 files/pim-build-deps.dot | 54 +++++++++++++++++++++++++++++++++++++++---------
 files/pim-build-graph.py | 26 ++++++++++++++++++-----
 2 files changed, 65 insertions(+), 15 deletions(-)

diff --git a/files/pim-build-deps.dot b/files/pim-build-deps.dot
index 922dae6..3f6486f 100644
--- a/files/pim-build-deps.dot
+++ b/files/pim-build-deps.dot
@@ -1,29 +1,35 @@
 digraph pim {
   "kontactinterface" [fillcolor="darkgreen", style="filled"] ;
   "akonadi" [fillcolor="darkgreen", style="filled"] ;
-  "ktnef" [fillcolor="lightblue", style="filled"] ;
   "knotes" [fillcolor="lightblue", style="filled"] ;
   "libkf5grantleetheme" [fillcolor="darkgreen", style="filled"] ;
   "akonadiconsole" [fillcolor="lightblue", style="filled"] ;
+  "kalarm" [fillcolor="lightblue", style="filled"] ;
   "kmime" [fillcolor="darkgreen", style="filled"] ;
-  "kgpg" [fillcolor="lightblue", style="filled"] ;
-  "libkf5mailcommon" [fillcolor="lightblue", style="filled"] ;
+  "kmail-account-wizard" [fillcolor="lightblue", style="filled"] ;
   "kdepim-runtime" [fillcolor="lightblue", style="filled"] ;
+  "pim-data-exporter" [fillcolor="lightblue", style="filled"] ;
+  "mbox-importer" [fillcolor="lightblue", style="filled"] ;
   "grantlee-editor" [fillcolor="lightblue", style="filled"] ;
+  "kdepim-addons" [fillcolor="lightblue", style="filled"] ;
   "kleopatra" [fillcolor="lightblue", style="filled"] ;
   "kcontacts" [fillcolor="darkgreen", style="filled"] ;
   "kholidays" [fillcolor="darkgreen", style="filled"] ;
+  "korganizer" [fillcolor="lightblue", style="filled"] ;
+  "kaddressbook" [fillcolor="lightblue", style="filled"] ;
   "kdav" [fillcolor="darkgreen", style="filled"] ;
+  "akonadi-calendar-tools" [fillcolor="lightblue", style="filled"] ;
   "kpimtextedit" [fillcolor="darkgreen", style="filled"] ;
+  "kgpg" [fillcolor="lightblue", style="filled"] ;
+  "kmail" [fillcolor="lightblue", style="filled"] ;
   "kcalcore" [fillcolor="darkgreen", style="filled"] ;
   "kldap" [fillcolor="darkgreen", style="filled"] ;
   "syndication" [fillcolor="darkgreen", style="filled"] ;
   "blogilo" [fillcolor="lightblue", style="filled"] ;
   "akregator" [fillcolor="lightblue", style="filled"] ;
-  "libkf5ksieve" [fillcolor="lightblue", style="filled"] ;
-  "libkf5eventviews" [fillcolor="lightblue", style="filled"] ;
+  "pim-sieve-editor" [fillcolor="lightblue", style="filled"] ;
+  "kontact" [fillcolor="lightblue", style="filled"] ;
   "libkf5libkdepim" -> "libkf5mailimporter" ;
-  "akonadi-mime" -> "libkf5mailimporter" ;
   "kcalutils" -> "ktnef" ;
   "kcontacts" -> "ktnef" ;
   "kontactinterface" -> "knotes" ;
@@ -34,6 +40,7 @@ digraph pim {
   "syndication" -> "kblog" ;
   "libkf5calendarsupport" -> "akonadiconsole" ;
   "kf5-messagelib" -> "akonadiconsole" ;
+  "libkf5eventviews" -> "libkf5incidenceeditor" ;
   "kcalcore" -> "kalarmcal" ;
   "akonadi" -> "kalarmcal" ;
   "kholidays" -> "kalarmcal" ;
@@ -43,13 +50,21 @@ digraph pim {
   "libkf5gravatar" -> "kf5-messagelib" ;
   "kmbox" -> "kf5-messagelib" ;
   "kidentitymanagement" -> "kf5-messagelib" ;
+  "libkf5mailcommon" -> "kalarm" ;
+  "kcalutils" -> "kalarm" ;
+  "kalarmcal" -> "kalarm" ;
   "libkf5pimcommon" -> "libkf5gravatar" ;
   "kcalutils" -> "libkolab" ;
   "akonadi-notes" -> "libkolab" ;
   "kcontacts" -> "libkolab" ;
-  "akonadi-contacts" -> "kgpg" ;
+  "akonadi-mime" -> "akonadi-contacts" ;
+  "kcontacts" -> "akonadi-contacts" ;
   "libkf5mailimporter" -> "libkf5mailcommon" ;
   "kf5-messagelib" -> "libkf5mailcommon" ;
+  "kidentitymanagement" -> "kmail-account-wizard" ;
+  "libkf5libkleo" -> "kmail-account-wizard" ;
+  "kmailtransport" -> "kmail-account-wizard" ;
+  "libkf5pimcommon" -> "kmail-account-wizard" ;
   "akonadi-calendar" -> "kdepim-runtime" ;
   "libkgapi" -> "kdepim-runtime" ;
   "kalarmcal" -> "kdepim-runtime" ;
@@ -57,12 +72,19 @@ digraph pim {
   "libkf5pimcommon" -> "kdepim-runtime" ;
   "libkolab" -> "kdepim-runtime" ;
   "kmbox" -> "kdepim-runtime" ;
+  "libkf5mailcommon" -> "pim-data-exporter" ;
+  "libkf5mailcommon" -> "mbox-importer" ;
   "akonadi" -> "akonadi-mime" ;
   "kmime" -> "akonadi-mime" ;
   "kpimtextedit" -> "kidentitymanagement" ;
   "akonadi" -> "akonadi-notes" ;
   "kmime" -> "akonadi-notes" ;
   "kf5-messagelib" -> "grantlee-editor" ;
+  "ktnef" -> "kdepim-addons" ;
+  "libkf5incidenceeditor" -> "kdepim-addons" ;
+  "libkf5ksieve" -> "kdepim-addons" ;
+  "akonadi-import-wizard" -> "kdepim-addons" ;
+  "akonadi-notes" -> "kdepim-addons" ;
   "libkf5libkleo" -> "kleopatra" ;
   "kmime" -> "kleopatra" ;
   "libkf5grantleetheme" -> "kf5-kdepim-apps-libs" ;
@@ -75,8 +97,13 @@ digraph pim {
   "kimap" -> "libkf5pimcommon" ;
   "libkf5libkdepim" -> "libkf5pimcommon" ;
   "kpimtextedit" -> "libkf5pimcommon" ;
+  "libkf5incidenceeditor" -> "korganizer" ;
+  "akonadi-notes" -> "korganizer" ;
+  "kontactinterface" -> "korganizer" ;
   "kcalcore" -> "libkgapi" ;
   "kcontacts" -> "libkgapi" ;
+  "kf5-kdepim-apps-libs" -> "kaddressbook" ;
+  "kontactinterface" -> "kaddressbook" ;
   "akonadi-contacts" -> "libkf5libkdepim" ;
   "akonadi-search" -> "libkf5libkdepim" ;
   "kldap" -> "libkf5libkdepim" ;
@@ -84,8 +111,12 @@ digraph pim {
   "akonadi-calendar" -> "libkf5calendarsupport" ;
   "kholidays" -> "libkf5calendarsupport" ;
   "akonadi-mime" -> "kmailtransport" ;
-  "akonadi-mime" -> "akonadi-contacts" ;
-  "kcontacts" -> "akonadi-contacts" ;
+  "libkf5calendarsupport" -> "akonadi-calendar-tools" ;
+  "akonadi-contacts" -> "kgpg" ;
+  "ktnef" -> "kmail" ;
+  "kontactinterface" -> "kmail" ;
+  "libkf5mailcommon" -> "kmail" ;
+  "libkf5ksieve" -> "kmail" ;
   "kmime" -> "kmbox" ;
   "kmime" -> "kimap" ;
   "kblog" -> "blogilo" ;
@@ -95,12 +126,15 @@ digraph pim {
   "kf5-messagelib" -> "akregator" ;
   "kcalcore" -> "kcalutils" ;
   "kidentitymanagement" -> "kcalutils" ;
+  "libkf5ksieve" -> "pim-sieve-editor" ;
   "kidentitymanagement" -> "libkf5ksieve" ;
   "kmailtransport" -> "libkf5ksieve" ;
   "libkf5pimcommon" -> "libkf5ksieve" ;
+  "libkf5mailcommon" -> "akonadi-import-wizard" ;
+  "kf5-kdepim-apps-libs" -> "kontact" ;
+  "kontactinterface" -> "kontact" ;
   "akonadi-mime" -> "akonadi-search" ;
   "kcalcore" -> "akonadi-search" ;
   "kcontacts" -> "akonadi-search" ;
-  "libkf5libkdepim" -> "libkf5eventviews" ;
   "libkf5calendarsupport" -> "libkf5eventviews" ;
 }
diff --git a/files/pim-build-graph.py b/files/pim-build-graph.py
index a510d32..0d1d91c 100755
--- a/files/pim-build-graph.py
+++ b/files/pim-build-graph.py
@@ -75,15 +75,31 @@ def main():
         graph[name] = sDeps
 
     sgraph = {}     # minimized graph
-    for pkg in graph:
+    ograph = graph
+    fgraph = {}     # full dependency graph
+
+    for i in range(10):
+        changed = False
+        for pkg in ograph:
+            deps = copy.copy(ograph[pkg])
+            for dep in ograph[pkg]:
+                deps |= ograph[dep]
+            if deps != ograph[pkg]:
+                changed = True
+            fgraph[pkg] = deps
+
+        if not changed:
+            break
+        ograph = fgraph
+
+    for pkg in fgraph:
         deps = copy.copy(graph[pkg])
         for dep in graph[pkg]:
-            deps -= graph[dep]
+            deps -= fgraph[dep]
         sgraph[pkg] = deps
 
-
     print("digraph pim {")
-    for pkg in sgraph:
+    for pkg in graph:
         name = pkg
         sDeps = sgraph[pkg]
         if sDeps == set():
@@ -97,7 +113,7 @@ def main():
             else:
                 emit_nodecolor(name, 'lightblue')
 
-    for pkg in sgraph:
+    for pkg in graph:
         name = pkg
         sDeps = sgraph[pkg]
         for dep in sDeps:

-- 
pkg-kde.alioth.debian.org website