From 3a8b428ae6aa3e8923c514d63bd6cade1bdda2cf Mon Sep 17 00:00:00 2001
From: Gunnar Wrobel <p@rdus.de>
Date: Wed, 26 Jan 2011 11:08:53 +0100
Subject: [PATCH] Fixed omission of "content/". The lib part of "content" needs
 to be role "horde" as well.

I need a different way of managing applications within components.
---
 .../Components/Pear/Package/Contents/Factory.php   |   1 +
 content/package.xml                                | 104 ++++++++++-----------
 2 files changed, 51 insertions(+), 54 deletions(-)

diff --git a/components/lib/Components/Pear/Package/Contents/Factory.php b/components/lib/Components/Pear/Package/Contents/Factory.php
index 4e6a7d992..b126d88b7 100644
--- a/components/lib/Components/Pear/Package/Contents/Factory.php
+++ b/components/lib/Components/Pear/Package/Contents/Factory.php
@@ -62,6 +62,7 @@ class Components_Pear_Package_Contents_Factory
     private function _getMapping($path)
     {
         switch ($path) {
+        case 'content/':
         case 'horde/':
         case 'imp/':
         case 'ingo/':
diff --git a/content/package.xml b/content/package.xml
index 33ee91209..4113f7d77 100644
--- a/content/package.xml
+++ b/content/package.xml
@@ -17,7 +17,7 @@
   <active>yes</active>
  </lead>
  <date>2011-01-26</date>
- <time>10:30:11</time>
+ <time>11:05:46</time>
  <version>
   <release>0.0.1</release>
   <api>0.0.1</api>
@@ -34,70 +34,70 @@
   <dir baseinstalldir="/" name="/">
    <dir name="app">
     <dir name="controllers">
-     <file baseinstalldir="/" name="ApplicationController.php" role="horde" />
-     <file baseinstalldir="/" name="TagController.php" role="horde" />
+     <file name="ApplicationController.php" role="horde" />
+     <file name="TagController.php" role="horde" />
     </dir> <!-- /app/controllers -->
     <dir name="views">
      <dir name="Tag">
-      <file baseinstalldir="/" name="recentTags.html.php" role="horde" />
-      <file baseinstalldir="/" name="searchTags.html.php" role="horde" />
+      <file name="recentTags.html.php" role="horde" />
+      <file name="searchTags.html.php" role="horde" />
      </dir> <!-- /app/views/Tag -->
     </dir> <!-- /app/views -->
    </dir> <!-- /app -->
    <dir name="bin">
-    <file baseinstalldir="/" name="object_add.php" role="script" />
-    <file baseinstalldir="/" name="object_delete.php" role="script" />
-    <file baseinstalldir="/" name="tag.php" role="script" />
-    <file baseinstalldir="/" name="tag_add.php" role="script" />
-    <file baseinstalldir="/" name="tag_delete.php" role="script" />
-    <file baseinstalldir="/" name="untag.php" role="script" />
+    <file name="object_add.php" role="script" />
+    <file name="object_delete.php" role="script" />
+    <file name="tag.php" role="script" />
+    <file name="tag_add.php" role="script" />
+    <file name="tag_delete.php" role="script" />
+    <file name="untag.php" role="script" />
    </dir> <!-- /bin -->
    <dir name="doc">
-    <file baseinstalldir="/" name="TODO.txt" role="doc" />
+    <file name="TODO.txt" role="data" />
    </dir> <!-- /doc -->
    <dir name="lib">
     <dir name="Index">
-     <file baseinstalldir="/" name="Index.php" role="php" />
-     <file baseinstalldir="/" name="IndexMapper.php" role="php" />
+     <file name="Index.php" role="horde" />
+     <file name="IndexMapper.php" role="horde" />
     </dir> <!-- /lib/Index -->
     <dir name="Linkbacks">
-     <file baseinstalldir="/" name="Linkback.php" role="php" />
-     <file baseinstalldir="/" name="LinkbackMapper.php" role="php" />
+     <file name="Linkback.php" role="horde" />
+     <file name="LinkbackMapper.php" role="horde" />
     </dir> <!-- /lib/Linkbacks -->
     <dir name="Objects">
-     <file baseinstalldir="/" name="Manager.php" role="php" />
-     <file baseinstalldir="/" name="Object.php" role="php" />
-     <file baseinstalldir="/" name="ObjectMapper.php" role="php" />
+     <file name="Manager.php" role="horde" />
+     <file name="Object.php" role="horde" />
+     <file name="ObjectMapper.php" role="horde" />
     </dir> <!-- /lib/Objects -->
     <dir name="Relationships">
-     <file baseinstalldir="/" name="Relationship.php" role="php" />
-     <file baseinstalldir="/" name="RelationshipMapper.php" role="php" />
+     <file name="Relationship.php" role="horde" />
+     <file name="RelationshipMapper.php" role="horde" />
     </dir> <!-- /lib/Relationships -->
     <dir name="Tags">
-     <file baseinstalldir="/" name="Tag.php" role="php" />
-     <file baseinstalldir="/" name="TagMapper.php" role="php" />
+     <file name="Tag.php" role="horde" />
+     <file name="TagMapper.php" role="horde" />
     </dir> <!-- /lib/Tags -->
     <dir name="Types">
-     <file baseinstalldir="/" name="Manager.php" role="php" />
+     <file name="Manager.php" role="horde" />
     </dir> <!-- /lib/Types -->
     <dir name="Users">
-     <file baseinstalldir="/" name="Manager.php" role="php" />
+     <file name="Manager.php" role="horde" />
     </dir> <!-- /lib/Users -->
-    <file baseinstalldir="/" name="Exception.php" role="php" />
-    <file baseinstalldir="/" name="Tagger.php" role="php" />
+    <file name="Exception.php" role="horde" />
+    <file name="Tagger.php" role="horde" />
    </dir> <!-- /lib -->
    <dir name="migration">
-    <file baseinstalldir="/" name="1_rampage_base_tables.php" role="data" />
-    <file baseinstalldir="/" name="2_rampage_tag_tables.php" role="data" />
+    <file name="1_rampage_base_tables.php" role="horde" />
+    <file name="2_rampage_tag_tables.php" role="horde" />
    </dir> <!-- /migration -->
    <dir name="test">
     <dir name="fixtures">
-     <file baseinstalldir="/" name="schema.sql" role="test" />
+     <file name="schema.sql" role="test" />
     </dir> <!-- /test/fixtures -->
     <dir name="Tags">
-     <file baseinstalldir="/" name="TaggerTest.php" role="test" />
+     <file name="TaggerTest.php" role="test" />
     </dir> <!-- /test/Tags -->
-    <file baseinstalldir="/" name="AllTests.php" role="test" />
+    <file name="AllTests.php" role="test" />
    </dir> <!-- /test -->
   </dir> <!-- / -->
  </contents>
@@ -109,10 +109,6 @@
    <pearinstaller>
     <min>1.9.0</min>
    </pearinstaller>
-   <package>
-    <name>horde</name>
-    <channel>pear.horde.org</channel>
-   </package>
   </required>
  </dependencies>
  <usesrole>
@@ -132,24 +128,24 @@
    <install as="tag_add" name="bin/tag_add.php" />
    <install as="tag_delete" name="bin/tag_delete.php" />
    <install as="untag" name="bin/untag.php" />
-   <install as="TODO.txt" name="doc/TODO.txt" />
-   <install as="Exception.php" name="lib/Exception.php" />
-   <install as="Tagger.php" name="lib/Tagger.php" />
-   <install as="Index/Index.php" name="lib/Index/Index.php" />
-   <install as="Index/IndexMapper.php" name="lib/Index/IndexMapper.php" />
-   <install as="Linkbacks/Linkback.php" name="lib/Linkbacks/Linkback.php" />
-   <install as="Linkbacks/LinkbackMapper.php" name="lib/Linkbacks/LinkbackMapper.php" />
-   <install as="Objects/Manager.php" name="lib/Objects/Manager.php" />
-   <install as="Objects/Object.php" name="lib/Objects/Object.php" />
-   <install as="Objects/ObjectMapper.php" name="lib/Objects/ObjectMapper.php" />
-   <install as="Relationships/Relationship.php" name="lib/Relationships/Relationship.php" />
-   <install as="Relationships/RelationshipMapper.php" name="lib/Relationships/RelationshipMapper.php" />
-   <install as="Tags/Tag.php" name="lib/Tags/Tag.php" />
-   <install as="Tags/TagMapper.php" name="lib/Tags/TagMapper.php" />
-   <install as="Types/Manager.php" name="lib/Types/Manager.php" />
-   <install as="Users/Manager.php" name="lib/Users/Manager.php" />
-   <install as="migration/1_rampage_base_tables.php" name="migration/1_rampage_base_tables.php" />
-   <install as="migration/2_rampage_tag_tables.php" name="migration/2_rampage_tag_tables.php" />
+   <install as="doc/TODO.txt" name="doc/TODO.txt" />
+   <install as="content/lib/Exception.php" name="lib/Exception.php" />
+   <install as="content/lib/Tagger.php" name="lib/Tagger.php" />
+   <install as="content/lib/Index/Index.php" name="lib/Index/Index.php" />
+   <install as="content/lib/Index/IndexMapper.php" name="lib/Index/IndexMapper.php" />
+   <install as="content/lib/Linkbacks/Linkback.php" name="lib/Linkbacks/Linkback.php" />
+   <install as="content/lib/Linkbacks/LinkbackMapper.php" name="lib/Linkbacks/LinkbackMapper.php" />
+   <install as="content/lib/Objects/Manager.php" name="lib/Objects/Manager.php" />
+   <install as="content/lib/Objects/Object.php" name="lib/Objects/Object.php" />
+   <install as="content/lib/Objects/ObjectMapper.php" name="lib/Objects/ObjectMapper.php" />
+   <install as="content/lib/Relationships/Relationship.php" name="lib/Relationships/Relationship.php" />
+   <install as="content/lib/Relationships/RelationshipMapper.php" name="lib/Relationships/RelationshipMapper.php" />
+   <install as="content/lib/Tags/Tag.php" name="lib/Tags/Tag.php" />
+   <install as="content/lib/Tags/TagMapper.php" name="lib/Tags/TagMapper.php" />
+   <install as="content/lib/Types/Manager.php" name="lib/Types/Manager.php" />
+   <install as="content/lib/Users/Manager.php" name="lib/Users/Manager.php" />
+   <install as="content/migration/1_rampage_base_tables.php" name="migration/1_rampage_base_tables.php" />
+   <install as="content/migration/2_rampage_tag_tables.php" name="migration/2_rampage_tag_tables.php" />
    <install as="AllTests.php" name="test/AllTests.php" />
    <install as="fixtures/schema.sql" name="test/fixtures/schema.sql" />
    <install as="Tags/TaggerTest.php" name="test/Tags/TaggerTest.php" />
-- 
2.11.0