From dc00d255ccffd03d4144024f8319b975e395f673 Mon Sep 17 00:00:00 2001
From: Chuck Hagenbuch <chuck@horde.org>
Date: Sun, 30 May 2010 12:19:59 -0400
Subject: [PATCH] Fix Horde_Scribe to use the thrift_root directory

---
 .../{ => thrift_root}/packages/scribe/scribe_types.php |  0
 .../lib/Horde/Thrift/{ => thrift_root}/scribe.php      |  0
 framework/Scribe/package.xml                           | 18 ++++++++++--------
 3 files changed, 10 insertions(+), 8 deletions(-)
 rename framework/Scribe/lib/Horde/Thrift/{ => thrift_root}/packages/scribe/scribe_types.php (100%)
 rename framework/Scribe/lib/Horde/Thrift/{ => thrift_root}/scribe.php (100%)

diff --git a/framework/Scribe/lib/Horde/Thrift/packages/scribe/scribe_types.php b/framework/Scribe/lib/Horde/Thrift/thrift_root/packages/scribe/scribe_types.php
similarity index 100%
rename from framework/Scribe/lib/Horde/Thrift/packages/scribe/scribe_types.php
rename to framework/Scribe/lib/Horde/Thrift/thrift_root/packages/scribe/scribe_types.php
diff --git a/framework/Scribe/lib/Horde/Thrift/scribe.php b/framework/Scribe/lib/Horde/Thrift/thrift_root/scribe.php
similarity index 100%
rename from framework/Scribe/lib/Horde/Thrift/scribe.php
rename to framework/Scribe/lib/Horde/Thrift/thrift_root/scribe.php
diff --git a/framework/Scribe/package.xml b/framework/Scribe/package.xml
index c1c737470..55826ff50 100644
--- a/framework/Scribe/package.xml
+++ b/framework/Scribe/package.xml
@@ -39,12 +39,14 @@ http://pear.php.net/dtd/package-2.0.xsd">
     <dir name="Horde">
      <file name="Scribe.php" role="php" />
      <dir name="Thrift">
-      <dir name="packages">
-       <dir name="scribe">
-        <file name="scribe_types.php" role="php" />
-       </dir> <!-- /lib/Horde/Thrift/packages/scribe -->
-      </dir> <!-- /lib/Horde/Thrift/packages -->
-      <file name="scribe.php" role="php" />
+      <dir name="thrift_root">
+       <dir name="packages">
+        <dir name="scribe">
+         <file name="scribe_types.php" role="php" />
+        </dir> <!-- /lib/Horde/Thrift/thrift_root/packages/scribe -->
+       </dir> <!-- /lib/Horde/Thrift/thrift_root/packages -->
+       <file name="scribe.php" role="php" />
+      </dir> <!-- /lib/Horde/Thrift/thrift_root -->
      </dir> <!-- /lib/Horde/Thrift -->
     </dir> <!-- /lib/Horde -->
    </dir> <!-- /lib -->
@@ -63,8 +65,8 @@ http://pear.php.net/dtd/package-2.0.xsd">
  <phprelease>
   <filelist>
    <install name="lib/Horde/Scribe.php" as="Horde/Scribe.php" />
-   <install name="lib/Horde/Thrift/packages/scribe/scribe_types.php" as="Horde/Thrift/packages/scribe/scribe_types.php" />
-   <install name="lib/Horde/Thrift/scribe.php" as="Horde/Thrift/scribe.php" />
+   <install name="lib/Horde/Thrift/thrift_root/packages/scribe/scribe_types.php" as="Horde/Thrift/thrift_root/packages/scribe/scribe_types.php" />
+   <install name="lib/Horde/Thrift/thrift_root/scribe.php" as="Horde/Thrift/thrift_root/scribe.php" />
   </filelist>
  </phprelease>
  <changelog/>
-- 
2.11.0