Index: flumotion-0.5.3/flumotion/scenario/live/Makefile.am
===================================================================
--- flumotion-0.5.3/flumotion/scenario/live/Makefile.am	(revision 7757)
+++ flumotion-0.5.3/flumotion/scenario/live/Makefile.am	(working copy)
@@ -4,6 +4,10 @@
 component_PYTHON = \
 	__init__.py \
 	wizard_gtk.py
+
+component_DATA = \
+	live.xml
+
 TAGS_FILES = $(component_PYTHON)
 
 clean-local:
Index: flumotion-0.5.3/flumotion/scenario/live/live.xml
===================================================================
--- flumotion-0.5.3/flumotion/scenario/live/live.xml	(revision 0)
+++ flumotion-0.5.3/flumotion/scenario/live/live.xml	(revision 0)
@@ -0,0 +1,26 @@
+<registry>
+    <scenarios>
+        <scenario type="live-scenario"
+                  base="flumotion/scenario/live"
+                  _description="Creates a live stream.">
+            <entries>
+                <entry type="wizard" location="wizard_gtk.py"
+                       function="LiveAssistantPlugin" />
+            </entries>
+        </scenario>
+    </scenarios>
+    <bundles>
+        <bundle name="live-scenario-base">
+            <dependencies>
+                <dependency name="scenario-base"/>
+                <dependency name="scenario-steps"/>
+            </dependencies>
+            <directories>
+                <directory name="flumotion/scenario/live">
+                    <filename location="wizard_gtk.py" />
+                    <filename location="__init__.py" />
+                </directory>
+            </directories>
+        </bundle>
+    </bundles>
+</registry>
Index: flumotion-0.5.3/flumotion/scenario/scenario.xml
===================================================================
--- flumotion-0.5.3/flumotion/scenario/scenario.xml	(revision 0)
+++ flumotion-0.5.3/flumotion/scenario/scenario.xml	(revision 0)
@@ -0,0 +1,11 @@
+<registry>
+    <bundles>
+        <bundle name="scenario-base">
+            <directories>
+                <directory name="flumotion/scenario">
+                    <filename location="__init__.py" />
+                </directory>
+            </directories>
+        </bundle>
+    </bundles>
+</registry>
Index: flumotion-0.5.3/flumotion/scenario/ondemand/ondemand.xml
===================================================================
--- flumotion-0.5.3/flumotion/scenario/ondemand/ondemand.xml	(revision 0)
+++ flumotion-0.5.3/flumotion/scenario/ondemand/ondemand.xml	(revision 0)
@@ -0,0 +1,26 @@
+<registry>
+    <scenarios>
+        <scenario type="ondemand-scenario"
+                  base="flumotion/scenario/ondemand"
+                  _description="Creates an ondemand stream.">
+            <entries>
+                <entry type="wizard" location="wizard_gtk.py"
+                       function="OndemandAssistantPlugin" />
+            </entries>
+        </scenario>
+    </scenarios>
+    <bundles>
+        <bundle name="ondemand-scenario-base">
+            <dependencies>
+                <dependency name="scenario-base" />
+                <dependency name="scenario-steps"/>
+            </dependencies>
+            <directories>
+                <directory name="flumotion/scenario/ondemand">
+                    <filename location="wizard_gtk.py" />
+                    <filename location="__init__.py" />
+                </directory>
+            </directories>
+        </bundle>
+    </bundles>
+</registry>
Index: flumotion-0.5.3/flumotion/scenario/ondemand/Makefile.am
===================================================================
--- flumotion-0.5.3/flumotion/scenario/ondemand/Makefile.am	(revision 7757)
+++ flumotion-0.5.3/flumotion/scenario/ondemand/Makefile.am	(working copy)
@@ -5,6 +5,9 @@
 		__init__.py \
 		wizard_gtk.py
 
+component_DATA = \
+	ondemand.xml
+
 TAGS_FILES = $(component_PYTHON)
 
 clean-local:
Index: flumotion-0.5.3/flumotion/scenario/Makefile.am
===================================================================
--- flumotion-0.5.3/flumotion/scenario/Makefile.am	(revision 7757)
+++ flumotion-0.5.3/flumotion/scenario/Makefile.am	(working copy)
@@ -4,6 +4,9 @@
 component_PYTHON = \
 	__init__.py
 
+component_DATA = \
+	scenario.xml
+
 TAGS_FILES = $(component_PYTHON)
 
 clean-local:
Index: flumotion-0.5.3/flumotion/scenario/steps/Makefile.am
===================================================================
--- flumotion-0.5.3/flumotion/scenario/steps/Makefile.am	(revision 7757)
+++ flumotion-0.5.3/flumotion/scenario/steps/Makefile.am	(working copy)
@@ -13,6 +13,9 @@
 	shout2steps.py \
 	summarysteps.py
 
+component_DATA = \
+	steps.xml
+
 TAGS_FILES = $(component_PYTHON)
 
 clean-local:
Index: flumotion-0.5.3/flumotion/scenario/steps/steps.xml
===================================================================
--- flumotion-0.5.3/flumotion/scenario/steps/steps.xml	(revision 0)
+++ flumotion-0.5.3/flumotion/scenario/steps/steps.xml	(revision 0)
@@ -0,0 +1,23 @@
+<registry>
+    <bundles>
+        <bundle name="scenario-steps">
+            <dependencies>
+                <dependency name="scenario-base"/>
+            </dependencies>
+            <directories>
+                <directory name="flumotion/scenario/steps">
+                    <filename location="consumptionsteps.py"/>
+                    <filename location="conversionsteps.py"/>
+                    <filename location="diskersteps.py"/>
+                    <filename location="httpstreamersteps.py"/>
+                    <filename location="__init__.py"/>
+                    <filename location="ondemandstep.py"/>
+                    <filename location="productionsteps.py"/>
+                    <filename location="shout2steps.py"/>
+                    <filename location="summarysteps.py"/>
+                    <filename location="licensestep.py"/>
+                </directory>
+            </directories>
+        </bundle>
+    </bundles>
+</registry>