[pkg-fso-commits] [SCM] Various non-packaged files branch, master, updated. 131689058bfe2ea6fd39f4bcb8a40fc144767af1

[Jonas Smedegaard]

The following commit has been merged in the master branch:
commit 131689058bfe2ea6fd39f4bcb8a40fc144767af1
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sun Jun 13 23:14:29 2010 +0200

    Restructure pkgdeps graph: Group FSO, FSO2 and SHR packages (instead of adding proposed metapackages), and add (greyed out) not yet official packages.

diff --git a/pkgdeps.txt b/pkgdeps.txt
index b11d977..6029c88 100644
--- a/pkgdeps.txt
+++ b/pkgdeps.txt
@@ -7,62 +7,85 @@
 # or
 #   graph-easy --dot pkgdeps.txt | dot -Tpng:cairo > pkgdeps.png; optipng pkgdeps.png
 
-# FSO-specific libraries
+# -> FSO / FSO2
 [ libfso-glib0 ] -> [ fso-usaged ]
 [ libfso-glib0 ] -> [ libfsoresource0 ]
-[ libfso-glib0 ] -> [ libphone-ui-20100517 ]
-[ libfso-glib0 ] -> [ phonefsod ]
-[ libfsobasics0 ] -> [ fso-abyss ]
-[ libfsobasics0 ] -> [ fso-usaged ]
+[ libfsobasics0 ] -> [ libfsotransport0 ]
 [ libfsobasics0 ] -> [ libfsoframework0 ]
 [ libfsobasics0 ] -> [ libfsoresource0 ]
-[ libfsobasics0 ] -> [ libfsotransport0 ]
 [ libfsobasics0 ] -> [ libgsm0710mux0 ]
-[ libfsoframework0 ] -> [ fso-usaged ]
-[ libfsoframework0 ] -> [ libfsoresource0 ]
+[ libfsobasics0 ] -> [ fso-abyss ]
+[ libfsobasics0 ] -> [ fso-usaged ]
+[ libfsobasics0 ] ...> [ fso-gsmd ]
 [ libfsotransport0 ] -> [ fso-abyss ]
 [ libfsotransport0 ] -> [ libgsm0710mux0 ]
+[ libfsotransport0 ] ...> [ fso-gsmd ]
+[ libfsoframework0 ] -> [ fso-usaged ]
+[ libfsoframework0 ] -> [ libfsoresource0 ]
+[ libfsoframework0 ] ...> [ fso-gsmd ]
+[ libfsoresource0 ] ...> [ fso-gsmd ]
 [ libgsm0710-0 ] -> [ libgsm0710mux0 ]
-[ libgsm0710mux0 ] -> [ fso-abyss ]
-[ libframeworkd-glib-20100512 ] -> [ libphone-ui-20100517 ]
+[ libgsm0710mux0 ] ...> [ fso-gsmd ]
+[ fso-gsm0710muxd ] -> [ fso-frameworkd ]
+[ fso-frameworkd ] -> [ fso-gpsd ]
+
+( deprecated FSO DBus ABI
+[ fso-abyss ]
+[ fso-gpsd ]
+)
+
+( FSO2 cornucopia DBus ABI
+[ fso-usaged ]
+[ fso-gsmd ] { border: dotted; color: grey }
+)
 
-# SHR-specific libraries
+# -> SHR
+[ libfso-glib0 ] -> [ libphone-ui-20100517 ]
+[ libfso-glib0 ] -> [ phonefsod ]
+[ libframeworkd-glib-20100512 ] -> [ libphone-ui-20100517 ]
 [ libphone-ui-common ] -> [ libphone-ui-20100517 ]
 [ libphone-utils0 ] -> [ libphone-ui-20100517 ]
 [ libphone-utils0 ] -> [ python-phoneutils ]
+[ fso-frameworkd ] -> [ phonefsod ]
+[ fso-gsmd ] ...> [ phonefsod ]
+[ libphone-ui-20100517 ] ...> [ phoneuid-shr ]
 
-# Zhone-specific libraries
-[ zhone-illume-glue ] -> [ zhone ]
+( SHR DBus ABI
+[ phonefsod ]
+[ phoneuid-shr ] { border: dotted; color: grey }
+)
 
-# FSO-specific daemons
-[ fso-gsm0710muxd ] -> [ fso-frameworkd ]
-[ fso-frameworkd ] -> [ phonefsod ]
+[ fso-sounds-yue-base ] -> [ fso-sounds-yue-full ]
 
+# -> config alternatives
 [ fso-sounds-none ] -> [ fso-config-general ]
 [ fso-sounds-none ] -> [ fso-config-gta01 ]
 [ fso-sounds-none ] -> [ fso-config-gta02 ]
 [ fso-sounds-yue-base ] -> [ fso-config-general ]
 [ fso-sounds-yue-base ] -> [ fso-config-gta01 ]
 [ fso-sounds-yue-base ] -> [ fso-config-gta02 ]
-[ fso-sounds-yue-base ] -> [ fso-sounds-yue-full ]
 
 [ fso-frameworkd ] -> [ fso-config-general ]
 [ fso-frameworkd ] -> [ fso-config-gta01 ]
 [ fso-frameworkd ] -> [ fso-config-gta02 ]
 
-# Misc.
-[ fso-frameworkd ] -> [ fso-gpsd ]
-[ fso-frameworkd ] -> [ openbmap-logger ]
-[ nodm ]
-[ xserver-xorg-video-glamo ]
-
 ( config alternatives:
 [ fso-config-general ]
 [ fso-config-gta01 ]
 [ fso-config-gta02 ]
 )
 
+[ nodm ]
+[ xserver-xorg-video-glamo ]
+
+# -> Applications
+[ fso-frameworkd ] -> [ openbmap-logger ]
+[ zhone-illume-glue ] -> [ zhone ]
+[ phonefsod ] ...> [ shr-dialer ]
+[ phoneuid-shr ] ...> [ shr-dialer ]
+
 ( Applications:
+[ shr-dialer ] { border: dotted; color: grey }
 [ zhone ]
 [ openbmap-logger ]
 [ intone ]
@@ -70,3 +93,8 @@
 [ vala-terminal ]
 [ mokomaze ]
 )
+
+# hacks to force stack order
+#[ fso-abyss ] ...> { style: invisible } [ zhone ]
+[ fso-gsmd ] ...> { style: invisible } [ zhone ]
+[ fso-gsmd ] ...> { style: invisible } [ phonefsod ]

-- 
Various non-packaged files